Prepare removing Doctrine Cache from remaining components

Signed-off-by: Alexander M. Turek <[email protected]>

Author: derrabus

ValidatorBuilder.php

@@ -15,7 +15,7 @@
 use Doctrine\Common\Annotations\CachedReader;
 use Doctrine\Common\Annotations\PsrCachedReader;
 use Doctrine\Common\Annotations\Reader;
-use Doctrine\Common\Cache\Psr6\DoctrineProvider;
+use Doctrine\Common\Cache\ArrayCache;
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Validator\Context\ExecutionContextFactory;
@@ -429,22 +429,16 @@ private function createAnnotationReader(): Reader
             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)) {
+        if (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(ArrayAdapter::class)) {
-            return new CachedReader(new AnnotationReader(), DoctrineProvider::wrap(new ArrayAdapter()));
-        }
+        if (class_exists(CachedReader::class) && class_exists(ArrayCache::class)) {
+            trigger_deprecation('symfony/validator', '5.4', 'Enabling annotation based constraint mapping without having symfony/cache installed is deprecated.');
 
-        // 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.');
+            return new CachedReader(new AnnotationReader(), new ArrayCache());
         }
 
-        // 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.');
+        throw new LogicException('Enabling annotation based constraint mapping requires the packages doctrine/annotations and symfony/cache to be installed.');
     }
 }

composer.json

@@ -40,11 +40,12 @@
         "symfony/property-access": "^4.4|^5.0|^6.0",
         "symfony/property-info": "^5.3|^6.0",
         "symfony/translation": "^4.4|^5.0|^6.0",
-        "doctrine/annotations": "^1.10.4",
+        "doctrine/annotations": "^1.13",
         "doctrine/cache": "^1.11|^2.0",
         "egulias/email-validator": "^2.1.10|^3"
     },
     "conflict": {
+        "doctrine/annotations": "<1.13",
         "doctrine/cache": "<1.11",
         "doctrine/lexer": "<1.0.2",
         "phpunit/phpunit": "<5.4.3",