Merge branch '3.0' into 3.1

components/config/definition.rst

@@ -722,7 +722,7 @@ The builder is used for adding advanced validation rules to node definitions, li
                         ->isRequired()
                         ->validate()
                         ->ifNotInArray(array('mysql', 'sqlite', 'mssql'))
-                            ->thenInvalid('Invalid database driver "%s"')
+                            ->thenInvalid('Invalid database driver %s')
                         ->end()
                     ->end()
                 ->end()

components/finder.rst

@@ -41,7 +41,7 @@ directories::
     }
 
 The ``$file`` is an instance of :class:`Symfony\\Component\\Finder\\SplFileInfo`
-which extends :phpclass:`SplFileInfo` to provide methods to work with relative
+which extends PHP's own :phpclass:`SplFileInfo` to provide methods to work with relative
 paths.
 
 The above code prints the names of all the files in the current directory

components/form.rst

@@ -134,7 +134,7 @@ The following snippet adds CSRF protection to the form factory::
 
     $formFactory = Forms::createFormFactoryBuilder()
         // ...
-        ->addExtension(new CsrfExtension($csrfStorage))
+        ->addExtension(new CsrfExtension($csrfManager))
         ->getFormFactory();
 
 Internally, this extension will automatically add a hidden field to every

contributing/code/core_team.rst

@@ -71,6 +71,8 @@ Active Core Members
   * **Javier Eguiluz** (`javiereguiluz`_) can merge into the WebProfilerBundle_
     bundle.
 
+  * **Grégoire Pineau** (`lyrixx`_) can merge into the Workflow_ component.
+
 * **Deciders** (``@symfony/deciders`` on GitHub):
 
   * **Jordi Boggiano** (`seldaek`_);
@@ -181,6 +183,7 @@ discretion of the **Project Leader**.
 .. _TwigBridge: https://github.com/symfony/twig-bridge
 .. _Validator: https://github.com/symfony/validator
 .. _VarDumper: https://github.com/symfony/var-dumper
+.. _Workflow: https://github.com/symfony/workflow
 .. _Yaml: https://github.com/symfony/yaml
 .. _WebProfilerBundle: https://github.com/symfony/web-profiler-bundle
 .. _`fabpot`: https://github.com/fabpot/
@@ -197,3 +200,4 @@ discretion of the **Project Leader**.
 .. _`aitboudad`: https://github.com/aitboudad/
 .. _`xabbuh`: https://github.com/xabbuh/
 .. _`javiereguiluz`: https://github.com/javiereguiluz/
+.. _`lyrixx`: https://github.com/lyrixx/

reference/constraints/IdenticalTo.rst

@@ -28,7 +28,7 @@ Basic Usage
 
 The following constraints ensure that:
 
-* ``firstName`` of ``Person` class is equal to ``Mary`` *and* is a string
+* ``firstName`` of ``Person`` class is equal to ``Mary`` *and* is a string
 * ``age`` is equal to``20`` *and* is of type integer
 
 .. configuration-block::

serializer.rst

@@ -92,14 +92,15 @@ Here is an example on how to load the
         services:
             get_set_method_normalizer:
                 class: Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer
+                public: false
                 tags:
                     - { name: serializer.normalizer }
 
     .. code-block:: xml
 
         <!-- app/config/services.xml -->
         <services>
-            <service id="get_set_method_normalizer" class="Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer">
+            <service id="get_set_method_normalizer" class="Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer" public="false">
                 <tag name="serializer.normalizer" />
             </service>
         </services>
@@ -112,6 +113,7 @@ Here is an example on how to load the
         $definition = new Definition(
             'Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer'
         ));
+        $definition->setPublic(false);
         $definition->addTag('serializer.normalizer');
         $container->setDefinition('get_set_method_normalizer', $definition);
 

service_container/definitions.rst

@@ -96,7 +96,7 @@ fetched from the container::
 .. caution::
 
     Don't use ``get()`` to get a service that you want to inject as constructor
-    argument, the service is not yet availabe. Instead, use inject a
+    argument, the service is not yet availabe. Instead, use a
     ``Reference`` instance as shown above.
 
 Method Calls