8000 Merge branch '2.7' into 2.8 · symfony/symfony-docs@8e9f755 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8e9f755

Browse files
wouterjwouterj
committed
Merge branch '2.7' into 2.8
2 parents 03a089c + d117184 commit 8e9f755

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+124
-174
lines changed

‎bundles/configuration.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ bundle configuration would look like:
120120
For parameter handling within a dependency injection container see
121121
:doc:`/configuration/using_parameters_in_dic`.
122122

123-
124123
Processing the ``$configs`` Array
125124
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
126125

@@ -275,7 +274,6 @@ In your extension, you can load this and dynamically set its arguments::
275274
$def->replaceArgument(1, $config['twitter']['client_secret']);
276275
}
277276

278-
279277
.. tip::
280278

281279
Instead of calling ``processConfiguration()`` in your extension each time you

‎bundles/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ version, include it as the second argument of the `composer require`_ command:
4848
B) Enable the Bundle
4949
--------------------
5050

51-
At this point, the bundle is installed in your Symfony project (e.g.
51+
At this point, the bundle is installed in your Symfony project (e.g.
5252
``vendor/friendsofsymfony/``) and the autoloader recognizes its classes.
5353
The only thing you need to do now is register the bundle in ``AppKernel``::
5454

‎changelog.rst

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.. index::
22
single: CHANGELOG
3-
3+
44
.. !! CAUTION !!
55
This file is automatically generated. Do not add new changelog
66
items when preparing a pull request.
@@ -72,7 +72,6 @@ Minor Documentation Changes
7272
* `#7014 <https://github.com/symfony/symfony-docs/pull/7014>`_ Add a note about Filesystem:mkdir behavior (mickaelandrieu)
7373
* `#6886 <https://github.com/symfony/symfony-docs/pull/6886>`_ Update controllers.rst (asandjivy)
7474

75-
7675
September, 2016
7776
---------------
7877

@@ -86,7 +85,6 @@ New Documentation
8685
Fixed Documentation
8786
~~~~~~~~~~~~~~~~~~~
8887

89-
9088
Minor Documentation Changes
9189
~~~~~~~~~~~~~~~~~~~~~~~~~~~
9290

@@ -136,7 +134,6 @@ Minor Documentation Changes
136134
* `#6954 <https://github.com/symfony/symfony-docs/pull/6954>`_ Typo fix in tags.rst (NoScopie)
137135
* `#6955 <https://github.com/symfony/symfony-docs/pull/6955>`_ Typo in the class name. (pythagor)
138136

139-
140137
August, 2016
141138
------------
142139

@@ -218,7 +215,6 @@ Minor Documentation Changes
218215
* `#6810 <https://github.com/symfony/symfony-docs/pull/6810>`_ Fixed the redirection of the previous "performance" book chapter (javiereguiluz)
219216
* `#6816 <https://github.com/symfony/symfony-docs/pull/6816>`_ Added all the missing "index pages" redirections (javiereguiluz)
220217

221-
222218
July, 2016
223219
----------
224220

@@ -317,7 +313,6 @@ Minor Documentation Changes
317313
* `#6697 <https://github.com/symfony/symfony-docs/pull/6697>`_ [Asset] add versionadded directive (xabbuh)
318314
* `#6698 <https://github.com/symfony/symfony-docs/pull/6698>`_ [Ldap] add versionadded directive (xabbuh)
319315

320-
321316
June, 2016
322317
----------
323318

@@ -372,7 +367,6 @@ Minor Documentation Changes
372367
* `#6627 <https://github.com/symfony/symfony-docs/pull/6627>`_ Fixed a typo in cookbook/security/entity_provider (michaeldegroot)
373368
* `#6618 <https://github.com/symfony/symfony-docs/pull/6618>`_ Added a note about coding standards and method arguments (javiereguiluz)
374369

375-
376370
May, 2016
377371
---------
378372

@@ -454,7 +448,6 @@ Minor Documentation Changes
454448
* `#6525 <https://github.com/symfony/symfony-docs/pull/6525>`_ [Contributing] use more precise version checker URL (xabbuh)
455449
* `#6528 <https://github.com/symfony/symfony-docs/pull/6528>`_ Fixed a minor indentation issue (javiereguiluz)
456450

457-
458451
April, 2016
459452
-----------
460453

@@ -504,7 +497,6 @@ Minor Documentation Changes
504497
* `#6420 <https://github.com/symfony/symfony-docs/pull/6420>`_ Added tip for optional second parameter for form submissions. (Michael Phillips)
505498
* `#6418 <https://github.com/symfony/symfony-docs/pull/6418>`_ fix spelling of the flashBag() method (xabbuh)
506499

507-
508500
March, 2016
509501
-----------
510502

@@ -572,7 +564,6 @@ Minor Documentation Changes
572564
* `#6267 <https://github.com/symfony/symfony-docs/pull/6267>`_ [Form] fix 'data_class' option in EntityType (HeahDude)
573565
* `#6281 <https://github.com/symfony/symfony-docs/pull/6281>`_ Change isValid to isSubmitted. (mustafaaloko)
574566

575-
576567
February, 2016
577568
--------------
578569

@@ -659,7 +650,6 @@ Minor Documentation Changes
659650
* `#6225 <https://github.com/symfony/symfony-docs/pull/6225>`_ [Reference][Forms] add versionadded directive for range type (xabbuh)
660651
* `#6190 <https://github.com/symfony/symfony-docs/pull/6190>`_ Fix redundant command line sample (sylozof)
661652

662-
663653
January, 2016
664654
-------------
665655

@@ -725,7 +715,6 @@ Minor Documentation Changes
725715
* `#6014 <https://github.com/symfony/symfony-docs/pull/6014>`_ [2.8][Form] entry_type option: replace "in favor" misuses (ogizanagi)
726716
* `#6013 <https://github.com/symfony/symfony-docs/pull/6013>`_ [2.7][Form] placeholder option: replace "in favor" misuses (ogizanagi)
727717

728-
729718
December, 2015
730719
--------------
731720

@@ -812,7 +801,6 @@ Minor Documentation Changes
812801
* `#5924 <https://github.com/symfony/symfony-docs/pull/5924>`_ Removed note about removed content (WouterJ)
813802
* `#5938 <https://github.com/symfony/symfony-docs/pull/5938>`_ Add proper use of the password type (themccallister)
814803

815-
816804
November, 2015
817805
--------------
818806

@@ -889,7 +877,6 @@ Minor Documentation Changes
889877
* `#5852 <https://github.com/symfony/symfony-docs/pull/5852>`_ Fix doc for 2.6+, `server:start` replace `...:run` (Kevinrob)
890878
* `#5837 <https://github.com/symfony/symfony-docs/pull/5837>`_ Corrected link to ConEmu (dritter)
891879

892-
893880
October, 2015
894881
-------------
895882

@@ -955,7 +942,6 @@ Minor Documentation Changes
955942
* `#5684 <https://github.com/symfony/symfony-docs/pull/5684>`_ Fix delivery_whitelist regex (gonzalovilaseca)
956943
* `#5742 <https://github.com/symfony/symfony-docs/pull/5742>`_ incorrect: severity is an array key here and not a constant (lbayerl)
957944

958-
959945
September, 2015
960946
---------------
961947

@@ -1012,7 +998,6 @@ Minor Documentation Changes
1012998
* `#5571 <https://github.com/symfony/symfony-docs/pull/5571>`_ Some small fixes for upload files article (WouterJ)
1013999
* `#5660 <https://github.com/symfony/symfony-docs/pull/5660>`_ Improved "Community Reviews" page (webmozart)
10141000

1015-
10161001
August, 2015
10171002
------------
10181003

@@ -1064,7 +1049,6 @@ Minor Documentation Changes
10641049
* `#5601 <https://github.com/symfony/symfony-docs/pull/5601>`_ Update lazy_services.rst (baziak3)
10651050
* `#5591 <https://github.com/symfony/symfony-docs/pull/5591>`_ Update templating.rst: lint:twig instead of twig:lint in 2.7 (alexwybraniec)
10661051

1067-
10681052
July, 2015
10691053
----------
10701054

@@ -1153,7 +1137,6 @@ Minor Documentation Changes
11531137
* `#5473 <https://github.com/symfony/symfony-docs/pull/5473>`_ --dev is default and causes a warning (DQNEO)
11541138
* `#5474 <https://github.com/symfony/symfony-docs/pull/5474>`_ typo in components/translation/instruction.rst (beesofts)
11551139

1156-
11571140
June, 2015
11581141
----------
11591142

@@ -1253,7 +1236,6 @@ Minor Documentation Changes
12531236
* `#5357 <https://github.com/symfony/symfony-docs/pull/5357>`_ [Form] Replace deprecated form_enctype by form_start (JMLamodiere)
12541237
* `#5359 <https://github.com/symfony/symfony-docs/pull/5359>`_ Bumped version of proxy manager to stable release (peterrehm)
12551238

1256-
12571239
May, 2015
12581240
---------
12591241

@@ -1347,7 +1329,6 @@ Minor Documentation Changes
13471329
* `#5238 <https://github.com/symfony/symfony-docs/pull/5238>`_ Fixed typo and removed outdated imports (nomack84)
13481330
* `#5240 <https://github.com/symfony/symfony-docs/pull/5240>`_ [Cookbook][Email] revert #4808 (xabbuh)
13491331

1350-
13511332
April, 2015
13521333
-----------
13531334

‎components/console/helpers/questionhelper.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ will be autocompleted as the user types::
174174
{
175175
// ...
176176
$helper = $this->getHelper('question');
177-
177+
178178
$bundles = array('AcmeDemoBundle', 'AcmeBlogBundle', 'AcmeStoreBundle');
179179
$question = new Question('Please enter the name of a bundle', 'FooBundle');
180180
$question->setAutocompleterValues($bundles);
@@ -195,7 +195,7 @@ convenient for passwords::
195195
{
196196
// ...
197197
$helper = $this->getHelper('question');
198-
198+
199199
$question = new Question('What is the database password?');
200200
$question->setHidden(true);
201201
$question->setHiddenFallback(false);
@@ -230,7 +230,7 @@ method::
230230
{
231231
// ...
232232
$helper = $this->getHelper('question');
233-
233+
234234
$question = new Question('Please enter the name of the bundle', 'AppBundle');
235235
$question->setNormalizer(function ($value) {
236236
// $value can be null here
@@ -240,7 +240,6 @@ method::
240240
$name = $helper->ask($input, $output, $question);
241241
}
242242

243-
244243
.. caution::
245244

246245
The normalizer is called first and the returned value is used as the input

‎components/dom_crawler.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -326,13 +326,13 @@ a :class:`Symfony\\Component\\DomCrawler\\Form` object that represents the
326326
form that the button lives in::
327327

328328
// button example: <button id="my-super-button" type="submit">My super button</button>
329-
329+
330330
// you can get button by its label
331331
$form = $crawler->selectButton('My super button')->form();
332-
332+
333333
// or by button id (#my-super-button) if the button doesn't have a label
334334
$form = $crawler->selectButton('my-super-button')->form();
335-
335+
336336
// or you can filter the whole form, for example a form has a class attribute: <form class="form-vertical" method="POST">
337337
$crawler->filter('.form-vertical')->form();
338338

‎components/expression_language/extending.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ to add custom functions. To do so, you can create a new expression provider by
6161
creating a class that implements
6262
:class:`Symfony\\Component\\ExpressionLanguage\\ExpressionFunctionProviderInterface`.
6363

64-
This interface requires one method:
64+
This interface requires one method:
6565
:method:`Symfony\\Component\\ExpressionLanguage\\ExpressionFunctionProviderInterface::getFunctions`,
6666
which returns an array of expression functions (instances of
6767
:class:`Symfony\\Component\\ExpressionLanguage\\ExpressionFunction`) to

‎components/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ The Components
44
.. toctree::
55
:maxdepth: 1
66
:glob:
7-
7+
88
using_components
99
*

‎components/options_resolver.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,6 @@ is thrown::
376376
For options with more complicated validation schemes, pass a closure which
377377
returns ``true`` for acceptable values and ``false`` for invalid values::
378378

379-
380379
// ...
381380
$resolver->setAllowedValues('transport', function ($value) {
382381
// return true or false

‎components/property_access.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,5 @@ Or you can pass parameters directly to the constructor (not the recommended way)
457457
// ...
458458
$accessor = new PropertyAccessor(true); // this enables handling of magic __call
459459

460-
461460
.. _Packagist: https://packagist.org/packages/symfony/property-access
462461
.. _The Inflector component: https://github.com/symfony/inflector

‎components/security/authentication.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ firewall map is able to extract the user's credentials from the current
1010
a token, containing these credentials. The next thing the listener should
1111
do is ask the authentication manager to validate the given token, and return
1212
an *authenticated* token if the supplied credentials were found to be valid.
13-
The listener should then store the authenticated token using
13+
The listener should then store the authenticated token using
1414
:class:`the token storage <Symfony\\Component\\Security\\Core\\Authentication\\Token\\Storage\\TokenStorageInterface>`::
1515

1616
use Symfony\Component\Security\Http\Firewall\ListenerInterface;

‎components/serializer.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ You can install the component in 2 different ways:
3232
* :doc:`Install it via Composer </components/using_components>` (``symfony/serializer`` on `Packagist`_);
3333
* Use the official Git repository (https://github.com/symfony/serializer).
3434

35-
3635
.. include:: /components/require_autoload.rst.inc
3736

3837
To use the ``ObjectNormalizer``, the :doc:`PropertyAccess component </components/property_access>`

‎components/stopwatch.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ microtime by yourself. Instead, use the simple
3434
$event = $stopwatch->stop('eventName');
3535

3636
The :class:`Symfony\\Component\\Stopwatch\\StopwatchEvent` object can be retrieved
37-
from the :method:`Symfony\\Component\\Stopwatch\\Stopwatch::start`,
38-
:method:`Symfony\\Component\\Stopwatch\\Stopwatch::stop`,
39-
:method:`Symfony\\Component\\Stopwatch\\Stopwatch::lap` and
40-
:method:`Symfony\\Component\\Stopwatch\\Stopwatch::getEvent` methods.
37+
from the :method:`Symfony\\Component\\Stopwatch\\Stopwatch::start`,
38+
:method:`Symfony\\Component\\Stopwatch\\Stopwatch::stop`,
39+
:method:`Symfony\\Component\\Stopwatch\\Stopwatch::lap` and
40+
:method:`Symfony\\Component\\Stopwatch\\Stopwatch::getEvent` methods.
4141
The latter should be used when you need to retrieve the duration of an event
4242
while it is still running.
4343

0 commit comments

Comments
 (0)
0