Merge branch '3.2'

* 3.2: (60 commits)
  docs: choice constraints reference
  [#7707] minor tweak
  Fixed code block under "Custom Messages"
  [#7744] fix XSD locations
  Minor XML codes fixes
  [#7686] tweak the example code
  [#7663] update the PHP example code
  Update hostname_pattern.rst
  Add missing ";"
  Use HTTP instead of http
  Fixed indentation in security.rst
  Be consistent on service name
  Fix missing /
  typo fix
  Fix trusted hosts example regular expressions
  add reference built in listener for kernel.response event in >=3.1
  fixup comment
  Testing: Fix typo from #6427
  Update apache_router.rst
  Update fortrabbit.rst
  ...

Author: xabbuh

_images/quick_tour/web_debug_toolbar.png

@@ -163,8 +163,9 @@ In this case you can specify that the ``coffee`` filter is applied to all
                     name="coffee"
                     bin="/usr/bin/coffee"
                     node="/usr/bin/node"
-                    apply_to="\.coffee$" />
-                    <assetic:node-paths>/usr/lib/node_modules/</assetic:node-path>
+                    apply-to="\.coffee$">
+                    <assetic:node-path>/usr/lib/node_modules/</assetic:node-path>
+                </assetic:filter>
             </assetic:config>
         </container>
 
@@ -174,10 +175,10 @@ In this case you can specify that the ``coffee`` filter is applied to all
         $container->loadFromExtension('assetic', array(
             'filters' => array(
                 'coffee' => array(
-                    'bin'      => '/usr/bin/coffee',
-                    'node'     => '/usr/bin/node',
+                    'bin'        => '/usr/bin/coffee',
+                    'node'       => '/usr/bin/node',
                     'node_paths' => array('/usr/lib/node_modules/'),
-                    'apply_to' => '\.coffee$',
+                    'apply_to'   => '\.coffee$',
                 ),
             ),
         ));

_images/security/anonymous_wdt.png

@@ -411,7 +411,7 @@ configuration under the ``assetic`` section. Read more in the
                     ),
                 ),
             ),
-        );
+        ));
 
 After you have defined the named assets, you can reference them in your templates
 with the ``@named_asset`` notation:

_images/security/symfony_loggedin_wdt.png

@@ -113,7 +113,7 @@ to ``true``:
                 <assetic:filter
                     name="jpegoptim"
                     bin="path/to/jpegoptim"
-                    strip_all="true" />
+                    strip-all="true" />
             </assetic:config>
         </container>
 
@@ -217,7 +217,7 @@ following configuration:
                     name="jpegoptim"
                     bin="path/to/jpegoptim" />
                 <assetic:twig>
-                    <assetic:twig_function
+                    <assetic:function
                         name="jpegoptim" />
                 </assetic:twig>
             </assetic:config>
@@ -234,7 +234,6 @@ following configuration:
             ),
             'twig' => array(
                 'functions' => array('jpegoptim'),
-                ),
             ),
         ));
 
@@ -277,7 +276,7 @@ file:
                     name="jpegoptim"
                     bin="path/to/jpegoptim" />
                 <assetic:twig>
-                    <assetic:twig_function
+                    <assetic:function
                         name="jpegoptim"
                         output="images/*.jpg" />
                 </assetic:twig>
@@ -296,7 +295,7 @@ file:
             'twig' => array(
                 'functions' => array(
                     'jpegoptim' => array(
-                        output => 'images/*.jpg'
+                        'output' => 'images/*.jpg',
                     ),
                 ),
             ),

assetic/apply_to_option.rst

@@ -99,7 +99,7 @@ First, configure a new ``scssphp`` Assetic filter:
                 http://symfony.com/schema/dic/assetic/assetic-1.0.xsd">
 
             <assetic:config>
-                <filter name="scssphp" formatter="Leafo\ScssPhp\Formatter\Compressed" />
+                <assetic:filter name="scssphp" formatter="Leafo\ScssPhp\Formatter\Compressed" />
                 <!-- ... -->
             </assetic:config>
         </container>
@@ -172,7 +172,7 @@ First, configure a new ``jsqueeze`` Assetic filter as follows:
                 http://symfony.com/schema/dic/assetic/assetic-1.0.xsd">
 
             <assetic:config>
-                <filter name="jsqueeze" />
+                <assetic:filter name="jsqueeze" />
                 <!-- ... -->
             </assetic:config>
         </container>

assetic/asset_management.rst

@@ -170,11 +170,11 @@ can configure its location using the ``node`` key:
 
         // app/config/config.php
         $container->loadFromExtension('assetic', array(
-            'node' => '/usr/bin/nodejs',
+            'node'      => '/usr/bin/nodejs',
             'uglifyjs2' => array(
-                    // the path to the uglifyjs executable
-                    'bin' => '/usr/local/bin/uglifyjs',
-                ),
+                // the path to the uglifyjs executable
+                'bin' => '/usr/local/bin/uglifyjs',
+            ),
         ));
 
 Minify your Assets

assetic/jpeg_optimize.rst

@@ -335,7 +335,7 @@ To enable the security voter in the application, define a new service:
     # app/config/services.yml
     services:
         # ...
-        post_voter:
+        app.post_voter:
             class:      AppBundle\Security\PostVoter
             arguments: ['@security.access.decision_manager']
             public:     false

assetic/php.rst

@@ -81,8 +81,8 @@ bundle configuration would look like:
 
         <!-- app/config/config.xml -->
         <?xml version="1.0" ?>
-
         <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:acme-social="http://example.org/schema/dic/acme_social"
             xsi:schemaLocation="http://symfony.com/schema/dic/services
                 http://symfony.com/schema/dic/services/services-1.0.xsd">

assetic/uglifyjs.rst

@@ -118,7 +118,7 @@ of the bundle's configuration:
 
 The output will look like this:
 
-.. code-block:: text
+.. code-block:: yaml
 
     assetic:
         debug:                '%kernel.debug%'

best_practices/security.rst

@@ -300,7 +300,7 @@ before displaying these messages, you must define your own custom format::
     $progressBar->setFormat('custom');
 
 Now, use the ``setMessage()`` method to set the value of the ``%message%``
-placeholder before displaying the progress bar:
+placeholder before displaying the progress bar::
 
     // ...
     $progressBar->setMessage('Start');

bundles/configuration.rst

@@ -49,7 +49,7 @@ endpoint for filesystem operations::
 mkdir
 ~~~~~
 
-:method:`Symfony\\Component\\Filesystem\\Filesystem::mkdir` creates a directory.
+:method:`Symfony\\Component\\Filesystem\\Filesystem::mkdir` creates a directory recursively.
 On POSIX filesystems, directories are created with a default mode value
 `0777`. You can use the second argument to set your own mode::
 

bundles/installation.rst

@@ -35,6 +35,24 @@ You can install the component in 2 different ways:
 
 .. include:: /components/require_autoload.rst.inc
 
+If you plan to :ref:`write-assertions-about-deprecations` and use the regular
+PHPUnit script (not the modified PHPUnit script provided by Symfony), you have
+to register a new `test listener`_ called ``SymfonyTestsListener``:
+
+.. code-block:: xml
+
+    <!-- http://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
+    <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.0/phpunit.xsd"
+    >
+
+        <!-- ... -->
+
+        <listeners>
+            <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
+        </listeners>
+    </phpunit>
+
 Usage
 -----
 
@@ -94,9 +112,9 @@ message, enclosed with ``/``. For example, with:
 
 .. code-block:: xml
 
-    <!-- http://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
+    <!-- http://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
     <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+             xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.0/phpunit.xsd"
     >
 
         <!-- ... -->
@@ -147,6 +165,8 @@ completely disable the deprecation helper. This is useful to make use of the
 rest of features provided by this component without getting errors or messages
 related to deprecations.
 
+.. _write-assertions-about-deprecations:
+
 Write Assertions about Deprecations
 -----------------------------------
 
@@ -411,3 +431,4 @@ If you have installed the bridge through Composer, you can run it by calling e.g
 .. _`@-silencing operator`: http://php.net/manual/en/language.operators.errorcontrol.php
 .. _`@-silenced`: http://php.net/manual/en/language.operators.errorcontrol.php
 .. _`Travis CI`: https://travis-ci.org/
+.. _`test listener`: https://phpunit.de/manual/current/en/appendixes.configuration.html#appendixes.configuration.test-listeners

components/console/helpers/progressbar.rst

@@ -206,6 +206,9 @@ to find a route that fits the given request you can also build a URL from
 a certain route::
 
     use Symfony\Component\Routing\Generator\UrlGenerator;
+    use Symfony\Component\Routing\RequestContext;
+    use Symfony\Component\Routing\Route;
+    use Symfony\Component\Routing\RouteCollection;
 
     $routes = new RouteCollection();
     $routes->add('show_post', new Route('/show/{slug}'));
@@ -321,7 +324,7 @@ a path to the main route definition and some other settings::
         $resource,
         array $options = array(),
         RequestContext $context = null,
-        array $defaults = array()
+        LoggerInterface $logger = null
     );
 
 With the ``cache_dir`` option you can enable route caching (if you provide a
@@ -370,9 +373,7 @@ routes with UTF-8 characters:
         class DefaultController extends Controller
         {
             /**
-             *
              * @Route("/category/{name}", name="route1", options={"utf8": true})
-             *
              */
             public function categoryAction()
             {
@@ -446,15 +447,13 @@ You can also include UTF-8 strings as routing requirements:
         class DefaultController extends Controller
         {
             /**
-                *
-                * @Route(
-                *     "/category/{name}",
-                *     name="route2",
-                *     requirements={"default"="한국어"},
-                *     options={"utf8": true}
-                * )
-                *
-                */
+             * @Route(
+             *     "/category/{name}",
+             *     name="route2",
+             *     requirements={"default"="한국어"},
+             *     options={"utf8": true}
+             * )
+             */
             public function defaultAction()
             {
                 // ...

components/filesystem.rst

@@ -71,6 +71,7 @@ The default authentication manager is an instance of
 :class:`Symfony\\Component\\Security\\Core\\Authentication\\AuthenticationProviderManager`::
 
     use Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager;
+    use Symfony\Component\Security\Core\Exception\AuthenticationException;
 
     // instances of Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface
     $providers = array(...);
@@ -229,6 +230,7 @@ own, it just needs to follow these rules:
                }
 
                // ...
+           }
        }
 
 Using Password Encoders

components/phpunit_bridge.rst

@@ -148,12 +148,18 @@ Caching
 Using many loaders to load metadata from different places is convenient, but it
 can slow down your application because each file needs to be parsed, validated
 and converted into a :class:`Symfony\\Component\\Validator\\Mapping\\ClassMetadata`
-instance. To solve this problem, you can cache the ``ClassMetadata`` information.
+instance.
 
-The Validator component comes with an
-:class:`Symfony\\Component\\Validator\\Mapping\\Cache\\ApcCache`
-implementation. You can easily create other cachers by creating a class which
-implements :class:`Symfony\\Component\\Validator\\Mapping\\Cache\\CacheInterface`.
+To solve this problem, call the :method:`Symfony\\Component\\Validator\\ValidatorBuilder::setMetadataCache`
+method of the Validator builder and pass your own caching class (which must
+implement :class:`Symfony\\Component\\Validator\\Mapping\\Cache\\CacheInterface`)::
+
+    use Symfony\Component\Validator\Validation;
+
+    $validator = Validation::createValidatorBuilder()
+        // ... add loaders
+        ->setMetadataCache(new SomeImplementCacheInterface());
+        ->getValidator();
 
 .. note::
 
@@ -163,18 +169,6 @@ implements :class:`Symfony\\Component\\Validator\\Mapping\\Cache\\CacheInterface
     the Validator still needs to merge all metadata of one class from every
     loader when it is requested.
 
-Enable the cache calling the
-:method:`Symfony\\Component\\Validator\\ValidatorBuilder::setMetadataCache`
-method of the Validator builder::
-
-    use Symfony\Component\Validator\Validation;
-    use Symfony\Component\Validator\Mapping\Cache\ApcCache;
-
-    $validator = Validation::createValidatorBuilder()
-        // ... add loaders
-        ->setMetadataCache(new ApcCache('some_apc_prefix'));
-        ->getValidator();
-
 Using a Custom MetadataFactory
 ------------------------------
 
@@ -193,7 +187,7 @@ this custom implementation using
     use Symfony\Component\Validator\Validation;
 
     $validator = Validation::createValidatorBuilder()
-        ->setMetadataFactory(new CustomMetadataFactory(...));
+        ->setMetadataFactory(new CustomMetadataFactory(...))
         ->getValidator();
 
 .. caution::

components/routing.rst

@@ -150,14 +150,8 @@ it *also* loads other configuration files via its ``imports`` key:
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns:framework="http://symfony.com/schema/dic/symfony"
-            xmlns:twig="http://symfony.com/schema/dic/twig"
             xsi:schemaLocation="http://symfony.com/schema/dic/services
-                http://symfony.com/schema/dic/services/services-1.0.xsd
-                http://symfony.com/schema/dic/symfony
-                http://symfony.com/schema/dic/symfony/symfony-1.0.xsd
-                http://symfony.com/schema/dic/twig
-                http://symfony.com/schema/dic/twig/twig-1.0.xsd">
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <imports>
                 <import resource="parameters.yml" />
@@ -258,13 +252,10 @@ key:
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
-            xmlns:twig="http://symfony.com/schema/dic/twig"
             xsi:schemaLocation="http://symfony.com/schema/dic/services
                 http://symfony.com/schema/dic/services/services-1.0.xsd
                 http://symfony.com/schema/dic/symfony
-                http://symfony.com/schema/dic/symfony/symfony-1.0.xsd
-                http://symfony.com/schema/dic/twig
-                http://symfony.com/schema/dic/twig/twig-1.0.xsd">
+                http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <!-- ... -->
             <parameters>
@@ -358,7 +349,7 @@ configure DoctrineBundle and other parts of Symfony:
     .. code-block:: php
 
         // app/config/config.php
-        $configuration->loadFromExtension('doctrine', array(
+        $container->loadFromExtension('doctrine', array(
             'dbal' => array(
                 'driver'   => 'pdo_mysql',
                 // ...

components/security/authentication.rst

@@ -290,10 +290,10 @@ The best way to accomplish this is via a new environment called, for example,
     .. code-block:: php
 
         // app/config/config_benchmark.php
-        $loader->import('config_prod.php')
+        $loader->import('config_prod.php');
 
         $container->loadFromExtension('framework', array(
-            'profiler' => array('only-exceptions' => false),
+            'profiler' => array('only_exceptions' => false),
         ));
 
 .. include:: /components/dependency_injection/_imports-parameters-note.rst.inc

components/validator/resources.rst

@@ -104,8 +104,8 @@ of the following:
 
     .. code-block:: nginx
 
-        fastcgi_param DATABASE_USER user
-        fastcgi_param DATABASE_PASSWORD secret
+        fastcgi_param DATABASE_USER user;
+        fastcgi_param DATABASE_PASSWORD secret;
 
     .. code-block:: terminal