Merge branch '3.4' into 4.0

Author: wouterj

bundles/configuration.rst

@@ -110,7 +110,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
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -264,7 +263,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

components/console/helpers/questionhelper.rst

@@ -256,7 +256,6 @@ method::
         $name = $helper->ask($input, $output, $question);
     }
 
-
 .. caution::
 
     The normalizer is called first and the returned value is used as the input

components/index.rst

@@ -4,6 +4,6 @@ The Components
 .. toctree::
     :maxdepth: 1
     :glob:
-    
+
     using_components
     *

components/options_resolver.rst

@@ -376,7 +376,6 @@ is thrown::
 For options with more complicated validation schemes, pass a closure which
 returns ``true`` for acceptable values and ``false`` for invalid values::
 
-
     // ...
     $resolver->setAllowedValues('transport', function ($value) {
         // return true or false

components/property_access.rst

@@ -450,6 +450,5 @@ Or you can pass parameters directly to the constructor (not the recommended way)
     // ...
     $accessor = new PropertyAccessor(true); // this enables handling of magic __call
 
-
 .. _Packagist: https://packagist.org/packages/symfony/property-access
 .. _The Inflector component: https://github.com/symfony/inflector

components/serializer.rst

@@ -29,7 +29,6 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/serializer`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/serializer).
 
-
 .. include:: /components/require_autoload.rst.inc
 
 To use the ``ObjectNormalizer``, the :doc:`PropertyAccess component </components/property_access>`

components/validator/metadata.rst

@@ -1,72 +1,72 @@
-.. index::
-    single: Validator; Metadata
-
-Metadata
-========
-
-The :class:`Symfony\\Component\\Validator\\Mapping\\ClassMetadata` class
-represents and manages all the configured constraints on a given class.
-
-Properties
-----------
-
-The Validator component can validate public, protected or private properties.
-The following example shows how to validate that the ``$firstName`` property of
-the ``Author`` class has at least 3 characters::
-
-    // ...
-    use Symfony\Component\Validator\Mapping\ClassMetadata;
-    use Symfony\Component\Validator\Constraints as Assert;
-
-    class Author
-    {
-        private $firstName;
-
-        public static function loadValidatorMetadata(ClassMetadata $metadata)
-        {
-            $metadata->addPropertyConstraint('firstName', new Assert\NotBlank());
-            $metadata->addPropertyConstraint(
-                'firstName',
-                new Assert\Length(array("min" => 3))
-            );
-        }
-    }
-
-Getters
--------
-
-Constraints can also be applied to the value returned by any public *getter*
-method, which are the methods whose names start with ``get``, ``has`` or ``is``.
-This feature allows to validate your objects dynamically.
-
-Suppose that, for security reasons, you want to validate that a password field
-doesn't match the first name of the user. First, create a public method called
-``isPasswordSafe()`` to define this custom validation logic::
-
-    public function isPasswordSafe()
-    {
-        return $this->firstName !== $this->password;
-    }
-
-Then, add the Validator component configuration to the class::
-
-    // ...
-    use Symfony\Component\Validator\Mapping\ClassMetadata;
-    use Symfony\Component\Validator\Constraints as Assert;
-
-    class Author
-    {
-        public static function loadValidatorMetadata(ClassMetadata $metadata)
-        {
-            $metadata->addGetterConstraint('passwordSafe', new Assert\IsTrue(array(
-                'message' => 'The password cannot match your first name',
-            )));
-        }
-    }
-
-Classes
--------
-
-Some constraints allow to validate the entire object. For example, the
-:doc:`Callback </reference/constraints/Callback>` constraint is a generic
-constraint that's applied to the class itself.
+.. index::
+    single: Validator; Metadata
+
+Metadata
+========
+
+The :class:`Symfony\\Component\\Validator\\Mapping\\ClassMetadata` class
+represents and manages all the configured constraints on a given class.
+
+Properties
+----------
+
+The Validator component can validate public, protected or private properties.
+The following example shows how to validate that the ``$firstName`` property of
+the ``Author`` class has at least 3 characters::
+
+    // ...
+    use Symfony\Component\Validator\Mapping\ClassMetadata;
+    use Symfony\Component\Validator\Constraints as Assert;
+
+    class Author
+    {
+        private $firstName;
+
+        public static function loadValidatorMetadata(ClassMetadata $metadata)
+        {
+            $metadata->addPropertyConstraint('firstName', new Assert\NotBlank());
+            $metadata->addPropertyConstraint(
+                'firstName',
+                new Assert\Length(array("min" => 3))
+            );
+        }
+    }
+
+Getters
+-------
+
+Constraints can also be applied to the value returned by any public *getter*
+method, which are the methods whose names start with ``get``, ``has`` or ``is``.
+This feature allows to validate your objects dynamically.
+
+Suppose that, for security reasons, you want to validate that a password field
+doesn't match the first name of the user. First, create a public method called
+``isPasswordSafe()`` to define this custom validation logic::
+
+    public function isPasswordSafe()
+    {
+        return $this->firstName !== $this->password;
+    }
+
+Then, add the Validator component configuration to the class::
+
+    // ...
+    use Symfony\Component\Validator\Mapping\ClassMetadata;
+    use Symfony\Component\Validator\Constraints as Assert;
+
+    class Author
+    {
+        public static function loadValidatorMetadata(ClassMetadata $metadata)
+        {
+            $metadata->addGetterConstraint('passwordSafe', new Assert\IsTrue(array(
+                'message' => 'The password cannot match your first name',
+            )));
+        }
+    }
+
+Classes
+-------
+
+Some constraints allow to validate the entire object. For example, the
+:doc:`Callback </reference/constraints/Callback>` constraint is a generic
+constraint that's applied to the class itself.

console/command_in_controller.rst

@@ -55,7 +55,7 @@ Run this command from inside your controller via::
 
             // return the output, don't use if you used NullOutput()
             $content = $output->fetch();
-            
+
             // return new Response(""), if you used NullOutput()
             return new Response($content);
         }

contributing/code/bugs.rst

@@ -26,8 +26,8 @@ If your problem definitely looks like a bug, report it using the official bug
 * Describe the steps needed to reproduce the bug with short code examples
   (providing a unit test that illustrates the bug is best);
 
-* If the bug you experienced is not obvious or affects more than one layer, 
-  providing a simple failing unit test may not be sufficient. In this case, 
+* If the bug you experienced is not obvious or affects more than one layer,
+  providing a simple failing unit test may not be sufficient. In this case,
   please :doc:`provide a reproducer </contributing/code/reproducer>`;
 
 * Give as much detail as possible about your environment (OS, PHP version,

create_framework/front_controller.rst

@@ -140,7 +140,7 @@ web root directory:
 
     example.com
     ├── composer.json
-    ├── composer.lock    
+    ├── composer.lock
     ├── src
     │   └── pages
     │       ├── hello.php

create_framework/http_kernel_httpkernel_class.rst

@@ -68,7 +68,7 @@ attributes with route parameters.
 Our code is now much more concise and surprisingly more robust and more
 powerful than ever. For instance, use the built-in ``ExceptionListener`` to
 make your error management configurable::
-    
+
     $errorHandler = function (Symfony\Component\Debug\Exception\FlattenException $exception) {
         $msg = 'Something went wrong! ('.$exception->getMessage().')';
 

deployment.rst

@@ -103,7 +103,6 @@ specifically tailored to the requirements of Symfony.
 `sf2debpkg`_
     Helps you build a native Debian package for your Symfony project.
 
-
 Basic scripting
     You can of course use shell, `Ant`_ or any other build tool to script
     the deploying of your project.

doctrine.rst

@@ -328,7 +328,6 @@ and save it!
 .. code-block:: php
 
     // src/Controller/ProductController.php
-
     namespace App\Controller;
 
     // ...

form/dynamic_form_modification.rst

@@ -104,7 +104,6 @@ creating that particular field is delegated to an event listener::
         // ...
     }
 
-
 The goal is to create a ``name`` field *only* if the underlying ``Product``
 object is new (e.g. hasn't been persisted to the database). Based on that,
 the event listener might look like the following::

form/form_customization.rst

@@ -1005,7 +1005,6 @@ fields (e.g. a whole form), and not just an individual field.
             <?php endif ?>
         <?php endif ?>
 
-
 Customizing the "Form Row"
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 

introduction/from_flat_php_to_symfony2.rst

@@ -101,7 +101,6 @@ the code that prepares the HTML "presentation"::
     // include the HTML presentation code
     require 'templates/list.php';
 
-
 The HTML code is now stored in a separate file ``templates/list.php``, which
 is primarily an HTML file that uses a template-like PHP syntax:
 

page_creation.rst

@@ -329,7 +329,6 @@ Go Deeper with HTTP & Framework Fundamentals
 
     routing
 
-
 .. toctree::
     :maxdepth: 1
     :glob:

reference/configuration/doctrine.rst

@@ -23,7 +23,6 @@ Full Default Configuration
                         class:                App\DBAL\MyCustomType
                         commented:            true
 
-
                 connections:
                     # A collection of different named connections (e.g. default, conn2, etc)
                     default:
@@ -301,7 +300,7 @@ The following block shows all possible configuration keys:
                 password:             secret
                 driver:               pdo_mysql
                 # if the url option is specified, it will override the above config
-                url:                  mysql://db_user:[email protected]:3306/db_name 
+                url:                  mysql://db_user:[email protected]:3306/db_name
                 # the DBAL driverClass option
                 driver_class:         App\DBAL\MyDatabaseDriver
                 # the DBAL driverOptions option

reference/constraints/Blank.rst

@@ -10,7 +10,6 @@ Validates that a value is blank - meaning equal to an empty string or ``null``::
 To force that a value strictly be equal to ``null``, see the
 :doc:`/reference/constraints/IsNull` constraint.
 
-
 To force that a value is *not* blank, see :doc:`/reference/constraints/NotBlank`.
 But be careful as ``NotBlank`` is *not* strictly the opposite of ``Blank``.
 

reference/constraints/Isbn.rst

@@ -55,7 +55,6 @@ on an object that will contain an ISBN.
                         type: isbn10
                         message: This value is not  valid.
 
-
     .. code-block:: xml
 
         <!-- config/validator/validation.xml -->

reference/constraints/Uuid.rst

@@ -78,7 +78,6 @@ Basic Usage
             }
         }
 
-
 Options
 -------
 

reference/forms/types/number.rst

@@ -51,7 +51,7 @@ rounding_mode
 If a submitted number needs to be rounded (based on the `scale`_
 option), you have several configurable options for that rounding. Each
 option is a constant on the :class:`Symfony\\Component\\Form\\Extension\\Core\\DataTransformer\\NumberToLocalizedStringTransformer`:
-    
+
 * ``NumberToLocalizedStringTransformer::ROUND_DOWN`` Round towards zero.
 
 * ``NumberToLocalizedStringTransformer::ROUND_FLOOR`` Round towards negative

reference/forms/types/percent.rst

@@ -4,7 +4,6 @@
 PercentType Field
 =================
 
-
 The ``PercentType`` renders an input text field and specializes in handling
 percentage data. If your percentage data is stored as a decimal (e.g. ``.95``),
 you can use this field out-of-the-box. If you store your data as a number

security/form_login_setup.rst

@@ -220,7 +220,6 @@ Finally, create the template:
             <button type="submit">login</button>
         </form>
 
-
 .. tip::
 
     The ``error`` variable passed into the template is an instance of

templating/PHP.rst

@@ -107,7 +107,6 @@ below renders the ``index.html.php`` template::
         {# traditional template notation will also work #}
         {{ include('hello/index.html.twig') }}
 
-
 .. index::
   single: Templating; Layout
   single: Layout

translation/debug.rst

@@ -64,7 +64,6 @@ you've already setup some translations for the ``fr`` locale:
             </file>
         </xliff>
 
-
     .. code-block:: yaml
 
         # translations/messages.fr.yaml