Skip to content

Commit ab9e665

Browse files
committed
Merge branch '2.8' into 3.3
2 parents a892704 + 8e9f755 commit ab9e665

Some content is hidden

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

50 files changed

+119
-164
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.
@@ -88,7 +88,6 @@ Minor Documentation Changes
8888
* `#7014 <https://github.com/symfony/symfony-docs/pull/7014>`_ Add a note about Filesystem:mkdir behavior (mickaelandrieu)
8989
* `#6886 <https://github.com/symfony/symfony-docs/pull/6886>`_ Update controllers.rst (asandjivy)
9090

91-
9291
September, 2016
9392
---------------
9493

@@ -110,7 +109,6 @@ New Documentation
110109
Fixed Documentation
111110
~~~~~~~~~~~~~~~~~~~
112111

113-
114112
Minor Documentation Changes
115113
~~~~~~~~~~~~~~~~~~~~~~~~~~~
116114

@@ -170,7 +168,6 @@ Minor Documentation Changes
170168
* `#6954 <https://github.com/symfony/symfony-docs/pull/6954>`_ Typo fix in tags.rst (NoScopie)
171169
* `#6955 <https://github.com/symfony/symfony-docs/pull/6955>`_ Typo in the class name. (pythagor)
172170

173-
174171
August, 2016
175172
------------
176173

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

264-
265261
July, 2016
266262
----------
267263

@@ -370,7 +366,6 @@ Minor Documentation Changes
370366
* `#6697 <https://github.com/symfony/symfony-docs/pull/6697>`_ [Asset] add versionadded directive (xabbuh)
371367
* `#6698 <https://github.com/symfony/symfony-docs/pull/6698>`_ [Ldap] add versionadded directive (xabbuh)
372368

373-
374369
June, 2016
375370
----------
376371

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

434-
435429
May, 2016
436430
---------
437431

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

527-
528521
April, 2016
529522
-----------
530523

@@ -578,7 +571,6 @@ Minor Documentation Changes
578571
* `#6418 <https://github.com/symfony/symfony-docs/pull/6418>`_ fix spelling of the flashBag() method (xabbuh)
579572
* `#6432 <https://github.com/symfony/symfony-docs/pull/6432>`_ fixed yaml config error (RickieL)
580573

581-
582574
March, 2016
583575
-----------
584576

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

657-
658649
February, 2016
659650
--------------
660651

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

753-
754744
January, 2016
755745
-------------
756746

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

824-
825814
December, 2015
826815
--------------
827816

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

914-
915903
November, 2015
916904
--------------
917905

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

994-
995982
October, 2015
996983
-------------
997984

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

1060-
10611047
September, 2015
10621048
---------------
10631049

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

1117-
11181103
August, 2015
11191104
------------
11201105

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

1170-
11711155
July, 2015
11721156
----------
11731157

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

1260-
12611244
June, 2015
12621245
----------
12631246

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

1360-
13611343
May, 2015
13621344
---------
13631345

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

1454-
14551436
April, 2015
14561437
-----------
14571438

components/console/helpers/questionhelper.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ will be autocompleted as the user types::
170170
{
171171
// ...
172172
$helper = $this->getHelper('question');
173-
173+
174174
$bundles = array('AcmeDemoBundle', 'AcmeBlogBundle', 'AcmeStoreBundle');
175175
$question = new Question('Please enter the name of a bundle', 'FooBundle');
176176
$question->setAutocompleterValues($bundles);
@@ -191,7 +191,7 @@ convenient for passwords::
191191
{
192192
// ...
193193
$helper = $this->getHelper('question');
194-
194+
195195
$question = new Question('What is the database password?');
196196
$question->setHidden(true);
197197
$question->setHiddenFallback(false);
@@ -249,7 +249,7 @@ method::
249249
{
250250
// ...
251251
$helper = $this->getHelper('question');
252-
252+
253253
$question = new Question('Please enter the name of the bundle', 'AppBundle');
254254
$question->setNormalizer(function ($value) {
255255
// $value can be null here
@@ -259,7 +259,6 @@ method::
259259
$name = $helper->ask($input, $output, $question);
260260
}
261261

262-
263262
.. caution::
264263

265264
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
@@ -397,13 +397,13 @@ a :class:`Symfony\\Component\\DomCrawler\\Form` object that represents the
397397
form that the button lives in::
398398

399399
// button example: <button id="my-super-button" type="submit">My super button</button>
400-
400+
401401
// you can get button by its label
402402
$form = $crawler->selectButton('My super button')->form();
403-
403+
404404
// or by button id (#my-super-button) if the button doesn't have a label
405405
$form = $crawler->selectButton('my-super-button')->form();
406-
406+
407407
// or you can filter the whole form, for example a form has a class attribute: <form class="form-vertical" method="POST">
408408
$crawler->filter('.form-vertical')->form();
409409

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
@@ -450,6 +450,5 @@ Or you can pass parameters directly to the constructor (not the recommended way)
450450
// ...
451451
$accessor = new PropertyAccessor(true); // this enables handling of magic __call
452452

453-
454453
.. _Packagist: https://packagist.org/packages/symfony/property-access
455454
.. _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
@@ -29,7 +29,6 @@ You can install the component in 2 different ways:
2929
* :doc:`Install it via Composer </components/using_components>` (``symfony/serializer`` on `Packagist`_);
3030
* Use the official Git repository (https://github.com/symfony/serializer).
3131

32-
3332
.. include:: /components/require_autoload.rst.inc
3433

3534
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)