Merge branch '5.2' into 5.x

* 5.2:
  Fix deprecations from Doctrine Annotations+Cache

Author: derrabus

Tests/ValidatorBuilderTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Validator\Tests;
 
 use Doctrine\Common\Annotations\CachedReader;
+use Doctrine\Common\Annotations\PsrCachedReader;
 use Doctrine\Common\Annotations\Reader;
 use PHPUnit\Framework\TestCase;
 use Psr\Cache\CacheItemPoolInterface;
@@ -99,7 +100,11 @@ public function testEnableAnnotationMapping()
         $r = new \ReflectionProperty(AnnotationLoader::class, 'reader');
         $r->setAccessible(true);
 
-        $this->assertInstanceOf(CachedReader::class, $r->getValue($loaders[0]));
+        if (class_exists(PsrCachedReader::class)) {
+            $this->assertInstanceOf(PsrCachedReader::class, $r->getValue($loaders[0]));
+        } else {
+            $this->assertInstanceOf(CachedReader::class, $r->getValue($loaders[0]));
+        }
     }
 
     public function testEnableAnnotationMappingWithDefaultDoctrineAnnotationReader()
@@ -114,7 +119,11 @@ public function testEnableAnnotationMappingWithDefaultDoctrineAnnotationReader()
         $r = new \ReflectionProperty(AnnotationLoader::class, 'reader');
         $r->setAccessible(true);
 
-        $this->assertInstanceOf(CachedReader::class, $r->getValue($loaders[0]));
+        if (class_exists(PsrCachedReader::class)) {
+            $this->assertInstanceOf(PsrCachedReader::class, $r->getValue($loaders[0]));
+        } else {
+            $this->assertInstanceOf(CachedReader::class, $r->getValue($loaders[0]));
+        }
     }
 
     /**

ValidatorBuilder.php

@@ -13,11 +13,13 @@
 
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\CachedReader;
+use Doctrine\Common\Annotations\PsrCachedReader;
 use Doctrine\Common\Annotations\Reader;
 use Doctrine\Common\Cache\ArrayCache;
+use Doctrine\Common\Cache\Psr6\DoctrineProvider;
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
-use Symfony\Component\Cache\DoctrineProvider;
+use Symfony\Component\Cache\DoctrineProvider as SymfonyDoctrineProvider;
 use Symfony\Component\Validator\Context\ExecutionContextFactory;
 use Symfony\Component\Validator\Exception\ValidatorException;
 use Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory;
@@ -268,11 +270,7 @@ public function setDoctrineAnnotationReader(?Reader $reader): self
      */
     public function addDefaultDoctrineAnnotationReader(): self
     {
-        if (class_exists(ArrayAdapter::class)) {
-            $this->annotationReader = new CachedReader(new AnnotationReader(), new DoctrineProvider(new ArrayAdapter()));
-        } else {
-            $this->annotationReader = new CachedReader(new AnnotationReader(), new ArrayCache());
-        }
+        $this->annotationReader = $this->createAnnotationReader();
 
         return $this;
     }
@@ -425,4 +423,39 @@ public function getValidator()
 
         return new RecursiveValidator($contextFactory, $metadataFactory, $validatorFactory, $this->initializers);
     }
+
+    private function createAnnotationReader(): Reader
+    {
+        if (!class_exists(AnnotationReader::class)) {
+            throw new LogicException('Enabling annotation based constraint mapping requires the packages doctrine/annotations and symfony/cache to be installed.');
+        }
+
+        // Doctrine Annotation >= 1.13, Symfony Cache
+        if (class_exists(PsrCachedReader::class) && class_exists(ArrayAdapter::class)) {
+            return new PsrCachedReader(new AnnotationReader(), new ArrayAdapter());
+        }
+
+        // Doctrine Annotations < 1.13, Doctrine Cache >= 1.11, Symfony Cache
+        if (class_exists(CachedReader::class) && class_exists(DoctrineProvider::class) && class_exists(ArrayAdapter::class)) {
+            return new CachedReader(new AnnotationReader(), DoctrineProvider::wrap(new ArrayAdapter()));
+        }
+
+        // Doctrine Annotations < 1.13, Doctrine Cache < 1.11, Symfony Cache
+        if (class_exists(CachedReader::class) && !class_exists(DoctrineProvider::class) && class_exists(ArrayAdapter::class)) {
+            return new CachedReader(new AnnotationReader(), new SymfonyDoctrineProvider(new ArrayAdapter()));
+        }
+
+        // Doctrine Annotations < 1.13, Doctrine Cache < 1.11
+        if (class_exists(CachedReader::class) && class_exists(ArrayCache::class)) {
+            return new CachedReader(new AnnotationReader(), new ArrayCache());
+        }
+
+        // Doctrine Annotation >= 1.13, Doctrine Cache >= 2, no Symfony Cache
+        if (class_exists(PsrCachedReader::class)) {
+            throw new LogicException('Enabling annotation based constraint mapping requires the package symfony/cache to be installed.');
+        }
+
+        // Doctrine Annotation (<1.13 || >2), no Doctrine Cache, no Symfony Cache
+        throw new LogicException('Enabling annotation based constraint mapping requires the packages doctrine/annotations (>=1.13) and symfony/cache to be installed.');
+    }
 }

composer.json

@@ -41,7 +41,7 @@
         "symfony/property-info": "^5.3",
         "symfony/translation": "^4.4|^5.0",
         "doctrine/annotations": "^1.10.4",
-        "doctrine/cache": "~1.0",
+        "doctrine/cache": "^1.0|^2.0",
         "egulias/email-validator": "^2.1.10|^3"
     },
     "conflict": {