Merge branch '4.4' into 5.2

* 4.4:
  Stop using deprecated ArrayCache from Doctrine
  [Intl] fix Locale::getFallback() throwing exception on long $locale

Author: nicolas-grekas

DependencyInjection/FrameworkExtension.php

@@ -1443,8 +1443,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.php

@@ -15,9 +15,9 @@
 use Doctrine\Common\Annotations\AnnotationRegistry;
 use Doctrine\Common\Annotations\CachedReader;
 use Doctrine\Common\Annotations\Reader;
-use Doctrine\Common\Cache\ArrayCache;
-use Doctrine\Common\Cache\FilesystemCache;
 use Symfony\Bundle\FrameworkBundle\CacheWarmer\AnnotationsCacheWarmer;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
 use Symfony\Component\Cache\DoctrineProvider;
 
@@ -35,15 +35,24 @@
         ->set('annotations.cached_reader', CachedReader::class)
             ->args([
                 service('annotations.reader'),
-                inline_service(ArrayCache::class),
+                inline_service(DoctrineProvider::class)->args([
+                    inline_service(ArrayAdapter::class)
+                ]),
                 abstract_arg('Debug-Flag'),
             ])
 
-        ->set('annotations.filesystem_cache', FilesystemCache::class)
+        ->set('annotations.filesystem_cache_adapter', FilesystemAdapter::class)
             ->args([
+                '',
+                0,
                 abstract_arg('Cache-Directory'),
             ])
 
+        ->set('annotations.filesystem_cache', DoctrineProvider::class)
+            ->args([
+                service('annotations.filesystem_cache_adapter'),
+            ])
+
         ->set('annotations.cache_warmer', AnnotationsCacheWarmer::class)
             ->args([
                 service('annotations.reader'),

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -928,7 +928,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));
     }