Merge branch '3.4' into 4.2

javiereguiluz · javiereguiluz · commit c14e165516cb · 2019-06-25T10:27:49.000+02:00
* 3.4:
  [Cache] Make sure the chain cache configuration works
  Fix broken link to doctrine documentation
  Use single quotes for example code
diff --git a/cache.rst b/cache.rst
@@ -389,16 +389,22 @@ case the value needs to be recalculated.
             cache:
                 pools:
                     my_cache_pool:
-                        adapter: app.my_cache_chain_adapter
+                        adapter: cache.adapter.psr6
+                        provider: app.my_cache_chain_adapter
                     cache.my_redis:
                         adapter: cache.adapter.redis
                         provider: 'redis://user:password@example.com'
+                    cache.apcu:
+                        adapter: cache.adapter.apcu
+                    cache.array:
+                        adapter: cache.adapter.array
+
 
         services:
             app.my_cache_chain_adapter:
                 class: Symfony\Component\Cache\Adapter\ChainAdapter
                 arguments:
-                    - ['cache.adapter.array', 'cache.my_redis', 'cache.adapter.file']
+                    - ['@cache.array', '@cache.apcu', '@cache.my_redis']
                     - 31536000 # One year
 
     .. code-block:: xml
@@ -413,17 +419,19 @@ case the value needs to be recalculated.
 
             <framework:config>
                 <framework:cache>
-                    <framework:pool name="my_cache_pool" adapter="app.my_cache_chain_adapter"/>
+                    <framework:pool name="my_cache_pool" adapter="cache.adapter.psr6" provider="app.my_cache_chain_adapter"/>
                     <framework:pool name="cache.my_redis" adapter="cache.adapter.redis" provider="redis://user:password@example.com"/>
+                    <framework:pool name="cache.apcu" adapter="cache.adapter.apcu"/>
+                    <framework:pool name="cache.array" adapter="cache.adapter.array"/>
                 </framework:cache>
             </framework:config>
 
             <services>
                 <service id="app.my_cache_chain_adapter" class="Symfony\Component\Cache\Adapter\ChainAdapter">
                     <argument type="collection">
-                        <argument type="service" value="cache.adapter.array"/>
+                        <argument type="service" value="cache.array"/>
+                        <argument type="service" value="cache.apcu"/>
                         <argument type="service" value="cache.my_redis"/>
-                        <argument type="service" value="cache.adapter.file"/>
                     </argument>
                     <argument>31536000</argument>
                 </service>
@@ -437,28 +445,37 @@ case the value needs to be recalculated.
             'cache' => [
                 'pools' => [
                     'my_cache_pool' => [
-                        'adapter' => 'app.my_cache_chain_adapter',
+                        'adapter' => 'cache.adapter.psr6',
+                        'provider' => 'app.my_cache_chain_adapter',
                     ],
                     'cache.my_redis' => [
                         'adapter' => 'cache.adapter.redis',
                         'provider' => 'redis://user:password@example.com',
                     ],
+                    'cache.apcu' => [
+                        'adapter' => 'cache.adapter.apcu',
+                    ],
+                    'cache.array' => [
+                        'adapter' => 'cache.adapter.array',
+                    ],
                 ],
             ],
         ]);
 
         $container->getDefinition('app.my_cache_chain_adapter', \Symfony\Component\Cache\Adapter\ChainAdapter::class)
             ->addArgument([
-                new Reference('cache.adapter.array'),
+                new Reference('cache.array'),
+                new Reference('cache.apcu'),
                 new Reference('cache.my_redis'),
-                new Reference('cache.adapter.file'),
             ])
             ->addArgument(31536000);
 
 .. note::
 
-    In this configuration there is a ``cache.my_redis`` pool that is used as an
-    adapter in the ``app.my_cache_chain_adapter``
+    In this configuration the ``my_cache_pool`` pool is using the ``cache.adapter.psr6``
+    adapter and the ``app.my_cache_chain_adapter`` service as a provider. That is
+    because ``ChainAdapter`` does not support the ``cache.pool`` tag. So it is decorated
+    with the ``ProxyAdapter``.
 
 
 Using Cache Tags
diff --git a/form/form_collections.rst b/form/form_collections.rst
@@ -710,6 +710,6 @@ the relationship between the removed ``Tag`` and ``Task`` object.
     elements of the collection. More advanced functionality like moving or duplicating
     an element in the collection and customizing the buttons is also possible.
 
-.. _`Owning Side and Inverse Side`: http://docs.doctrine-project.org/en/latest/reference/unitofwork-associations.html
+.. _`Owning Side and Inverse Side`: https://www.doctrine-project.org/projects/doctrine-orm/en/current/reference/unitofwork-associations.html
 .. _`JSFiddle`: http://jsfiddle.net/847Kf/4/
 .. _`symfony-collection`: https://github.com/ninsuo/symfony-collection
diff --git a/service_container/tags.rst b/service_container/tags.rst
@@ -434,7 +434,7 @@ use this, update the compiler::
                 foreach ($tags as $attributes) {
                     $definition->addMethodCall('addTransport', [
                         new Reference($id),
-                        $attributes["alias"]
+                        $attributes['alias']
                     ]);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -434,7 +434,7 @@ use this, update the compiler::`
`434`	`434`	`foreach ($tags as $attributes) {`
`435`	`435`	`$definition->addMethodCall('addTransport', [`
`436`	`436`	`new Reference($id),`
`437`		`- $attributes["alias"]`
	`437`	`+ $attributes['alias']`
`438`	`438`	`]);`
`439`	`439`	`}`
`440`	`440`	`}`