[7.0] Cleanup legacy code paths

Author: nicolas-grekas

CacheWarmer/SerializerCacheWarmer.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Bundle\FrameworkBundle\CacheWarmer;
 
-use Doctrine\Common\Annotations\AnnotationException;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Serializer\Mapping\Factory\CacheClassMetadataFactory;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
@@ -51,8 +50,6 @@ protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter, string
             foreach ($loader->getMappedClasses() as $mappedClass) {
                 try {
                     $metadataFactory->getMetadataFor($mappedClass);
-                } catch (AnnotationException) {
-                    // ignore failing annotations
                 } catch (\Exception $e) {
                     $this->ignoreAutoloadException($mappedClass, $e);
                 }

CacheWarmer/ValidatorCacheWarmer.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Bundle\FrameworkBundle\CacheWarmer;
 
-use Doctrine\Common\Annotations\AnnotationException;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
 use Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory;
@@ -50,8 +49,6 @@ protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter, string
                     if ($metadataFactory->hasMetadataFor($mappedClass)) {
                         $metadataFactory->getMetadataFor($mappedClass);
                     }
-                } catch (AnnotationException) {
-                    // ignore failing annotations
                 } catch (\Exception $e) {
                     $this->ignoreAutoloadException($mappedClass, $e);
                 }

DependencyInjection/Configuration.php

@@ -899,9 +899,6 @@ private function addAssetMapperSection(ArrayNodeDefinition $rootNode, callable $
                             ->info('The directory to store JavaScript vendors.')
                             ->defaultValue('%kernel.project_dir%/assets/vendor')
                         ->end()
-                        ->scalarNode('provider')
-                            ->setDeprecated('symfony/framework-bundle', '6.4', 'Option "%node%" at "%path%" is deprecated and does nothing. Remove it.')
-                        ->end()
                     ->end()
                 ->end()
             ->end()

DependencyInjection/FrameworkExtension.php

@@ -564,14 +564,6 @@ public function load(array $configs, ContainerBuilder $container): void
             $this->registerHtmlSanitizerConfiguration($config['html_sanitizer'], $container, $loader);
         }
 
-        $this->addAnnotatedClassesToCompile([
-            '**\\Controller\\',
-            '**\\Entity\\',
-
-            // Added explicitly so that we don't rely on the class map being dumped to make it work
-            AbstractController::class,
-        ]);
-
         if (ContainerBuilder::willBeAvailable('symfony/mime', MimeTypes::class, ['symfony/framework-bundle'])) {
             $loader->load('mime_type.php');
         }

FrameworkBundle.php

@@ -95,12 +95,7 @@ public function boot(): void
 
         $handler = ErrorHandler::register(null, false);
 
-        // When upgrading an existing Symfony application from 6.2 to 6.3, and
-        // the cache is warmed up, the service is not available yet, so we need
-        // to check if it exists.
-        if ($this->container->has('debug.error_handler_configurator')) {
-            $this->container->get('debug.error_handler_configurator')->configure($handler);
-        }
+        $this->container->get('debug.error_handler_configurator')->configure($handler);
 
         if ($this->container->getParameter('kernel.http_method_override')) {
             Request::enableHttpMethodParameterOverride();

Resources/config/cache.php

@@ -56,11 +56,6 @@
             ->private()
             ->tag('cache.pool')
 
-        ->set('cache.annotations')
-            ->parent('cache.system')
-            ->private()
-            ->tag('cache.pool')
-
         ->set('cache.property_info')
             ->parent('cache.system')
             ->private()

Resources/config/services.php

@@ -48,7 +48,6 @@
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\KernelInterface;
-use Symfony\Component\HttpKernel\UriSigner as HttpKernelUriSigner;
 use Symfony\Component\Runtime\Runner\Symfony\HttpKernelRunner;
 use Symfony\Component\Runtime\Runner\Symfony\ResponseRunner;
 use Symfony\Component\Runtime\SymfonyRuntime;
@@ -158,8 +157,6 @@ class_exists(WorkflowEvents::class) ? WorkflowEvents::ALIASES : []
                 param('kernel.secret'),
             ])
         ->alias(UriSigner::class, 'uri_signer')
-        ->alias(HttpKernelUriSigner::class, 'uri_signer')
-            ->deprecate('symfony/framework-bundle', '6.4', 'The "%alias_id%" alias is deprecated, use "'.UriSigner::class.'" instead.')
 
         ->set('config_cache_factory', ResourceCheckerConfigCacheFactory::class)
             ->args([

Tests/DependencyInjection/FrameworkExtensionTestCase.php

@@ -13,7 +13,6 @@
 
 use Psr\Cache\CacheItemPoolInterface;
 use Psr\Log\LoggerAwareInterface;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\FrameworkExtension;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage;
@@ -91,8 +90,6 @@
 
 abstract class FrameworkExtensionTestCase extends TestCase
 {
-    use ExpectDeprecationTrait;
-
     private static array $containerCache = [];
 
     abstract protected function loadFromFile(ContainerBuilder $container, $file);

Tests/Test/WebTestCaseTest.php

@@ -23,7 +23,6 @@
 use Symfony\Component\HttpFoundation\Cookie as HttpFoundationCookie;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Test\Constraint\ResponseHeaderLocationSame;
 
 class WebTestCaseTest extends TestCase
 {
@@ -62,10 +61,6 @@ public function testAssertResponseRedirectsWithLocation()
 
     public function testAssertResponseRedirectsWithLocationWithoutHost()
     {
-        if (!class_exists(ResponseHeaderLocationSame::class)) {
-            $this->markTestSkipped('Requires symfony/http-foundation 6.3 or higher.');
-        }
-
         $this->getResponseTester(new Response('', 301, ['Location' => 'https://example.com/']))->assertResponseRedirects('/');
         $this->expectException(AssertionFailedError::class);
         $this->expectExceptionMessage('is redirected and has header "Location" matching "/".');
@@ -74,10 +69,6 @@ public function testAssertResponseRedirectsWithLocationWithoutHost()
 
     public function testAssertResponseRedirectsWithLocationWithoutScheme()
     {
-        if (!class_exists(ResponseHeaderLocationSame::class)) {
-            $this->markTestSkipped('Requires symfony/http-foundation 6.3 or higher.');
-        }
-
         $this->getResponseTester(new Response('', 301, ['Location' => 'https://example.com/']))->assertResponseRedirects('//example.com/');
         $this->expectException(AssertionFailedError::class);
         $this->expectExceptionMessage('is redirected and has header "Location" matching "//example.com/".');