Merge branch '3.4' into 4.2

* 3.4:
  use .. instead of .. code-block: php

Author: javiereguiluz

best_practices/security.rst

@@ -108,9 +108,7 @@ For controlling access on a controller-by-controller basis, use the ``@Security`
 annotation whenever possible. Placing it above each action makes it consistent and readable.
 
 In our application, you need the ``ROLE_ADMIN`` in order to create a new post.
-Using ``@Security``, this looks like:
-
-.. code-block:: php
+Using ``@Security``, this looks like::
 
     use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
     use Symfony\Component\Routing\Annotation\Route;

bundles/configuration.rst

@@ -301,9 +301,7 @@ In your extension, you can load this and dynamically set its arguments::
     Using the Config component is fully optional. The ``load()`` method gets an
     array of configuration values. You can instead parse these arrays yourself
     (e.g. by overriding configurations and using :phpfunction:`isset` to check
-    for the existence of a value). Be aware that it'll be very hard to support XML.
-
-    .. code-block:: php
+    for the existence of a value). Be aware that it'll be very hard to support XML::
 
         public function load(array $configs, ContainerBuilder $container)
         {

components/property_access.rst

@@ -296,9 +296,7 @@ can use setters, the magic ``__set()`` method or properties to set values::
     var_dump($person->getChildren()); // [Person()];
 
 You can also use ``__call()`` to set values but you need to enable the feature,
-see `Enable other Features`_.
-
-.. code-block:: php
+see `Enable other Features`_::
 
     // ...
     class Person
@@ -335,9 +333,7 @@ Writing to Array Properties
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The ``PropertyAccessor`` class allows to update the content of arrays stored in
-properties through *adder* and *remover* methods.
-
-.. code-block:: php
+properties through *adder* and *remover* methods::
 
     // ...
     class Person

components/property_info.rst

@@ -37,9 +37,7 @@ Usage
 
 To use this component, create a new
 :class:`Symfony\\Component\\PropertyInfo\\PropertyInfoExtractor` instance and
-provide it with a set of information extractors.
-
-.. code-block:: php
+provide it with a set of information extractors::
 
     use Symfony\Component\PropertyInfo\PropertyInfoExtractor;
     use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
@@ -151,9 +149,7 @@ List Information
 
 Extractors that implement :class:`Symfony\\Component\\PropertyInfo\\PropertyListExtractorInterface`
 provide the list of properties that are available on a class as an array
-containing each property name as a string.
-
-.. code-block:: php
+containing each property name as a string::
 
     $properties = $propertyInfo->getProperties($class);
     /*
@@ -173,9 +169,7 @@ Type Information
 
 Extractors that implement :class:`Symfony\\Component\\PropertyInfo\\PropertyTypeExtractorInterface`
 provide :ref:`extensive data type information <components-property-info-type>`
-for a property.
-
-.. code-block:: php
+for a property::
 
     $types = $propertyInfo->getTypes($class, $property);
 
@@ -204,9 +198,7 @@ Description Information
 
 Extractors that implement :class:`Symfony\\Component\\PropertyInfo\\PropertyDescriptionExtractorInterface`
 provide long and short descriptions from a properties annotations as
-strings.
-
-.. code-block:: php
+strings::
 
     $title = $propertyInfo->getShortDescription($class, $property);
     /*
@@ -230,9 +222,7 @@ Access Information
 ~~~~~~~~~~~~~~~~~~
 
 Extractors that implement :class:`Symfony\\Component\\PropertyInfo\\PropertyAccessExtractorInterface`
-provide whether properties are readable or writable as booleans.
-
-.. code-block:: php
+provide whether properties are readable or writable as booleans::
 
     $propertyInfo->isReadable($class, $property);
     // Example Result: bool(true)
@@ -251,9 +241,7 @@ Property Initializable Information
 ----------------------------------
 
 Extractors that implement :class:`Symfony\\Component\\PropertyInfo\\PropertyInitializableExtractorInterface`
-provide whether properties are initializable through the class's constructor as booleans.
-
-.. code-block:: php
+provide whether properties are initializable through the class's constructor as booleans::
 
     $propertyInfo->isInitializable($class, $property);
     // Example Result: bool(true)
@@ -413,9 +401,7 @@ Using `phpDocumentor Reflection`_ to parse property and method annotations,
 the :class:`Symfony\\Component\\PropertyInfo\\Extractor\\PhpDocExtractor`
 provides type and description information. This extractor is automatically
 registered with the ``property_info`` in the Symfony Framework *if* the dependent
-library is present.
-
-.. code-block:: php
+library is present::
 
     use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
 
@@ -438,9 +424,7 @@ Using :ref:`groups metadata <serializer-using-serialization-groups-annotations>`
 from the :doc:`Serializer component </components/serializer>`,
 the :class:`Symfony\\Component\\PropertyInfo\\Extractor\\SerializerExtractor`
 provides list information. This extractor is *not* registered automatically
-with the ``property_info`` service in the Symfony Framework.
-
-.. code-block:: php
+with the ``property_info`` service in the Symfony Framework::
 
     use Doctrine\Common\Annotations\AnnotationReader;
     use Symfony\Component\PropertyInfo\Extractor\SerializerExtractor;
@@ -466,9 +450,7 @@ DoctrineExtractor
 Using entity mapping data from `Doctrine ORM`_, the
 :class:`Symfony\\Bridge\\Doctrine\\PropertyInfo\\DoctrineExtractor`
 provides list and type information. This extractor is not registered automatically
-with the ``property_info`` service in the Symfony Framework.
-
-.. code-block:: php
+with the ``property_info`` service in the Symfony Framework::
 
     use Doctrine\ORM\EntityManager;
     use Doctrine\ORM\Tools\Setup;

components/serializer.rst

@@ -1102,9 +1102,7 @@ If you want to deserialize such a structure, you need to add the
 :class:`Symfony\\Component\\Serializer\\Normalizer\\ArrayDenormalizer`
 to the set of normalizers. By appending ``[]`` to the type parameter of the
 :method:`Symfony\\Component\\Serializer\\Serializer::deserialize` method,
-you indicate that you're expecting an array instead of a single object.
-
-.. code-block:: php
+you indicate that you're expecting an array instead of a single object::
 
     use Symfony\Component\Serializer\Encoder\JsonEncoder;
     use Symfony\Component\Serializer\Normalizer\ArrayDenormalizer;

components/var_dumper/advanced.rst

@@ -215,9 +215,7 @@ bit field of ``Caster::EXCLUDE_*`` constants and influences the expected
 output produced by the different casters.
 
 If ``DUMP_STRING_LENGTH`` is set, then the length of a string is displayed
-next to its content:
-
-.. code-block:: php
+next to its content::
 
     use Symfony\Component\VarDumper\Dumper\AbstractDumper;
     use Symfony\Component\VarDumper\Dumper\CliDumper;
@@ -239,9 +237,7 @@ next to its content:
     // ]
 
 If ``DUMP_LIGHT_ARRAY`` is set, then arrays are dumped in a shortened format
-similar to PHP's short array notation:
-
-.. code-block:: php
+similar to PHP's short array notation::
 
     use Symfony\Component\VarDumper\Dumper\AbstractDumper;
     use Symfony\Component\VarDumper\Dumper\CliDumper;
@@ -263,9 +259,7 @@ similar to PHP's short array notation:
     // ]
 
 If you would like to use both options, then you can combine them by
-using a the logical OR operator ``|``:
-
-.. code-block:: php
+using a the logical OR operator ``|``::
 
     use Symfony\Component\VarDumper\Dumper\AbstractDumper;
     use Symfony\Component\VarDumper\Dumper\CliDumper;

contributing/code/standards.rst

@@ -27,9 +27,7 @@ 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:: php
+short example containing most features described below::
 
     /*
      * This file is part of the Symfony package.

deployment/proxies.rst

@@ -22,9 +22,7 @@ Solution: setTrustedProxies()
 -----------------------------
 
 To fix this, you need to tell Symfony which reverse proxy IP addresses to trust
-and what headers your reverse proxy uses to send information:
-
-.. code-block:: php
+and what headers your reverse proxy uses to send information::
 
     // public/index.php
 

form/data_mappers.rst

@@ -78,9 +78,7 @@ one of the values is changed.
 
 The red, green and blue form fields have to be mapped to the constructor
 arguments and the ``Color`` instance has to be mapped to red, green and blue
-form fields. Recognize a familiar pattern? It's time for a data mapper!
-
-.. code-block:: php
+form fields. Recognize a familiar pattern? It's time for a data mapper::
 
     // src/App/Form/DataMapper/ColorMapper.php
     namespace App\Form\DataMapper;

form/without_class.rst

@@ -103,9 +103,7 @@ but here's a short example::
 
     If you are using validation groups, you need to either reference the
     ``Default`` group when creating the form, or set the correct group on
-    the constraint you are adding.
-
-    .. code-block:: php
+    the constraint you are adding::
 
         new NotBlank(['groups' => ['create', 'update']]);