Stop using deprecated ArrayCache from Doctrine

Author: nicolas-grekas

DependencyInjection/FrameworkExtension.php

@@ -1447,8 +1447,8 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
                 }
 
                 $container
-                    ->getDefinition('annotations.filesystem_cache')
-                    ->replaceArgument(0, $cacheDir)
+                    ->getDefinition('annotations.filesystem_cache_adapter')
+                    ->replaceArgument(2, $cacheDir)
                 ;
 
                 $cacheService = 'annotations.filesystem_cache';

Resources/config/annotations.xml

@@ -24,15 +24,25 @@
         <service id="annotations.cached_reader" class="Doctrine\Common\Annotations\CachedReader">
             <argument type="service" id="annotations.reader" />
             <argument type="service">
-                <service class="Doctrine\Common\Cache\ArrayCache" />
+                <service class="Symfony\Component\Cache\DoctrineProvider">
+                    <argument type="service">
+                        <service class="Symfony\Component\Cache\Adapter\ArrayAdapter" />
+                    </argument>
+                </service>
             </argument>
             <argument /><!-- Debug-Flag -->
         </service>
 
-        <service id="annotations.filesystem_cache" class="Doctrine\Common\Cache\FilesystemCache">
+        <service id="annotations.filesystem_cache_adapter" class="Symfony\Component\Cache\Adapter\FilesystemAdapter">
+            <argument />
+            <argument>0</argument>
             <argument /><!-- Cache-Directory -->
         </service>
 
+        <service id="annotations.filesystem_cache" class="Symfony\Component\Cache\DoctrineProvider">
+            <argument type="service" id="annotations.filesystem_cache_adapter" />
+        </service>
+
         <service id="annotations.cache_warmer" class="Symfony\Bundle\FrameworkBundle\CacheWarmer\AnnotationsCacheWarmer">
             <argument type="service" id="annotations.reader" />
             <argument>%kernel.cache_dir%/annotations.php</argument>

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -997,7 +997,7 @@ public function testAnnotations()
         $container->addCompilerPass(new TestAnnotationsPass());
         $container->compile();
 
-        $this->assertEquals($container->getParameter('kernel.cache_dir').'/annotations', $container->getDefinition('annotations.filesystem_cache')->getArgument(0));
+        $this->assertEquals($container->getParameter('kernel.cache_dir').'/annotations', $container->getDefinition('annotations.filesystem_cache_adapter')->getArgument(2));
         $this->assertSame('annotations.filesystem_cache', (string) $container->getDefinition('annotation_reader')->getArgument(1));
     }