[FrameworkBundle] AnnotationsCacheWarmer should support doctrine/annotations:^1.13

Author: Nyholm

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\DoctrineProvider;
@@ -52,7 +53,13 @@ protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter)
         }
 
         $annotatedClasses = include $annotatedClassPatterns;
-        $reader = new CachedReader($this->annotationReader, new DoctrineProvider($arrayAdapter), $this->debug);
+
+        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);
+        }
 
         foreach ($annotatedClasses as $class) {
             if (null !== $this->excludeRegexp && preg_match($this->excludeRegexp, $class)) {

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;
@@ -42,10 +43,13 @@ public function testAnnotationsCacheWarmerWithDebugDisabled()
         $this->assertFileExists($cacheFile);
 
         // Assert cache is valid
-        $reader = new CachedReader(
-            $this->getReadOnlyReader(),
-            new DoctrineProvider(new PhpArrayAdapter($cacheFile, new NullAdapter()))
-        );
+        $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));
+        }
+
         $refClass = new \ReflectionClass($this);
         $reader->getClassAnnotations($refClass);
         $reader->getMethodAnnotations($refClass->getMethod(__FUNCTION__));
@@ -60,12 +64,15 @@ 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
-        );
+        $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));
+        }
+
         $refClass = new \ReflectionClass($this);
         $reader->getClassAnnotations($refClass);
         $reader->getMethodAnnotations($refClass->getMethod(__FUNCTION__));