Merge branch '3.4' into 4.4

* 3.4:
  Minor fixes in configuration blocks

Author: wouterj

bundles/configuration.rst

@@ -420,7 +420,9 @@ Assuming the XSD file is called ``hello-1.0.xsd``, the schema location will be
     <container xmlns="http://symfony.com/schema/dic/services"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns:acme-hello="http://acme_company.com/schema/dic/hello"
-        xsi:schemaLocation="http://acme_company.com/schema/dic/hello
+        xsi:schemaLocation="http://symfony.com/schema/dic/services
+            https://symfony.com/schema/dic/services/services-1.0.xsd
+            http://acme_company.com/schema/dic/hello
             https://acme_company.com/schema/dic/hello/hello-1.0.xsd">
 
         <acme-hello:config>

bundles/prepend_extension.rst

@@ -122,9 +122,14 @@ registered and the ``entity_manager_name`` setting for ``acme_hello`` is set to
             xmlns:acme-something="http://example.org/schema/dic/acme_something"
             xmlns:acme-other="http://example.org/schema/dic/acme_other"
             xsi:schemaLocation="http://symfony.com/schema/dic/services
-                https://symfony.com/schema/dic/services/services-1.0.xsd">
+                https://symfony.com/schema/dic/services/services-1.0.xsd
+                http://example.org/schema/dic/acme_something
+                https://example.org/schema/dic/acme_something/acme_something-1.0.xsd
+                http://example.org/schema/dic/acme_other
+                https://example.org/schema/dic/acme_something/acme_other-1.0.xsd">
 
             <acme-something:config use-acme-goodbye="false">
+                <!-- ... -->
                 <acme-something:entity-manager-name>non_default</acme-something:entity-manager-name>
             </acme-something:config>
 

cache.rst

@@ -75,7 +75,9 @@ adapter (template) they use by using the ``app`` and ``system`` key like:
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services
-                https://symfony.com/schema/dic/services/services-1.0.xsd">
+                https://symfony.com/schema/dic/services/services-1.0.xsd
+                http://symfony.com/schema/dic/symfony
+                https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <framework:config>
                 <framework:cache app="cache.adapter.filesystem"
@@ -136,7 +138,9 @@ will create pool with service id of ``cache.[type]``
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services
-                https://symfony.com/schema/dic/services/services-1.0.xsd">
+                https://symfony.com/schema/dic/services/services-1.0.xsd
+                http://symfony.com/schema/dic/symfony
+                https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <framework:config>
                 <!--
@@ -146,6 +150,7 @@ will create pool with service id of ``cache.[type]``
                 default_memcached_provider: Service: cache.memcached
                 default_pdo_provider: Service: cache.pdo
                 -->
+                <!-- "directory" attribute is only used with cache.adapter.filesystem -->
                 <framework:cache directory="%kernel.cache_dir%/pools"
                     default_doctrine_provider="app.doctrine_cache"
                     default_psr6_provider="app.my_psr6_service"
@@ -226,14 +231,31 @@ You can also create more customized pools:
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services
-                https://symfony.com/schema/dic/services/services-1.0.xsd">
+                https://symfony.com/schema/dic/services/services-1.0.xsd
+                http://symfony.com/schema/dic/symfony
+                https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <framework:config>
-                <framework:cache default_memcached_provider="memcached://localhost">
+                <framework:cache default-memcached-provider="memcached://localhost">
+                    <!-- creates a "custom_thing.cache" service
+                         autowireable via "CacheInterface $customThingCache"
+                         uses the "app" cache configuration -->
                     <framework:pool name="custom_thing.cache" adapter="cache.app"/>
+
+                    <!-- creates a "my_cache_pool" service
+                         autowireable via "CacheInterface $myCachePool" -->
                     <framework:pool name="my_cache_pool" adapter="cache.adapter.array"/>
+
+                    <!-- uses the default_memcached_provider from above -->
                     <framework:pool name="acme.cache" adapter="cache.adapter.memcached"/>
-                    <framework:pool name="foobar.cache" adapter="cache.adapter.memcached" provider="memcached://user:password@example.com"/>
+
+                    <!-- control adapter's configuration -->
+                    <framework:pool name="foobar.cache" adapter="cache.adapter.memcached"
+                        provider="memcached://user:password@example.com"
+                    />
+
+                    <!-- uses the "foobar.cache" pool as its backend but controls
+                         the lifetime and (like all pools) has a separate cache namespace -->
                     <framework:pool name="short_cache" adapter="foobar.cache" default-lifetime="60"/>
                 </framework:cache>
             </framework:config>
@@ -246,19 +268,32 @@ You can also create more customized pools:
             'cache' => [
                 'default_memcached_provider' => 'memcached://localhost',
                 'pools' => [
+                    // creates a "custom_thing.cache" service
+                    // autowireable via "CacheInterface $customThingCache"
+                    // uses the "app" cache configuration
                     'custom_thing.cache' => [
                         'adapter' => 'cache.app',
                     ],
+
+                    // creates a "my_cache_pool" service
+                    // autowireable via "CacheInterface $myCachePool"
                     'my_cache_pool' => [
                         'adapter' => 'cache.adapter.array',
                     ],
+
+                    // uses the default_memcached_provider from above
                     'acme.cache' => [
                         'adapter' => 'cache.adapter.memcached',
                     ],
+
+                    // control adapter's configuration
                     'foobar.cache' => [
                         'adapter' => 'cache.adapter.memcached',
                         'provider' => 'memcached://user:password@example.com',
                     ],
+
+                    // uses the "foobar.cache" pool as its backend but controls
+                    // the lifetime and (like all pools) has a separate cache namespace
                     'short_cache' => [
                         'adapter' => 'foobar.cache',
                         'default_lifetime' => 60,
@@ -331,7 +366,9 @@ and use that when configuring the pool.
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services
-                https://symfony.com/schema/dic/services/services-1.0.xsd">
+                https://symfony.com/schema/dic/services/services-1.0.xsd
+                http://symfony.com/schema/dic/symfony
+                https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <framework:config>
                 <framework:cache>
@@ -341,6 +378,7 @@ and use that when configuring the pool.
 
             <services>
                 <service id="app.my_custom_redis_provider" class="\Redis">
+                    <factory class="Symfony\Component\Cache\Adapter\RedisAdapter" method="createConnection"/>
                     <argument>redis://localhost</argument>
                     <argument type="collection">
                         <argument key="retry_interval">2</argument>
@@ -353,6 +391,8 @@ and use that when configuring the pool.
     .. code-block:: php
 
         // config/packages/cache.php
+        use Symfony\Component\Cache\Adapter\RedisAdapter;
+
         $container->loadFromExtension('framework', [
             'cache' => [
                 'pools' => [
@@ -364,12 +404,14 @@ and use that when configuring the pool.
             ],
         ]);
 
-        $container->getDefinition('app.my_custom_redis_provider', \Redis::class)
+        $container->register('app.my_custom_redis_provider', \Redis::class)
+            ->setFactory([RedisAdapter::class, 'createConnection'])
             ->addArgument('redis://localhost')
             ->addArgument([
                 'retry_interval' => 2,
                 'timeout' => 10
-            ]);
+            ])
+        ;
 
 Creating a Cache Chain
 ----------------------
@@ -511,7 +553,9 @@ to enable this feature. This could be added by using the following configuration
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services
-                https://symfony.com/schema/dic/services/services-1.0.xsd">
+                https://symfony.com/schema/dic/services/services-1.0.xsd
+                http://symfony.com/schema/dic/symfony
+                https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <framework:config>
                 <framework:cache>
@@ -523,6 +567,9 @@ to enable this feature. This could be added by using the following configuration
     .. code-block:: php
 
         // config/packages/cache.php
+        use Symfony\Component\Cache\Adapter\ChainAdapter;
+        use Symfony\Component\DependencyInjection\Reference;
+
         $container->loadFromExtension('framework', [
             'cache' => [
                 'pools' => [

configuration/using_parameters_in_dic.rst

@@ -51,7 +51,11 @@ Now, examine the results to see this closely:
 
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
-            xmlns:my-bundle="http://example.org/schema/dic/my_bundle">
+            xmlns:my-bundle="http://example.org/schema/dic/my_bundle"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                https://symfony.com/schema/dic/services/services-1.0.xsd
+                http://example.org/schema/dic/my_bundle
+                https://example.org/schema/dic/my_bundle/my_bundle-1.0.xsd">
 
             <my-bundle:config logging="true"/>
             <!-- true, as expected -->

console/commands_as_services.rst

@@ -89,20 +89,24 @@ Or set the ``command`` attribute on the ``console.command`` tag in your service
 
         # config/services.yaml
         services:
+            # ...
+
             App\Command\SunshineCommand:
                 tags:
                     - { name: 'console.command', command: 'app:sunshine' }
-                # ...
 
     .. code-block:: xml
 
         <!-- config/services.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                https://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
+                <!-- ... -->
+
                 <service id="App\Command\SunshineCommand">
                     <tag name="console.command" command="app:sunshine"/>
                 </service>
@@ -113,10 +117,9 @@ Or set the ``command`` attribute on the ``console.command`` tag in your service
 
         // config/services.php
         use App\Command\SunshineCommand;
-        // ...
 
-        $container
-            ->register(SunshineCommand::class)
+        // ...
+        $container->register(SunshineCommand::class)
             ->addTag('console.command', ['command' => 'app:sunshine'])
         ;
 

console/input.rst

@@ -74,7 +74,8 @@ to greet all your friends). Only the last argument can be a list::
             'names',
             InputArgument::IS_ARRAY,
             'Who do you want to greet (separate multiple names with a space)?'
-        );
+        )
+    ;
 
 To use this, specify as many names as you want:
 
@@ -111,7 +112,8 @@ You can combine ``IS_ARRAY`` with ``REQUIRED`` and ``OPTIONAL`` like this::
             'names',
             InputArgument::IS_ARRAY | InputArgument::REQUIRED,
             'Who do you want to greet (separate multiple names with a space)?'
-        );
+        )
+    ;
 
 Using Command Options
 ---------------------
@@ -135,7 +137,8 @@ how many times in a row the message should be printed::
             InputOption::VALUE_REQUIRED,
             'How many times should the message be printed?',
             1
-        );
+        )
+    ;
 
 Next, use this in the command to print the message multiple times::
 
@@ -177,7 +180,8 @@ flag:
                 InputOption::VALUE_REQUIRED,
                 'How many times should the message be printed?',
                 1
-            );
+            )
+        ;
 
 Note that to comply with the `docopt standard`_, long options can specify their
 values after a white space or an ``=`` sign (e.g. ``--iterations 5`` or
@@ -221,7 +225,8 @@ You can combine ``VALUE_IS_ARRAY`` with ``VALUE_REQUIRED`` or
             InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
             'Which colors do you like?',
             ['blue', 'red']
-        );
+        )
+    ;
 
 Options with optional arguments
 -------------------------------
@@ -239,7 +244,8 @@ optionally accepts a value, but it's a bit tricky. Consider this example::
             null,
             InputOption::VALUE_OPTIONAL,
             'Should I yell while greeting?'
-        );
+        )
+    ;
 
 This option can be used in 3 ways: ``--yell``, ``yell=louder``, and not passing
 the option at all. However, it's hard to distinguish between passing the option
@@ -258,7 +264,8 @@ To solve this issue, you have to set the option's default value to ``false``::
             InputOption::VALUE_OPTIONAL,
             'Should I yell while greeting?',
             false // this is the new default value, instead of null
-        );
+        )
+    ;
 
 Now check the value of the option and keep in mind that ``false !== null``::
 

controller.rst

@@ -231,7 +231,7 @@ the argument by its name:
 
             # explicitly configure the service
             App\Controller\LuckyController:
-                public: true
+                tags: [controller.service_arguments]
                 bind:
                     # for any $logger argument, pass this specific service
                     $logger: '@monolog.logger.doctrine'
@@ -251,7 +251,8 @@ the argument by its name:
                 <!-- ... -->
 
                 <!-- Explicitly configure the service -->
-                <service id="App\Controller\LuckyController" public="true">
+                <service id="App\Controller\LuckyController">
+                    <tag name"controller.service_arguments"/>
                     <bind key="$logger"
                         type="service"
                         id="monolog.logger.doctrine"
@@ -268,7 +269,7 @@ the argument by its name:
         use Symfony\Component\DependencyInjection\Reference;
 
         $container->register(LuckyController::class)
-            ->setPublic(true)
+            ->addTag('controller.service_arguments')
             ->setBindings([
                 '$logger' => new Reference('monolog.logger.doctrine'),
                 '$projectDir' => '%kernel.project_dir%'
@@ -278,6 +279,14 @@ the argument by its name:
 Like with all services, you can also use regular :ref:`constructor injection <services-constructor-injection>`
 in your controllers.
 
+.. caution::
+
+    You can *only* pass *services* to your controller arguments in this way. It's not
+    possible, for example, to pass a config parameter as a controller argument,
+    even by using ``bind``. If you need a parameter, use the ``$this->getParameter('kernel.debug')``
+    shortcut or pass the value through your controller's ``__construct()`` method
+    and specify its value with ``bind``.
+
 For more information about services, see the :doc:`/service_container` article.
 
 Generating Controllers

controller/argument_value_resolver.rst

@@ -112,7 +112,9 @@ type-hinted method arguments:
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:sensio-framework-extra="http://symfony.com/schema/dic/symfony_extra"
             xsi:schemaLocation="http://symfony.com/schema/dic/services
-                https://symfony.com/schema/dic/services/services-1.0.xsd">
+                https://symfony.com/schema/dic/services/services-1.0.xsd
+                http://symfony.com/schema/dic/symfony_extra
+                https://symfony.com/schema/dic/symfony_extra/symfony_extra-1.0.xsd">
 
             <sensio-framework-extra:config>
                 <request converters="true" auto-convert="false"/>
@@ -217,7 +219,8 @@ and adding a priority.
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-Instance"
-            xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                https://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
                 <!-- ... be sure autowiring is enabled -->
@@ -237,7 +240,8 @@ and adding a priority.
         use App\ArgumentResolver\UserValueResolver;
 
         $container->autowire(UserValueResolver::class)
-            ->addTag('controller.argument_value_resolver', ['priority' => 50]);
+            ->addTag('controller.argument_value_resolver', ['priority' => 50])
+        ;
 
 While adding a priority is optional, it's recommended to add one to make sure
 the expected value is injected. The ``RequestAttributeValueResolver`` has a

event_dispatcher.rst

@@ -108,8 +108,7 @@ using a special "tag":
         // config/services.php
         use App\EventListener\ExceptionListener;
 
-        $container
-            ->autowire(ExceptionListener::class)
+        $container->register(ExceptionListener::class)
             ->addTag('kernel.event_listener', ['event' => 'kernel.exception'])
         ;