Merge branch '5.4' into 6.0

* 5.4:
  Remove dead code

Author: derrabus

Tests/ValidatorBuilderTest.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Validator\Tests;
 
-use Doctrine\Common\Annotations\CachedReader;
 use Doctrine\Common\Annotations\PsrCachedReader;
 use Doctrine\Common\Annotations\Reader;
 use PHPUnit\Framework\TestCase;
@@ -94,11 +93,7 @@ public function testEnableAnnotationMappingWithDefaultDoctrineAnnotationReader()
         $r = new \ReflectionProperty(AnnotationLoader::class, 'reader');
         $r->setAccessible(true);
 
-        if (class_exists(PsrCachedReader::class)) {
-            $this->assertInstanceOf(PsrCachedReader::class, $r->getValue($loaders[0]));
-        } else {
-            $this->assertInstanceOf(CachedReader::class, $r->getValue($loaders[0]));
-        }
+        $this->assertInstanceOf(PsrCachedReader::class, $r->getValue($loaders[0]));
     }
 
     public function testEnableAnnotationMappingWithCustomDoctrineAnnotationReader()