Merge remote-tracking branch 'upstream/2.7' into 2.7

Author: javiereguiluz

bundles.rst

@@ -59,8 +59,8 @@ are used by your application (including the core Symfony bundles).
 
 .. tip::
 
-   A bundle can live *anywhere* as long as it can be autoloaded (via the
-   autoloader configured at ``app/autoload.php``).
+    A bundle can live *anywhere* as long as it can be autoloaded (via the
+    autoloader configured at ``app/autoload.php``).
 
 Creating a Bundle
 -----------------
@@ -91,10 +91,10 @@ called ``AcmeTestBundle.php``::
 
 .. tip::
 
-   The name AcmeTestBundle follows the standard
-   :ref:`Bundle naming conventions <bundles-naming-conventions>`. You could
-   also choose to shorten the name of the bundle to simply TestBundle by naming
-   this class TestBundle (and naming the file ``TestBundle.php``).
+    The name AcmeTestBundle follows the standard
+    :ref:`Bundle naming conventions <bundles-naming-conventions>`. You could
+    also choose to shorten the name of the bundle to simply TestBundle by naming
+    this class TestBundle (and naming the file ``TestBundle.php``).
 
 This empty class is the only piece you need to create the new bundle. Though
 commonly empty, this class is powerful and can be used to customize the behavior
@@ -130,9 +130,9 @@ tools later.
 
 .. tip::
 
-   Whenever creating a new bundle or using a third-party bundle, always make
-   sure the bundle has been enabled in ``registerBundles()``. When using
-   the ``generate:bundle`` command, this is done for you.
+    Whenever creating a new bundle or using a third-party bundle, always make
+    sure the bundle has been enabled in ``registerBundles()``. When using
+    the ``generate:bundle`` command, this is done for you.
 
 Bundle Directory Structure
 --------------------------

bundles/best_practices.rst

@@ -116,21 +116,21 @@ The following classes and files have specific emplacements (some are mandatory
 and others are just conventions followed by most developers):
 
 ===================================================  ========================================
-Type                                                 Directory                               
+Type                                                 Directory
 ===================================================  ========================================
-Commands                                             ``Command/``                            
-Controllers                                          ``Controller/``                         
-Service Container Extensions                         ``DependencyInjection/``                
+Commands                                             ``Command/``
+Controllers                                          ``Controller/``
+Service Container Extensions                         ``DependencyInjection/``
 Doctrine ORM entities (when not using annotations)   ``Entity/``
 Doctrine ODM documents (when not using annotations)  ``Document/``
-Event Listeners                                      ``EventListener/``                      
-Configuration                                        ``Resources/config/``                   
-Web Resources (CSS, JS, images)                      ``Resources/public/``                   
-Translation files                                    ``Resources/translations/``     
+Event Listeners                                      ``EventListener/``
+Configuration                                        ``Resources/config/``
+Web Resources (CSS, JS, images)                      ``Resources/public/``
+Translation files                                    ``Resources/translations/``
 Validation (when not using annotations)              ``Resources/config/validation/``
 Serialization (when not using annotations)           ``Resources/config/serialization/``
-Templates                                            ``Resources/views/``                    
-Unit and Functional Tests                            ``Tests/``                              
+Templates                                            ``Resources/views/``
+Unit and Functional Tests                            ``Tests/``
 ===================================================  ========================================
 
 Classes
@@ -174,19 +174,19 @@ the ``Tests/`` directory. Tests should follow the following principles:
 
 .. note::
 
-   A test suite must not contain ``AllTests.php`` scripts, but must rely on the
-   existence of a ``phpunit.xml.dist`` file.
+    A test suite must not contain ``AllTests.php`` scripts, but must rely on the
+    existence of a ``phpunit.xml.dist`` file.
 
 Documentation
 -------------
 
 All classes and functions must come with full PHPDoc.
 
-Extensive documentation should also be provided in the ``Resources/doc/`` 
+Extensive documentation should also be provided in the ``Resources/doc/``
 directory.
-The index file (for example ``Resources/doc/index.rst`` or 
-``Resources/doc/index.md``) is the only mandatory file and must be the entry 
-point for the documentation. The 
+The index file (for example ``Resources/doc/index.rst`` or
+``Resources/doc/index.md``) is the only mandatory file and must be the entry
+point for the documentation. The
 :doc:`reStructuredText (rST) </contributing/documentation/format>` is the format
 used to render the documentation on symfony.com.
 

bundles/configuration.rst

@@ -120,7 +120,6 @@ bundle configuration would look like:
     For parameter handling within a dependency injection container see
     :doc:`/configuration/using_parameters_in_dic`.
 
-
 Processing the ``$configs`` Array
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -275,7 +274,6 @@ In your extension, you can load this and dynamically set its arguments::
         $def->replaceArgument(1, $config['twitter']['client_secret']);
     }
 
-
 .. tip::
 
     Instead of calling ``processConfiguration()`` in your extension each time you

bundles/inheritance.rst

@@ -99,9 +99,9 @@ The same goes for routing files and some other resources.
 
 .. caution::
 
-   Translation and validation files do not work in the same way as described
-   above. Read ":ref:`override-translations`" if you want to learn how to
-   override translations and see ":ref:`override-validation`" for tricks to
-   override the validation.
+    Translation and validation files do not work in the same way as described
+    above. Read ":ref:`override-translations`" if you want to learn how to
+    override translations and see ":ref:`override-validation`" for tricks to
+    override the validation.
 
 .. _`FOSUserBundle`: https://github.com/friendsofsymfony/fosuserbundle

bundles/installation.rst

@@ -48,7 +48,7 @@ version, include it as the second argument of the `composer require`_ command:
 B) Enable the Bundle
 --------------------
 
-At this point, the bundle is installed in your Symfony project (e.g. 
+At this point, the bundle is installed in your Symfony project (e.g.
 ``vendor/friendsofsymfony/``) and the autoloader recognizes its classes.
 The only thing you need to do now is register the bundle in ``AppKernel``::
 

changelog.rst

@@ -1,6 +1,6 @@
 .. index::
     single: CHANGELOG
-    
+
 .. !! CAUTION !!
    This file is automatically generated. Do not add new changelog
    items when preparing a pull request.
@@ -69,7 +69,6 @@ Minor Documentation Changes
 * `#7014 <https://github.com/symfony/symfony-docs/pull/7014>`_ Add a note about Filesystem:mkdir behavior (mickaelandrieu)
 * `#6886 <https://github.com/symfony/symfony-docs/pull/6886>`_ Update controllers.rst (asandjivy)
 
-
 September, 2016
 ---------------
 
@@ -81,7 +80,6 @@ New Documentation
 Fixed Documentation
 ~~~~~~~~~~~~~~~~~~~
 
-
 Minor Documentation Changes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -121,7 +119,6 @@ Minor Documentation Changes
 * `#6945 <https://github.com/symfony/symfony-docs/pull/6945>`_ Fixed indentation issues in alias_private article (javiereguiluz)
 * `#6955 <https://github.com/symfony/symfony-docs/pull/6955>`_ Typo in the class name. (pythagor)
 
-
 August, 2016
 ------------
 
@@ -197,7 +194,6 @@ Minor Documentation Changes
 * `#6810 <https://github.com/symfony/symfony-docs/pull/6810>`_ Fixed the redirection of the previous "performance" book chapter (javiereguiluz)
 * `#6816 <https://github.com/symfony/symfony-docs/pull/6816>`_ Added all the missing "index pages" redirections (javiereguiluz)
 
-
 July, 2016
 ----------
 
@@ -288,7 +284,6 @@ Minor Documentation Changes
 * `#5892 <https://github.com/symfony/symfony-docs/pull/5892>`_ Updated the session proxy article (javiereguiluz)
 * `#6697 <https://github.com/symfony/symfony-docs/pull/6697>`_ [Asset] add versionadded directive (xabbuh)
 
-
 June, 2016
 ----------
 
@@ -338,7 +333,6 @@ Minor Documentation Changes
 * `#6627 <https://github.com/symfony/symfony-docs/pull/6627>`_ Fixed a typo in cookbook/security/entity_provider (michaeldegroot)
 * `#6618 <https://github.com/symfony/symfony-docs/pull/6618>`_ Added a note about coding standards and method arguments (javiereguiluz)
 
-
 May, 2016
 ---------
 
@@ -409,7 +403,6 @@ Minor Documentation Changes
 * `#6525 <https://github.com/symfony/symfony-docs/pull/6525>`_ [Contributing] use more precise version checker URL (xabbuh)
 * `#6528 <https://github.com/symfony/symfony-docs/pull/6528>`_ Fixed a minor indentation issue (javiereguiluz)
 
-
 April, 2016
 -----------
 
@@ -454,7 +447,6 @@ Minor Documentation Changes
 * `#6420 <https://github.com/symfony/symfony-docs/pull/6420>`_ Added tip for optional second parameter for form submissions. (Michael Phillips)
 * `#6418 <https://github.com/symfony/symfony-docs/pull/6418>`_ fix spelling of the flashBag() method (xabbuh)
 
-
 March, 2016
 -----------
 
@@ -514,7 +506,6 @@ Minor Documentation Changes
 * `#6267 <https://github.com/symfony/symfony-docs/pull/6267>`_ [Form] fix 'data_class' option in EntityType (HeahDude)
 * `#6281 <https://github.com/symfony/symfony-docs/pull/6281>`_ Change isValid to isSubmitted. (mustafaaloko)
 
-
 February, 2016
 --------------
 
@@ -585,7 +576,6 @@ Minor Documentation Changes
 * `#6208 <https://github.com/symfony/symfony-docs/pull/6208>`_ Replace references of PSR-0 with PSR-4 (opdavies)
 * `#6190 <https://github.com/symfony/symfony-docs/pull/6190>`_ Fix redundant command line sample (sylozof)
 
-
 January, 2016
 -------------
 
@@ -636,7 +626,6 @@ Minor Documentation Changes
 * `#6102 <https://github.com/symfony/symfony-docs/pull/6102>`_ promoted xabbuh as merger on the Yaml component (fabpot)
 * `#6013 <https://github.com/symfony/symfony-docs/pull/6013>`_ [2.7][Form] placeholder option: replace "in favor" misuses (ogizanagi)
 
-
 December, 2015
 --------------
 
@@ -709,7 +698,6 @@ Minor Documentation Changes
 * `#5972 <https://github.com/symfony/symfony-docs/pull/5972>`_ Add isSubmitted call (DanielSiepmann)
 * `#5961 <https://github.com/symfony/symfony-docs/pull/5961>`_ update from_flat_php_to_symfony2.rst (thao-witkam)
 
-
 November, 2015
 --------------
 
@@ -772,7 +760,6 @@ Minor Documentation Changes
 * `#5852 <https://github.com/symfony/symfony-docs/pull/5852>`_ Fix doc for 2.6+, `server:start` replace `...:run` (Kevinrob)
 * `#5837 <https://github.com/symfony/symfony-docs/pull/5837>`_ Corrected link to ConEmu (dritter)
 
-
 October, 2015
 -------------
 
@@ -829,7 +816,6 @@ Minor Documentation Changes
 * `#5684 <https://github.com/symfony/symfony-docs/pull/5684>`_ Fix delivery_whitelist regex (gonzalovilaseca)
 * `#5742 <https://github.com/symfony/symfony-docs/pull/5742>`_ incorrect: severity is an array key here and not a constant (lbayerl)
 
-
 September, 2015
 ---------------
 
@@ -886,7 +872,6 @@ Minor Documentation Changes
 * `#5571 <https://github.com/symfony/symfony-docs/pull/5571>`_ Some small fixes for upload files article (WouterJ)
 * `#5660 <https://github.com/symfony/symfony-docs/pull/5660>`_ Improved "Community Reviews" page (webmozart)
 
-
 August, 2015
 ------------
 
@@ -938,7 +923,6 @@ Minor Documentation Changes
 * `#5601 <https://github.com/symfony/symfony-docs/pull/5601>`_ Update lazy_services.rst (baziak3)
 * `#5591 <https://github.com/symfony/symfony-docs/pull/5591>`_ Update templating.rst: lint:twig instead of twig:lint in 2.7 (alexwybraniec)
 
-
 July, 2015
 ----------
 
@@ -1024,7 +1008,6 @@ Minor Documentation Changes
 * `#5473 <https://github.com/symfony/symfony-docs/pull/5473>`_ --dev is default and causes a warning (DQNEO)
 * `#5474 <https://github.com/symfony/symfony-docs/pull/5474>`_ typo in components/translation/instruction.rst (beesofts)
 
-
 June, 2015
 ----------
 
@@ -1120,7 +1103,6 @@ Minor Documentation Changes
 * `#5357 <https://github.com/symfony/symfony-docs/pull/5357>`_ [Form] Replace deprecated form_enctype by form_start (JMLamodiere)
 * `#5359 <https://github.com/symfony/symfony-docs/pull/5359>`_ Bumped version of proxy manager to stable release (peterrehm)
 
-
 May, 2015
 ---------
 
@@ -1214,7 +1196,6 @@ Minor Documentation Changes
 * `#5238 <https://github.com/symfony/symfony-docs/pull/5238>`_ Fixed typo and removed outdated imports (nomack84)
 * `#5240 <https://github.com/symfony/symfony-docs/pull/5240>`_ [Cookbook][Email] revert #4808 (xabbuh)
 
-
 April, 2015
 -----------
 

components/asset.rst

@@ -5,8 +5,8 @@
 The Asset Component
 ===================
 
-   The Asset component manages URL generation and versioning of web assets such
-   as CSS stylesheets, JavaScript files and image files.
+    The Asset component manages URL generation and versioning of web assets such
+    as CSS stylesheets, JavaScript files and image files.
 
 .. versionadded:: 2.7
     The Asset component was introduced in Symfony 2.7.

components/console/helpers/questionhelper.rst

@@ -174,7 +174,7 @@ will be autocompleted as the user types::
     {
         // ...
         $helper = $this->getHelper('question');
-        
+
         $bundles = array('AcmeDemoBundle', 'AcmeBlogBundle', 'AcmeStoreBundle');
         $question = new Question('Please enter the name of a bundle', 'FooBundle');
         $question->setAutocompleterValues($bundles);
@@ -195,7 +195,7 @@ convenient for passwords::
     {
         // ...
         $helper = $this->getHelper('question');
-        
+
         $question = new Question('What is the database password?');
         $question->setHidden(true);
         $question->setHiddenFallback(false);
@@ -230,7 +230,7 @@ method::
     {
         // ...
         $helper = $this->getHelper('question');
-        
+
         $question = new Question('Please enter the name of the bundle', 'AppBundle');
         $question->setNormalizer(function ($value) {
             // $value can be null here
@@ -240,7 +240,6 @@ method::
         $name = $helper->ask($input, $output, $question);
     }
 
-
 .. caution::
 
     The normalizer is called first and the returned value is used as the input

components/dom_crawler.rst

@@ -339,13 +339,13 @@ a :class:`Symfony\\Component\\DomCrawler\\Form` object that represents the
 form that the button lives in::
 
     // button example: <button id="my-super-button" type="submit">My super button</button>
-    
+
     // you can get button by its label
     $form = $crawler->selectButton('My super button')->form();
-    
+
     // or by button id (#my-super-button) if the button doesn't have a label
     $form = $crawler->selectButton('my-super-button')->form();
-    
+
     // or you can filter the whole form, for example a form has a class attribute: <form class="form-vertical" method="POST">
     $crawler->filter('.form-vertical')->form();
 

components/event_dispatcher.rst

@@ -405,14 +405,14 @@ the dispatcher to stop all propagation of the event to future listeners
 inside a listener via the
 :method:`Symfony\\Component\\EventDispatcher\\Event::stopPropagation` method::
 
-   use Acme\Store\Event\OrderPlacedEvent;
+    use Acme\Store\Event\OrderPlacedEvent;
 
-   public function onStoreOrder(OrderPlacedEvent $event)
-   {
-       // ...
+    public function onStoreOrder(OrderPlacedEvent $event)
+    {
+        // ...
 
-       $event->stopPropagation();
-   }
+        $event->stopPropagation();
+    }
 
 Now, any listeners to ``order.placed`` that have not yet been called will
 *not* be called.

components/expression_language/extending.rst

@@ -64,7 +64,7 @@ to add custom functions. To do so, you can create a new expression provider by
 creating a class that implements
 :class:`Symfony\\Component\\ExpressionLanguage\\ExpressionFunctionProviderInterface`.
 
-This interface requires one method: 
+This interface requires one method:
 :method:`Symfony\\Component\\ExpressionLanguage\\ExpressionFunctionProviderInterface::getFunctions`,
 which returns an array of expression functions (instances of
 :class:`Symfony\\Component\\ExpressionLanguage\\ExpressionFunction`) to

components/finder.rst

@@ -5,8 +5,8 @@
 The Finder Component
 ====================
 
-   The Finder component finds files and directories via an intuitive fluent
-   interface.
+    The Finder component finds files and directories via an intuitive fluent
+    interface.
 
 Installation
 ------------