Remove remaining support for Doctrine Cache

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

Author: derrabus

DependencyInjection/Configuration.php

@@ -12,8 +12,6 @@
 namespace Symfony\Bundle\FrameworkBundle\DependencyInjection;
 
 use Doctrine\Common\Annotations\Annotation;
-use Doctrine\Common\Annotations\PsrCachedReader;
-use Doctrine\Common\Cache\Cache;
 use Doctrine\DBAL\Connection;
 use Symfony\Bundle\FullStack;
 use Symfony\Component\Asset\Package;
@@ -930,9 +928,6 @@ private function addValidationSection(ArrayNodeDefinition $rootNode, callable $e
 
     private function addAnnotationsSection(ArrayNodeDefinition $rootNode, callable $willBeAvailable)
     {
-        $doctrineCache = $willBeAvailable('doctrine/cache', Cache::class, 'doctrine/annotation');
-        $psr6Cache = $willBeAvailable('symfony/cache', PsrCachedReader::class, 'doctrine/annotation');
-
         $rootNode
             ->children()
                 ->arrayNode('annotations')
@@ -941,7 +936,7 @@ private function addAnnotationsSection(ArrayNodeDefinition $rootNode, callable $
                     ->children()
                         ->enumNode('cache')
                             ->values(['none', 'php_array', 'file'])
-                            ->defaultValue(($doctrineCache || $psr6Cache) ? 'php_array' : 'none')
+                            ->defaultValue('php_array')
                         ->end()
                         ->scalarNode('file_cache_dir')->defaultValue('%kernel.cache_dir%/annotations')->end()
                         ->booleanNode('debug')->defaultValue($this->debug)->end()

Resources/config/annotations.php

@@ -15,7 +15,6 @@
 use Doctrine\Common\Annotations\AnnotationRegistry;
 use Doctrine\Common\Annotations\PsrCachedReader;
 use Doctrine\Common\Annotations\Reader;
-use Doctrine\Common\Cache\Psr6\DoctrineProvider;
 use Symfony\Bundle\FrameworkBundle\CacheWarmer\AnnotationsCacheWarmer;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
@@ -46,13 +45,6 @@
                 abstract_arg('Cache-Directory'),
             ])
 
-        ->set('annotations.filesystem_cache', DoctrineProvider::class)
-            ->factory([DoctrineProvider::class, 'wrap'])
-            ->args([
-                service('annotations.filesystem_cache_adapter'),
-            ])
-            ->deprecate('symfony/framework-bundle', '5.4', '"%service_id% is deprecated"')
-
         ->set('annotations.cache_warmer', AnnotationsCacheWarmer::class)
             ->args([
                 service('annotations.reader'),
@@ -69,13 +61,6 @@
             ])
             ->tag('container.hot_path')
 
-        ->set('annotations.cache', DoctrineProvider::class)
-            ->factory([DoctrineProvider::class, 'wrap'])
-            ->args([
-                service('annotations.cache_adapter'),
-            ])
-            ->deprecate('symfony/framework-bundle', '5.4', '"%service_id% is deprecated"')
-
         ->alias('annotation_reader', 'annotations.reader')
         ->alias(Reader::class, 'annotation_reader');
 };

composer.json

@@ -32,7 +32,6 @@
     },
     "require-dev": {
         "doctrine/annotations": "^1.13.1",
-        "doctrine/cache": "^1.11|^2.0",
         "doctrine/persistence": "^1.3|^2.0",
         "symfony/asset": "^5.4|^6.0",
         "symfony/browser-kit": "^5.4|^6.0",
@@ -69,7 +68,6 @@
     },
     "conflict": {
         "doctrine/annotations": "<1.13.1",
-        "doctrine/cache": "<1.11",
         "doctrine/persistence": "<1.3",
         "phpdocumentor/reflection-docblock": "<3.2.2",
         "phpdocumentor/type-resolver": "<1.4.0",