Merge branch '3.4' into 4.0

* 3.4: (28 commits)
  Correcting my bad english with a bilingual friend
  Add XmlEncoder documentation with $context available options
  This doc doesn't apply to version 3.4
  Refactored the code
  Mention and recommend to use PHP-CS-Fixer when contributing code
  Updated the "custom data collector" article
  Reworded the note about dump() availability per environment
  Fixed an example in the form testing article
  Improved the routing debug article
  Mention that we are using Bootstrap Datepicker
  ...

Author: javiereguiluz

bundles.rst

@@ -77,43 +77,16 @@ called ``AcmeTestBundle.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
-of the bundle.
+of the bundle. Now that you've created the bundle, enable it::
 
-Now that you've created the bundle, enable it via the ``AppKernel`` class::
-
-    // app/AppKernel.php
-    public function registerBundles()
-    {
-        $bundles = array(
-            // ...
-
-            // register your bundle
-            new Acme\TestBundle\AcmeTestBundle(),
-        );
+    // config/bundles.php
+    return [
         // ...
-
-        return $bundles;
-    }
+        Acme\TestBundle\AcmeTestBundle::class => ['all' => true],
+    ];
 
 And while it doesn't do anything yet, AcmeTestBundle is now ready to be used.
 
-And as easy as this is, Symfony also provides a command-line interface for
-generating a basic bundle skeleton:
-
-.. code-block:: terminal
-
-    $ php bin/console generate:bundle --namespace=Acme/TestBundle
-
-The bundle skeleton generates a basic controller, template and routing
-resource that can be customized. You'll learn more about Symfony's command-line
-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.
-
 Bundle Directory Structure
 --------------------------
 
@@ -131,7 +104,7 @@ of the most common elements of a bundle:
     necessary).
 
 ``Resources/config/``
-    Houses configuration, including routing configuration (e.g. ``routing.yml``).
+    Houses configuration, including routing configuration (e.g. ``routing.yaml``).
 
 ``Resources/views/``
     Holds templates organized by controller name (e.g. ``Random/index.html.twig``).

components/form.rst

@@ -174,7 +174,7 @@ to bootstrap or access Twig and add the :class:`Symfony\\Bridge\\Twig\\Extension
 
     use Symfony\Component\Form\Forms;
     use Symfony\Bridge\Twig\Extension\FormExtension;
-    use Symfony\Bridge\Twig\Form\TwigRenderer;
+    use Symfony\Component\Form\FormRenderer;
     use Symfony\Bridge\Twig\Form\TwigRendererEngine;
 
     // the Twig file that holds all the default markup for rendering forms
@@ -195,8 +195,8 @@ to bootstrap or access Twig and add the :class:`Symfony\\Bridge\\Twig\\Extension
     )));
     $formEngine = new TwigRendererEngine(array($defaultFormTheme), $twig);
     $twig->addRuntimeLoader(new \Twig_FactoryRuntimeLoader(array(
-        TwigRenderer::class => function () use ($formEngine, $csrfManager) {
-            return new TwigRenderer($formEngine, $csrfManager);
+        FormRenderer::class => function () use ($formEngine, $csrfManager) {
+            return new FormRenderer($formEngine, $csrfManager);
         },
     )));
 

components/lock.rst

@@ -59,6 +59,13 @@ method can be safely called repeatedly, even if the lock is already acquired.
     to be used by several services, they should share the same ``Lock`` instance
     returned by the ``Factory::createLock`` method.
 
+.. tip::
+
+    If you don't release the lock explicitly, it will be released automatically
+    on instance destruction. In some cases, it can be useful to lock a resource
+    across several requests. To disable the automatic release behavior, set the
+    third argument of the ``createLock()`` method to ``false``.
+
 Blocking Locks
 --------------
 

components/serializer.rst

@@ -853,6 +853,63 @@ you indicate that you're expecting an array instead of a single object.
     $data = ...; // The serialized data from the previous example
     $persons = $serializer->deserialize($data, 'Acme\Person[]', 'json');
 
+The ``XmlEncoder``
+------------------
+
+This encoder transforms arrays into XML and vice versa. For example, take an
+object normalized as following::
+
+    array('foo' => array(1, 2), 'bar' => true);
+
+The ``XmlEncoder`` encodes this object as follows:
+
+.. code-block:: xml
+
+    <?xml version="1.0"?>
+    <response>
+        <foo>1</foo>
+        <foo>2</foo>
+        <bar>1</bar>
+    </response>
+
+The array keys beginning with ``@`` are considered XML attributes::
+
+    array('foo' => array('@bar' => 'value'));
+
+    // is encoded as follows:
+    // <?xml version="1.0"?>
+    // <response>
+    //     <foo bar="value" />
+    // </response>
+
+Context
+~~~~~~~
+
+The ``encode()`` method defines a third optional parameter called ``context``
+which defines the configuration options for the XmlEncoder an associative array::
+
+    $xmlEncoder->encode($array, 'xml', $context);
+
+These are the options available:
+
+``xml_format_output``
+    If set to true, formats the generated XML with line breaks and indentation.
+
+``xml_version``
+    Sets the XML version attribute (default: ``1.1``).
+
+``xml_encoding``
+    Sets the XML encoding attribute (default: ``utf-8``).
+
+``xml_standalone``
+    Adds standalone attribute in the generated XML (default: ``true``).
+
+``xml_root_node_name``
+    Sets the root node name (default: ``response``).
+
+``remove_empty_tags``
+    If set to true, removes all empty tags in the generated XML.
+
 Recursive Denormalization and Type Safety
 -----------------------------------------
 

contributing/code/standards.rst

@@ -1,19 +1,33 @@
 Coding Standards
 ================
 
-When contributing code to Symfony, you must follow its coding standards. To
-make a long story short, here is the golden rule: **Imitate the existing
-Symfony code**. Most open-source Bundles and libraries used by Symfony also
-follow the same guidelines, and you should too.
+Symfony code is contributed by thousands of developers around the world. To make
+every piece of code look and feel familiar, Symfony defines some coding standards
+that all contributions must follow.
 
-Remember that the main advantage of standards is that every piece of code
-looks and feels familiar, it's not about this or that being more readable.
+These Symfony coding standards are based on the `PSR-1`_, `PSR-2`_ and `PSR-4`_
+standards, so you may already know most of them.
 
-Symfony follows the standards defined in the `PSR-0`_, `PSR-1`_, `PSR-2`_ and `PSR-4`_
-documents.
+Making your Code Follow the Coding Standards
+--------------------------------------------
 
-Since a picture - or some code - is worth a thousand words, here's a short
-example containing most features described below:
+Instead of reviewing your code manually, Symfony makes it simple to ensure that
+your contributed code matches the expected code syntax. First, install the
+`PHP CS Fixer tool`_ and then, run this command to fix any problem:
+
+.. code-block:: terminal
+
+    $ cd your-project/
+    $ php php-cs-fixer.phar fix -v
+
+If you forget to run this command and make a pull request with any syntax issue,
+our automated tools will warn you about that and will provide the solution.
+
+Symfony Coding Standards in Detail
+----------------------------------
+
+If you want to learn about the Symfony coding standards in detail, here's a
+short example containing most features described below:
 
 .. code-block:: html+php
 
@@ -122,7 +136,7 @@ example containing most features described below:
     }
 
 Structure
----------
+~~~~~~~~~
 
 * Add a single space after each comma delimiter;
 
@@ -181,7 +195,7 @@ Structure
 * Do not use spaces around ``[`` offset accessor and before ``]`` offset accessor.
 
 Naming Conventions
-------------------
+~~~~~~~~~~~~~~~~~~
 
 * Use camelCase, not underscores, for variable, function and method
   names, arguments;
@@ -228,7 +242,7 @@ Service Naming Conventions
   to ``something.service_name``).
 
 Documentation
--------------
+~~~~~~~~~~~~~
 
 * Add PHPDoc blocks for all classes, methods, and functions (though you may
   be asked to remove PHPDoc that do not add value);
@@ -239,14 +253,17 @@ Documentation
 
 * Omit the ``@return`` tag if the method does not return anything;
 
-* The ``@package`` and ``@subpackage`` annotations are not used.
+* The ``@package`` and ``@subpackage`` annotations are not used;
+
+* Inline the ``@inheritdoc`` tag.
 
 License
--------
+~~~~~~~
 
 * Symfony is released under the MIT license, and the license block has to be
   present at the top of every PHP file, before the namespace.
 
+.. _`PHP CS Fixer tool`: http://cs.sensiolabs.org/
 .. _`PSR-0`: http://www.php-fig.org/psr/psr-0/
 .. _`PSR-1`: http://www.php-fig.org/psr/psr-1/
 .. _`PSR-2`: http://www.php-fig.org/psr/psr-2/

form/unit_testing.rst

@@ -49,7 +49,8 @@ The simplest ``TypeTestCase`` implementation looks like the following::
 
             $form = $this->factory->create(TestedType::class);
 
-            $object = TestObject::fromArray($formData);
+            $object = new TestObject();
+            // ...populate $object properties with the data stored in $formData
 
             // submit the data to the form directly
             $form->submit($formData);