Merge branch '5.2' into 5.x

* 5.2:
  Fix deprecations from Doctrine Annotations+Cache

Author: derrabus

CacheWarmer/AnnotationsCacheWarmer.php

@@ -54,13 +54,10 @@ protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter)
         }
 
         $annotatedClasses = include $annotatedClassPatterns;
-
-        if (class_exists(PsrCachedReader::class)) {
-            // doctrine/annotations:1.13 and above
-            $reader = new PsrCachedReader($this->annotationReader, $arrayAdapter, $this->debug);
-        } else {
-            $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

@@ -92,6 +92,7 @@ class UnusedTagsPass implements CompilerPassInterface
         'validator.auto_mapper',
         'validator.constraint_validator',
         'validator.initializer',
+        'workflow.definition',
     ];
 
     public function process(ContainerBuilder $container)

Resources/config/annotations.php

@@ -62,14 +62,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

@@ -44,13 +44,16 @@ public function testAnnotationsCacheWarmerWithDebugDisabled()
         $this->assertFileExists($cacheFile);
 
         // Assert cache is valid
-        $psr6Cache = new PhpArrayAdapter($cacheFile, new NullAdapter());
-        if (class_exists(PsrCachedReader::class)) {
-            $reader = new PsrCachedReader($this->getReadOnlyReader(), $psr6Cache);
-        } else {
-            $reader = new CachedReader($this->getReadOnlyReader(), new DoctrineProvider($psr6Cache));
-        }
-
+        $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__));
@@ -67,13 +70,19 @@ public function testAnnotationsCacheWarmerWithDebugEnabled()
         $this->assertFileExists($cacheFile);
 
         // Assert cache is valid
-        $psr6Cache = new PhpArrayAdapter($cacheFile, new NullAdapter());
-        if (class_exists(PsrCachedReader::class)) {
-            $reader = new PsrCachedReader($this->getReadOnlyReader(), $psr6Cache);
-        } else {
-            $reader = new CachedReader($this->getReadOnlyReader(), new DoctrineProvider($psr6Cache));
-        }
-
+        $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/Functional/AutowiringTypesTest.php

@@ -34,7 +34,11 @@ public function testCachedAnnotationReaderAutowiring()
         static::bootKernel();
 
         $annotationReader = self::getContainer()->get('test.autowiring_types.autowired_services')->getAnnotationReader();
-        $this->assertInstanceOf(class_exists(PsrCachedReader::class) ? PsrCachedReader::class : CachedReader::class, $annotationReader);
+        if (class_exists(PsrCachedReader::class)) {
+            $this->assertInstanceOf(PsrCachedReader::class, $annotationReader);
+        } else {
+            $this->assertInstanceOf(CachedReader::class, $annotationReader);
+        }
     }
 
     public function testEventDispatcherAutowiring()

composer.json

@@ -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.3",
         "symfony/browser-kit": "^4.4|^5.0",