Remove deprecated code paths

Author: nicolas-grekas

CHANGELOG.md

@@ -11,7 +11,14 @@ CHANGELOG
  * Remove the `lock.RESOURCE_NAME` and `lock.RESOURCE_NAME.store` services and the `lock`, `LockInterface`, `lock.store` and `PersistingStoreInterface` aliases, use `lock.RESOURCE_NAME.factory`, `lock.factory` or `LockFactory` instead
  * The `form.factory`, `form.type.file`, `translator`, `security.csrf.token_manager`, `serializer`,
    `cache_clearer`, `filesystem` and `validator` services are now private
-* Remove the `output-format` and `xliff-version` options from `TranslationUpdateCommand`
+ * Remove the `output-format` and `xliff-version` options from `TranslationUpdateCommand`
+ * Remove `has()`, `get()`, `getDoctrine()`n and `dispatchMessage()` from `AbstractController`, use method/constructor injection instead
+ * Make the "framework.router.utf8" configuration option default to `true`
+ * Remove the `AdapterInterface` autowiring alias, use `CacheItemPoolInterface` instead
+ * Make the `profiler` service private
+ * Remove all other values than "none", "php_array" and "file" for `framework.annotation.cache`
+ * Register workflow services as private
+ * Remove support for passing a `RouteCollectionBuilder` to `MicroKernelTrait::configureRoutes()`, type-hint `RoutingConfigurator` instead
 
 5.4
 ---

Controller/AbstractController.php

@@ -32,7 +32,6 @@
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RouterInterface;
@@ -104,32 +103,6 @@ public static function getSubscribedServices(): array
         ];
     }
 
-    /**
-     * Returns true if the service id is defined.
-     *
-     * @deprecated since Symfony 5.4, use method or constructor injection in your controller instead
-     */
-    protected function has(string $id): bool
-    {
-        trigger_deprecation('symfony/framework-bundle', '5.4', 'Method "%s()" is deprecated, use method or constructor injection in your controller instead.', __METHOD__);
-
-        return $this->container->has($id);
-    }
-
-    /**
-     * Gets a container service by its id.
-     *
-     * @return object The service
-     *
-     * @deprecated since Symfony 5.4, use method or constructor injection in your controller instead
-     */
-    protected function get(string $id): object
-    {
-        trigger_deprecation('symfony/framework-bundle', '5.4', 'Method "%s()" is deprecated, use method or constructor injection in your controller instead.', __METHOD__);
-
-        return $this->container->get($id);
-    }
-
     /**
      * Generates a URL from the given parameters.
      *
@@ -370,24 +343,6 @@ protected function createFormBuilder(mixed $data = null, array $options = []): F
         return $this->container->get('form.factory')->createBuilder(FormType::class, $data, $options);
     }
 
-    /**
-     * Shortcut to return the Doctrine Registry service.
-     *
-     * @throws \LogicException If DoctrineBundle is not available
-     *
-     * @deprecated since Symfony 5.4, inject an instance of ManagerRegistry in your controller instead
-     */
-    protected function getDoctrine(): ManagerRegistry
-    {
-        trigger_deprecation('symfony/framework-bundle', '5.4', 'Method "%s()" is deprecated, inject an instance of ManagerRegistry in your controller instead.', __METHOD__);
-
-        if (!$this->container->has('doctrine')) {
-            throw new \LogicException('The DoctrineBundle is not registered in your application. Try running "composer require symfony/orm-pack".');
-        }
-
-        return $this->container->get('doctrine');
-    }
-
     /**
      * Get a user from the Security Token Storage.
      *
@@ -423,25 +378,6 @@ protected function isCsrfTokenValid(string $id, ?string $token): bool
         return $this->container->get('security.csrf.token_manager')->isTokenValid(new CsrfToken($id, $token));
     }
 
-    /**
-     * Dispatches a message to the bus.
-     *
-     * @param object|Envelope $message The message or the message pre-wrapped in an envelope
-     *
-     * @deprecated since Symfony 5.4, inject an instance of MessageBusInterface in your controller instead
-     */
-    protected function dispatchMessage(object $message, array $stamps = []): Envelope
-    {
-        trigger_deprecation('symfony/framework-bundle', '5.4', 'Method "%s()" is deprecated, inject an instance of MessageBusInterface in your controller instead.', __METHOD__);
-
-        if (!$this->container->has('messenger.default_bus')) {
-            $message = class_exists(Envelope::class) ? 'You need to define the "messenger.default_bus" configuration option.' : 'Try running "composer require symfony/messenger".';
-            throw new \LogicException('The message bus is not enabled in your application. '.$message);
-        }
-
-        return $this->container->get('messenger.default_bus')->dispatch($message, $stamps);
-    }
-
     /**
      * Adds a Link HTTP header to the current response.
      *

DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php

@@ -22,17 +22,6 @@
  */
 class TestServiceContainerWeakRefPass implements CompilerPassInterface
 {
-    private $privateTagName;
-
-    public function __construct(string $privateTagName = 'container.private')
-    {
-        if (0 < \func_num_args()) {
-            trigger_deprecation('symfony/framework-bundle', '5.3', 'Configuring "%s" is deprecated.', __CLASS__);
-        }
-
-        $this->privateTagName = $privateTagName;
-    }
-
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('test.private_services_locator')) {
@@ -44,7 +33,7 @@ public function process(ContainerBuilder $container)
         $hasErrors = method_exists(Definition::class, 'hasErrors') ? 'hasErrors' : 'getErrors';
 
         foreach ($definitions as $id => $definition) {
-            if ($id && '.' !== $id[0] && (!$definition->isPublic() || $definition->isPrivate() || $definition->hasTag($this->privateTagName)) && !$definition->$hasErrors() && !$definition->isAbstract()) {
+            if ($id && '.' !== $id[0] && (!$definition->isPublic() || $definition->isPrivate() || $definition->hasTag('container.private')) && !$definition->$hasErrors() && !$definition->isAbstract()) {
                 $privateServices[$id] = new Reference($id, ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE);
             }
         }

DependencyInjection/Configuration.php

@@ -203,18 +203,8 @@ private function addFormSection(ArrayNodeDefinition $rootNode, callable $enableI
                                 ->scalarNode('field_name')->defaultValue('_token')->end()
                             ->end()
                         ->end()
-                        // to be set to false in Symfony 6.0
-                        ->booleanNode('legacy_error_messages')
-                            ->defaultTrue()
-                            ->validate()
-                                ->ifTrue()
-                                ->then(function ($v) {
-                                    trigger_deprecation('symfony/framework-bundle', '5.2', 'Setting the "framework.form.legacy_error_messages" option to "true" is deprecated. It will have no effect as of Symfony 6.0.');
-
-                                    return $v;
-                                })
-                            ->end()
-                        ->end()
+                        // to be deprecated in Symfony 6.1
+                        ->booleanNode('legacy_error_messages')->end()
                     ->end()
                 ->end()
             ->end()
@@ -300,7 +290,6 @@ private function addProfilerSection(ArrayNodeDefinition $rootNode)
                         ->booleanNode('collect')->defaultTrue()->end()
                         ->booleanNode('only_exceptions')->defaultFalse()->end()
                         ->booleanNode('only_main_requests')->defaultFalse()->end()
-                        ->booleanNode('only_master_requests')->setDeprecated('symfony/framework-bundle', '5.3', 'Option "%node%" at "%path%" is deprecated, use "only_main_requests" instead.')->defaultFalse()->end()
                         ->scalarNode('dsn')->defaultValue('file:%kernel.cache_dir%/profiler')->end()
                     ->end()
                 ->end()
@@ -596,7 +585,7 @@ private function addRouterSection(ArrayNodeDefinition $rootNode)
                             )
                             ->defaultTrue()
                         ->end()
-                        ->booleanNode('utf8')->defaultNull()->end()
+                        ->booleanNode('utf8')->defaultTrue()->end()
                     ->end()
                 ->end()
             ->end()
@@ -950,7 +939,10 @@ private function addAnnotationsSection(ArrayNodeDefinition $rootNode, callable $
                     ->info('annotation configuration')
                     ->{$willBeAvailable('doctrine/annotations', Annotation::class) ? 'canBeDisabled' : 'canBeEnabled'}()
                     ->children()
-                        ->scalarNode('cache')->defaultValue(($doctrineCache || $psr6Cache) ? 'php_array' : 'none')->end()
+                        ->enumNode('cache')
+                            ->values(['none', 'php_array', 'file'])
+                            ->defaultValue(($doctrineCache || $psr6Cache) ? 'php_array' : 'none')
+                        ->end()
                         ->scalarNode('file_cache_dir')->defaultValue('%kernel.cache_dir%/annotations')->end()
                         ->booleanNode('debug')->defaultValue($this->debug)->end()
                     ->end()

DependencyInjection/FrameworkExtension.php

@@ -603,8 +603,6 @@ private function registerFormConfiguration(array $config, ContainerBuilder $cont
     {
         $loader->load('form.php');
 
-        $container->getDefinition('form.type_extension.form.validator')->setArgument(1, $config['form']['legacy_error_messages']);
-
         if (null === $config['form']['csrf_protection']['enabled']) {
             $config['form']['csrf_protection']['enabled'] = $config['csrf_protection']['enabled'];
         }
@@ -729,7 +727,7 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
         }
 
         $container->setParameter('profiler_listener.only_exceptions', $config['only_exceptions']);
-        $container->setParameter('profiler_listener.only_main_requests', $config['only_main_requests'] || $config['only_master_requests']);
+        $container->setParameter('profiler_listener.only_main_requests', $config['only_main_requests']);
 
         // Choose storage class based on the DSN
         [$class] = explode(':', $config['dsn'], 2);
@@ -992,10 +990,6 @@ private function registerRouterConfiguration(array $config, ContainerBuilder $co
 
         $loader->load('routing.php');
 
-        if (null === $config['utf8']) {
-            trigger_deprecation('symfony/framework-bundle', '5.1', 'Not setting the "framework.router.utf8" configuration option is deprecated, it will default to "true" in version 6.0.');
-        }
-
         if ($config['utf8']) {
             $container->getDefinition('routing.loader')->replaceArgument(1, ['utf8' => true]);
         }
@@ -1530,61 +1524,36 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
             return;
         }
 
-        $cacheService = $config['cache'];
-        if (\in_array($config['cache'], ['php_array', 'file'])) {
-            $isPsr6Service = $container->hasDefinition('annotations.psr_cached_reader');
-        } else {
-            $isPsr6Service = false;
-            trigger_deprecation('symfony/framework-bundle', '5.3', 'Using a custom service for "framework.annotation.cache" is deprecated, only values "none", "php_array" and "file" are valid in version 6.0.');
-        }
-
-        if ($isPsr6Service) {
-            $container->removeDefinition('annotations.cached_reader');
+        if ($container->hasDefinition('annotations.psr_cached_reader')) {
             $container->setDefinition('annotations.cached_reader', $container->getDefinition('annotations.psr_cached_reader'));
+        }
 
-            if ('php_array' === $config['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');
-            } elseif ('file' === $config['cache']) {
-                $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)) {
-                    throw new \RuntimeException(sprintf('Could not create cache directory "%s".', $cacheDir));
-                }
+        if ('php_array' === $config['cache']) {
+            $cacheService = $container->hasDefinition('annotations.psr_cached_reader') ? 'annotations.cache_adapter' : 'annotations.cache';
 
-                $container
-                    ->getDefinition('annotations.filesystem_cache_adapter')
-                    ->replaceArgument(2, $cacheDir)
-                ;
-            }
+            // Enable warmer only if PHP array is used for cache
+            $definition = $container->findDefinition('annotations.cache_warmer');
+            $definition->addTag('kernel.cache_warmer');
         } 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".');
-            }
+            $cacheDir = $container->getParameterBag()->resolveValue($config['file_cache_dir']);
 
-            if ('php_array' === $config['cache']) {
-                $cacheService = 'annotations.cache';
+            if (!is_dir($cacheDir) && false === @mkdir($cacheDir, 0777, true) && !is_dir($cacheDir)) {
+                throw new \RuntimeException(sprintf('Could not create cache directory "%s".', $cacheDir));
+            }
 
-                // Enable warmer only if PHP array is used for cache
-                $definition = $container->findDefinition('annotations.cache_warmer');
-                $definition->addTag('kernel.cache_warmer');
-            } elseif ('file' === $config['cache']) {
-                $cacheDir = $container->getParameterBag()->resolveValue($config['file_cache_dir']);
+            $container
+                ->getDefinition('annotations.filesystem_cache_adapter')
+                ->replaceArgument(2, $cacheDir)
+            ;
 
-                if (!is_dir($cacheDir) && false === @mkdir($cacheDir, 0777, true) && !is_dir($cacheDir)) {
-                    throw new \RuntimeException(sprintf('Could not create cache directory "%s".', $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".');
                 }
 
-                $container
-                    ->getDefinition('annotations.filesystem_cache_adapter')
-                    ->replaceArgument(2, $cacheDir)
-                ;
-
                 $cacheService = 'annotations.filesystem_cache';
             }
         }
@@ -2297,9 +2266,6 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
         $container->getDefinition('mailer.transports')->setArgument(0, $transports);
         $container->getDefinition('mailer.default_transport')->setArgument(0, current($transports));
 
-        $container->removeDefinition('mailer.logger_message_listener');
-        $container->setAlias('mailer.logger_message_listener', (new Alias('mailer.message_logger_listener'))->setDeprecated('symfony/framework-bundle', '5.2', 'The "%alias_id%" alias is deprecated, use "mailer.message_logger_listener" instead.'));
-
         $mailer = $container->getDefinition('mailer.mailer');
         if (false === $messageBus = $config['message_bus']) {
             $mailer->replaceArgument(1, null);

Resources/config/cache.php

@@ -237,9 +237,6 @@
 
         ->alias(CacheItemPoolInterface::class, 'cache.app')
 
-        ->alias(AdapterInterface::class, 'cache.app')
-            ->deprecate('symfony/framework-bundle', '5.4', 'The "%alias_id%" alias is deprecated, use "%s" instead.', CacheItemPoolInterface::class)
-
         ->alias(CacheInterface::class, 'cache.app')
 
         ->alias(TagAwareCacheInterface::class, 'cache.app.taggable')

Resources/config/form.php

@@ -126,7 +126,7 @@
         ->set('form.type_extension.form.validator', FormTypeValidatorExtension::class)
             ->args([
                 service('validator'),
-                true,
+                false,
                 service('twig.form.renderer')->ignoreOnInvalid(),
                 service('translator')->ignoreOnInvalid(),
             ])

Resources/config/mailer.php

@@ -69,11 +69,6 @@
             ])
             ->tag('kernel.event_subscriber')
 
-        ->set('mailer.logger_message_listener', MessageLoggerListener::class)
-            ->tag('kernel.event_subscriber')
-            ->tag('kernel.reset', ['method' => 'reset'])
-            ->deprecate('symfony/framework-bundle', '5.2', 'The "%service_id%" service is deprecated, use "mailer.message_logger_listener" instead.')
-
         ->set('mailer.message_logger_listener', MessageLoggerListener::class)
             ->tag('kernel.event_subscriber')
             ->tag('kernel.reset', ['method' => 'reset'])

Test/KernelTestCase.php

@@ -33,13 +33,6 @@ abstract class KernelTestCase extends TestCase
      */
     protected static $kernel;
 
-    /**
-     * @var ContainerInterface
-     *
-     * @deprecated since Symfony 5.3, use static::getContainer() instead
-     */
-    protected static $container;
-
     protected static $booted = false;
 
     private static $kernelContainer;
@@ -79,8 +72,7 @@ protected static function bootKernel(array $options = []): KernelInterface
         static::$kernel->boot();
         static::$booted = true;
 
-        self::$kernelContainer = $container = static::$kernel->getContainer();
-        static::$container = $container->has('test.service_container') ? $container->get('test.service_container') : $container;
+        self::$kernelContainer = static::$kernel->getContainer();
 
         return static::$kernel;
     }
@@ -157,6 +149,6 @@ protected static function ensureKernelShutdown()
             self::$kernelContainer->reset();
         }
 
-        static::$container = self::$kernelContainer = null;
+        self::$kernelContainer = null;
     }
 }