Merge branch '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