Skip to content

Commit d989cc3

Browse files
committed
Remove remaining support for Doctrine Cache
Signed-off-by: Alexander M. Turek <[email protected]>
1 parent 468f562 commit d989cc3

File tree

2 files changed

+0
-10
lines changed

2 files changed

+0
-10
lines changed

ValidatorBuilder.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@
1212
namespace Symfony\Component\Validator;
1313

1414
use Doctrine\Common\Annotations\AnnotationReader;
15-
use Doctrine\Common\Annotations\CachedReader;
1615
use Doctrine\Common\Annotations\PsrCachedReader;
1716
use Doctrine\Common\Annotations\Reader;
18-
use Doctrine\Common\Cache\ArrayCache;
1917
use Psr\Cache\CacheItemPoolInterface;
2018
use Symfony\Component\Cache\Adapter\ArrayAdapter;
2119
use Symfony\Component\Validator\Context\ExecutionContextFactory;
@@ -394,12 +392,6 @@ private function createAnnotationReader(): Reader
394392
return new PsrCachedReader(new AnnotationReader(), new ArrayAdapter());
395393
}
396394

397-
if (class_exists(CachedReader::class) && class_exists(ArrayCache::class)) {
398-
trigger_deprecation('symfony/validator', '5.4', 'Enabling annotation based constraint mapping without having symfony/cache installed is deprecated.');
399-
400-
return new CachedReader(new AnnotationReader(), new ArrayCache());
401-
}
402-
403395
throw new LogicException('Enabling annotation based constraint mapping requires the packages doctrine/annotations and symfony/cache to be installed.');
404396
}
405397
}

composer.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,10 @@
3838
"symfony/property-info": "^5.4|^6.0",
3939
"symfony/translation": "^5.4|^6.0",
4040
"doctrine/annotations": "^1.13",
41-
"doctrine/cache": "^1.11|^2.0",
4241
"egulias/email-validator": "^2.1.10|^3"
4342
},
4443
"conflict": {
4544
"doctrine/annotations": "<1.13",
46-
"doctrine/cache": "<1.11",
4745
"doctrine/lexer": "<1.0.2",
4846
"phpunit/phpunit": "<5.4.3",
4947
"symfony/dependency-injection": "<5.4",

0 commit comments

Comments
 (0)