Merge branch '5.4' into 6.0

* 5.4:
  Add Session Token to Amazon Mailer
  [ErrorHandler] Update TentativeTypes
  Prepare removing Doctrine Cache from remaining components
  [ErrorHandler] Add helper script to patch type declarations
  [Messenger] Do not reset services on WorkerRunningEvent anymore
  [Messenger] Add back kernel.event_subscriber tag on StopWorkerOnCustomStopExceptionListener
  Display the roles of the logged-in user in the Web Debug Toolbar -- bugfix

Author: derrabus

CacheWarmer/AnnotationsCacheWarmer.php

@@ -12,10 +12,8 @@
 namespace Symfony\Bundle\FrameworkBundle\CacheWarmer;
 
 use Doctrine\Common\Annotations\AnnotationException;
-use Doctrine\Common\Annotations\CachedReader;
 use Doctrine\Common\Annotations\PsrCachedReader;
 use Doctrine\Common\Annotations\Reader;
-use Doctrine\Common\Cache\Psr6\DoctrineProvider;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
 
@@ -54,10 +52,7 @@ protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter): bool
         }
 
         $annotatedClasses = include $annotatedClassPatterns;
-        $reader = class_exists(PsrCachedReader::class)
-            ? new PsrCachedReader($this->annotationReader, $arrayAdapter, $this->debug)
-            : new CachedReader($this->annotationReader, DoctrineProvider::wrap($arrayAdapter), $this->debug)
-        ;
+        $reader = new PsrCachedReader($this->annotationReader, $arrayAdapter, $this->debug);
 
         foreach ($annotatedClasses as $class) {
             if (null !== $this->excludeRegexp && preg_match($this->excludeRegexp, $class)) {

DependencyInjection/FrameworkExtension.php

@@ -1518,22 +1518,18 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
 
         if ('none' === $config['cache']) {
             $container->removeDefinition('annotations.cached_reader');
-            $container->removeDefinition('annotations.psr_cached_reader');
 
             return;
         }
 
-        if ($container->hasDefinition('annotations.psr_cached_reader')) {
-            $container->setDefinition('annotations.cached_reader', $container->getDefinition('annotations.psr_cached_reader'));
-        }
-
         if ('php_array' === $config['cache']) {
-            $cacheService = $container->hasDefinition('annotations.psr_cached_reader') ? 'annotations.cache_adapter' : 'annotations.cache';
+            $cacheService = 'annotations.cache_adapter';
 
             // Enable warmer only if PHP array is used for cache
             $definition = $container->findDefinition('annotations.cache_warmer');
             $definition->addTag('kernel.cache_warmer');
         } else {
+            $cacheService = 'annotations.filesystem_cache_adapter';
             $cacheDir = $container->getParameterBag()->resolveValue($config['file_cache_dir']);
 
             if (!is_dir($cacheDir) && false === @mkdir($cacheDir, 0777, true) && !is_dir($cacheDir)) {
@@ -1544,17 +1540,6 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
                 ->getDefinition('annotations.filesystem_cache_adapter')
                 ->replaceArgument(2, $cacheDir)
             ;
-
-            if ($container->hasDefinition('annotations.psr_cached_reader')) {
-                $cacheService = 'annotations.filesystem_cache_adapter';
-            } else {
-                // Legacy code for doctrine/annotations:<1.13
-                if (!class_exists(\Doctrine\Common\Cache\CacheProvider::class)) {
-                    throw new LogicException('Annotations cannot be cached as the Doctrine Cache library is not installed. Try running "composer require doctrine/cache".');
-                }
-
-                $cacheService = 'annotations.filesystem_cache';
-            }
         }
 
         $container

Resources/config/annotations.php

@@ -13,7 +13,6 @@
 
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\AnnotationRegistry;
-use Doctrine\Common\Annotations\CachedReader;
 use Doctrine\Common\Annotations\PsrCachedReader;
 use Doctrine\Common\Annotations\Reader;
 use Doctrine\Common\Cache\Psr6\DoctrineProvider;
@@ -33,14 +32,10 @@
         ->set('annotations.dummy_registry', AnnotationRegistry::class)
             ->call('registerUniqueLoader', ['class_exists'])
 
-        ->set('annotations.cached_reader', CachedReader::class)
+        ->set('annotations.cached_reader', PsrCachedReader::class)
             ->args([
                 service('annotations.reader'),
-                inline_service(DoctrineProvider::class)
-                    ->factory([DoctrineProvider::class, 'wrap'])
-                    ->args([
-                        inline_service(ArrayAdapter::class),
-                    ]),
+                inline_service(ArrayAdapter::class),
                 abstract_arg('Debug-Flag'),
             ])
 
@@ -56,6 +51,7 @@
             ->args([
                 service('annotations.filesystem_cache_adapter'),
             ])
+            ->deprecate('symfony/framework-bundle', '5.4', '"%service_id% is deprecated"')
 
         ->set('annotations.cache_warmer', AnnotationsCacheWarmer::class)
             ->args([
@@ -78,19 +74,8 @@
             ->args([
                 service('annotations.cache_adapter'),
             ])
-            ->tag('container.hot_path')
+            ->deprecate('symfony/framework-bundle', '5.4', '"%service_id% is deprecated"')
 
         ->alias('annotation_reader', 'annotations.reader')
         ->alias(Reader::class, 'annotation_reader');
-
-    if (class_exists(PsrCachedReader::class)) {
-        $container->services()
-            ->set('annotations.psr_cached_reader', PsrCachedReader::class)
-                ->args([
-                    service('annotations.reader'),
-                    inline_service(ArrayAdapter::class),
-                    abstract_arg('Debug-Flag'),
-                ])
-        ;
-    }
 };

Resources/config/messenger.php

@@ -196,6 +196,7 @@
             ->tag('kernel.event_subscriber')
 
         ->set('messenger.listener.stop_worker_on_stop_exception_listener', StopWorkerOnCustomStopExceptionListener::class)
+            ->tag('kernel.event_subscriber')
 
         ->set('messenger.listener.reset_services', ResetServicesListener::class)
             ->args([

Tests/CacheWarmer/AnnotationsCacheWarmerTest.php

@@ -3,10 +3,8 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\CacheWarmer;
 
 use Doctrine\Common\Annotations\AnnotationReader;
-use Doctrine\Common\Annotations\CachedReader;
 use Doctrine\Common\Annotations\PsrCachedReader;
 use Doctrine\Common\Annotations\Reader;
-use Doctrine\Common\Cache\Psr6\DoctrineProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Bundle\FrameworkBundle\CacheWarmer\AnnotationsCacheWarmer;
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
@@ -44,16 +42,10 @@ public function testAnnotationsCacheWarmerWithDebugDisabled()
         $this->assertFileExists($cacheFile);
 
         // Assert cache is valid
-        $reader = class_exists(PsrCachedReader::class)
-            ? new PsrCachedReader(
-                $this->getReadOnlyReader(),
-                new PhpArrayAdapter($cacheFile, new NullAdapter())
-            )
-            : new CachedReader(
-                $this->getReadOnlyReader(),
-                DoctrineProvider::wrap(new PhpArrayAdapter($cacheFile, new NullAdapter()))
-            )
-        ;
+        $reader = new PsrCachedReader(
+            $this->getReadOnlyReader(),
+            new PhpArrayAdapter($cacheFile, new NullAdapter())
+        );
         $refClass = new \ReflectionClass($this);
         $reader->getClassAnnotations($refClass);
         $reader->getMethodAnnotations($refClass->getMethod(__FUNCTION__));
@@ -71,18 +63,11 @@ public function testAnnotationsCacheWarmerWithDebugEnabled()
 
         // Assert cache is valid
         $phpArrayAdapter = new PhpArrayAdapter($cacheFile, new NullAdapter());
-        $reader = class_exists(PsrCachedReader::class)
-            ? new PsrCachedReader(
-                $this->getReadOnlyReader(),
-                $phpArrayAdapter,
-                true
-            )
-            : new CachedReader(
-                $this->getReadOnlyReader(),
-                DoctrineProvider::wrap($phpArrayAdapter),
-                true
-            )
-        ;
+        $reader = new PsrCachedReader(
+            $this->getReadOnlyReader(),
+            $phpArrayAdapter,
+            true
+        );
         $refClass = new \ReflectionClass($this);
         $reader->getClassAnnotations($refClass);
         $reader->getMethodAnnotations($refClass->getMethod(__FUNCTION__));

Tests/Functional/AutowiringTypesTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
 use Doctrine\Common\Annotations\AnnotationReader;
-use Doctrine\Common\Annotations\CachedReader;
 use Doctrine\Common\Annotations\PsrCachedReader;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\EventDispatcher\EventDispatcher;
@@ -34,11 +33,7 @@ public function testCachedAnnotationReaderAutowiring()
         static::bootKernel();
 
         $annotationReader = self::getContainer()->get('test.autowiring_types.autowired_services')->getAnnotationReader();
-        if (class_exists(PsrCachedReader::class)) {
-            $this->assertInstanceOf(PsrCachedReader::class, $annotationReader);
-        } else {
-            $this->assertInstanceOf(CachedReader::class, $annotationReader);
-        }
+        $this->assertInstanceOf(PsrCachedReader::class, $annotationReader);
     }
 
     public function testEventDispatcherAutowiring()

composer.json

@@ -31,7 +31,7 @@
         "symfony/routing": "^5.4|^6.0"
     },
     "require-dev": {
-        "doctrine/annotations": "^1.10.4",
+        "doctrine/annotations": "^1.13.1",
         "doctrine/cache": "^1.11|^2.0",
         "doctrine/persistence": "^1.3|^2.0",
         "symfony/asset": "^5.4|^6.0",
@@ -68,6 +68,7 @@
         "symfony/phpunit-bridge": "^5.4|^6.0"
     },
     "conflict": {
+        "doctrine/annotations": "<1.13.1",
         "doctrine/cache": "<1.11",
         "doctrine/persistence": "<1.3",
         "phpdocumentor/reflection-docblock": "<3.2.2",