Merge branch '4.4' into 5.2

* 4.4:
  Fix deprecations from Doctrine Annotations+Cache

Author: derrabus

CacheWarmer/AnnotationsCacheWarmer.php

@@ -13,6 +13,7 @@
 
 use Doctrine\Common\Annotations\AnnotationException;
 use Doctrine\Common\Annotations\CachedReader;
+use Doctrine\Common\Annotations\PsrCachedReader;
 use Doctrine\Common\Annotations\Reader;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
@@ -53,7 +54,10 @@ protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter)
         }
 
         $annotatedClasses = include $annotatedClassPatterns;
-        $reader = new CachedReader($this->annotationReader, new DoctrineProvider($arrayAdapter), $this->debug);
+        $reader = class_exists(PsrCachedReader::class)
+            ? new PsrCachedReader($this->annotationReader, $arrayAdapter, $this->debug)
+            : new CachedReader($this->annotationReader, new DoctrineProvider($arrayAdapter), $this->debug)
+        ;
 
         foreach ($annotatedClasses as $class) {
             if (null !== $this->excludeRegexp && preg_match($this->excludeRegexp, $class)) {

DependencyInjection/Compiler/UnusedTagsPass.php

@@ -72,9 +72,9 @@ class UnusedTagsPass implements CompilerPassInterface
         'routing.expression_language_provider',
         'routing.loader',
         'routing.route_loader',
+        'security.authenticator.login_linker',
         'security.expression_language_provider',
         'security.remember_me_aware',
-        'security.authenticator.login_linker',
         'security.voter',
         'serializer.encoder',
         'serializer.normalizer',
@@ -88,6 +88,7 @@ class UnusedTagsPass implements CompilerPassInterface
         'validator.auto_mapper',
         'validator.constraint_validator',
         'validator.initializer',
+        'workflow.definition',
     ];
 
     public function process(ContainerBuilder $container)

DependencyInjection/FrameworkExtension.php

@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\FrameworkBundle\DependencyInjection;
 
 use Doctrine\Common\Annotations\AnnotationRegistry;
+use Doctrine\Common\Annotations\PsrCachedReader;
 use Doctrine\Common\Annotations\Reader;
 use Http\Client\HttpClient;
 use Psr\Cache\CacheItemPoolInterface;
@@ -1426,14 +1427,20 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
         }
 
         if ('none' !== $config['cache']) {
-            if (!class_exists(\Doctrine\Common\Cache\CacheProvider::class)) {
+            if (class_exists(PsrCachedReader::class)) {
+                $container
+                    ->getDefinition('annotations.cached_reader')
+                    ->setClass(PsrCachedReader::class)
+                    ->replaceArgument(1, new Definition(ArrayAdapter::class))
+                ;
+            } elseif (!class_exists(\Doctrine\Common\Cache\CacheProvider::class)) {
                 throw new LogicException('Annotations cannot be enabled as the Doctrine Cache library is not installed.');
             }
 
             $cacheService = $config['cache'];
 
             if ('php_array' === $config['cache']) {
-                $cacheService = 'annotations.cache';
+                $cacheService = class_exists(PsrCachedReader::class) ? 'annotations.cache_adapter' : 'annotations.cache';
 
                 // Enable warmer only if PHP array is used for cache
                 $definition = $container->findDefinition('annotations.cache_warmer');
@@ -1450,7 +1457,7 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
                     ->replaceArgument(2, $cacheDir)
                 ;
 
-                $cacheService = 'annotations.filesystem_cache';
+                $cacheService = class_exists(PsrCachedReader::class) ? 'annotations.filesystem_cache_adapter' : 'annotations.filesystem_cache';
             }
 
             $container

Resources/config/annotations.php

@@ -61,14 +61,16 @@
                 param('kernel.debug'),
             ])
 
+        ->set('annotations.cache_adapter', PhpArrayAdapter::class)
+            ->factory([PhpArrayAdapter::class, 'create'])
+            ->args([
+                param('kernel.cache_dir').'/annotations.php',
+                service('cache.annotations'),
+            ])
+
         ->set('annotations.cache', DoctrineProvider::class)
             ->args([
-                inline_service(PhpArrayAdapter::class)
-                    ->factory([PhpArrayAdapter::class, 'create'])
-                    ->args([
-                        param('kernel.cache_dir').'/annotations.php',
-                        service('cache.annotations'),
-                    ]),
+                service('annotations.cache_adapter')
             ])
             ->tag('container.hot_path')
 

Tests/CacheWarmer/AnnotationsCacheWarmerTest.php

@@ -4,6 +4,7 @@
 
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\CachedReader;
+use Doctrine\Common\Annotations\PsrCachedReader;
 use Doctrine\Common\Annotations\Reader;
 use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Bundle\FrameworkBundle\CacheWarmer\AnnotationsCacheWarmer;
@@ -43,10 +44,16 @@ public function testAnnotationsCacheWarmerWithDebugDisabled()
         $this->assertFileExists($cacheFile);
 
         // Assert cache is valid
-        $reader = new CachedReader(
-            $this->getReadOnlyReader(),
-            new DoctrineProvider(new PhpArrayAdapter($cacheFile, new NullAdapter()))
-        );
+        $reader = class_exists(PsrCachedReader::class)
+            ? new PsrCachedReader(
+                $this->getReadOnlyReader(),
+                new PhpArrayAdapter($cacheFile, new NullAdapter())
+            )
+            : new CachedReader(
+                $this->getReadOnlyReader(),
+                new DoctrineProvider(new PhpArrayAdapter($cacheFile, new NullAdapter()))
+            )
+        ;
         $refClass = new \ReflectionClass($this);
         $reader->getClassAnnotations($refClass);
         $reader->getMethodAnnotations($refClass->getMethod(__FUNCTION__));
@@ -61,12 +68,21 @@ public function testAnnotationsCacheWarmerWithDebugEnabled()
         $warmer = new AnnotationsCacheWarmer($reader, $cacheFile, null, true);
         $warmer->warmUp($this->cacheDir);
         $this->assertFileExists($cacheFile);
+
         // Assert cache is valid
-        $reader = new CachedReader(
-            $this->getReadOnlyReader(),
-            new DoctrineProvider(new PhpArrayAdapter($cacheFile, new NullAdapter())),
-            true
-        );
+        $phpArrayAdapter = new PhpArrayAdapter($cacheFile, new NullAdapter());
+        $reader = class_exists(PsrCachedReader::class)
+            ? new PsrCachedReader(
+                $this->getReadOnlyReader(),
+                $phpArrayAdapter,
+                true
+            )
+            : new CachedReader(
+                $this->getReadOnlyReader(),
+                new DoctrineProvider($phpArrayAdapter),
+                true
+            )
+        ;
         $refClass = new \ReflectionClass($this);
         $reader->getClassAnnotations($refClass);
         $reader->getMethodAnnotations($refClass->getMethod(__FUNCTION__));

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection;
 
 use Doctrine\Common\Annotations\Annotation;
+use Doctrine\Common\Annotations\PsrCachedReader;
 use Psr\Cache\CacheItemPoolInterface;
 use Psr\Log\LoggerAwareInterface;
 use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
@@ -930,7 +931,11 @@ public function testAnnotations()
         $container->compile();
 
         $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));
+        if (class_exists(PsrCachedReader::class)) {
+            $this->assertSame('annotations.filesystem_cache_adapter', (string) $container->getDefinition('annotation_reader')->getArgument(1));
+        } else {
+            $this->assertSame('annotations.filesystem_cache', (string) $container->getDefinition('annotation_reader')->getArgument(1));
+        }
     }
 
     public function testFileLinkFormat()

Tests/Functional/AutowiringTypesTest.php

@@ -13,6 +13,7 @@
 
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\CachedReader;
+use Doctrine\Common\Annotations\PsrCachedReader;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher;
@@ -33,7 +34,11 @@ public function testCachedAnnotationReaderAutowiring()
         static::bootKernel();
 
         $annotationReader = static::$container->get('test.autowiring_types.autowired_services')->getAnnotationReader();
-        $this->assertInstanceOf(CachedReader::class, $annotationReader);
+        if (class_exists(PsrCachedReader::class)) {
+            $this->assertInstanceOf(PsrCachedReader::class, $annotationReader);
+        } else {
+            $this->assertInstanceOf(CachedReader::class, $annotationReader);
+        }
     }
 
     public function testEventDispatcherAutowiring()

composer.json

@@ -19,7 +19,7 @@
         "php": ">=7.2.5",
         "ext-xml": "*",
         "symfony/cache": "^5.2",
-        "symfony/config": "^5.0",
+        "symfony/config": "~5.0.11|^5.1.3",
         "symfony/dependency-injection": "^5.2",
         "symfony/deprecation-contracts": "^2.1",
         "symfony/event-dispatcher": "^5.1",
@@ -34,7 +34,7 @@
     },
     "require-dev": {
         "doctrine/annotations": "^1.10.4",
-        "doctrine/cache": "~1.0",
+        "doctrine/cache": "^1.0|^2.0",
         "doctrine/persistence": "^1.3|^2.0",
         "symfony/asset": "^5.1",
         "symfony/browser-kit": "^4.4|^5.0",