Remove remaining deprecated features

Author: chalasr

CHANGELOG.md

@@ -20,6 +20,7 @@ CHANGELOG
  * Register workflow services as private
  * Remove support for passing a `RouteCollectionBuilder` to `MicroKernelTrait::configureRoutes()`, type-hint `RoutingConfigurator` instead
  * Remove the `cache.adapter.doctrine` service
+ * Remove the `framework.translator.enabled_locales` config option, use `framework.enabled_locales` instead
 
 5.4
 ---

DependencyInjection/Configuration.php

@@ -785,7 +785,6 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode, callable $e
                     ->{$enableIfStandalone('symfony/translation', Translator::class)}()
                     ->fixXmlConfig('fallback')
                     ->fixXmlConfig('path')
-                    ->fixXmlConfig('enabled_locale')
                     ->fixXmlConfig('provider')
                     ->children()
                         ->arrayNode('fallbacks')
@@ -804,11 +803,6 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode, callable $e
                         ->arrayNode('paths')
                             ->prototype('scalar')->end()
                         ->end()
-                        ->arrayNode('enabled_locales')
-                            ->setDeprecated('symfony/framework-bundle', '5.3', 'Option "%node%" at "%path%" is deprecated, set the "framework.enabled_locales" option instead.')
-                            ->prototype('scalar')->end()
-                            ->defaultValue([])
-                        ->end()
                         ->arrayNode('pseudo_localization')
                             ->canBeEnabled()
                             ->fixXmlConfig('localizable_html_attribute')

DependencyInjection/FrameworkExtension.php

@@ -426,9 +426,7 @@ public function load(array $configs, ContainerBuilder $container)
         $this->registerProfilerConfiguration($config['profiler'], $container, $loader);
         $this->registerWorkflowConfiguration($config['workflows'], $container, $loader);
         $this->registerDebugConfiguration($config['php_errors'], $container, $loader);
-        // @deprecated since Symfony 5.4, in 6.0 change to:
-        // $this->registerRouterConfiguration($config['router'], $container, $loader, $config['enabled_locales']);
-        $this->registerRouterConfiguration($config['router'], $container, $loader, $config['translator']['enabled_locales'] ?: $config['enabled_locales']);
+        $this->registerRouterConfiguration($config['router'], $container, $loader, $config['enabled_locales']);
         $this->registerAnnotationsConfiguration($config['annotations'], $container, $loader);
         $this->registerPropertyAccessConfiguration($config['property_access'], $container, $loader);
         $this->registerSecretsConfiguration($config['secrets'], $container, $loader);
@@ -1217,10 +1215,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
         $defaultOptions = $translator->getArgument(4);
         $defaultOptions['cache_dir'] = $config['cache_dir'];
         $translator->setArgument(4, $defaultOptions);
-
-        // @deprecated since Symfony 5.4, in 6.0 change to:
-        // $translator->setArgument(5, $enabledLocales);
-        $translator->setArgument(5, $config['enabled_locales'] ?: $enabledLocales);
+        $translator->setArgument(5, $enabledLocales);
 
         $container->setParameter('translator.logging', $config['logging']);
         $container->setParameter('translator.default_path', $config['default_path']);
@@ -1353,9 +1348,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
             return;
         }
 
-        // @deprecated since Symfony 5.4, in 6.0 change to:
-        // $locales = $enabledLocales;
-        $locales = $config['enabled_locales'] ?: $enabledLocales;
+        $locales = $enabledLocales;
 
         foreach ($config['providers'] as $provider) {
             if ($provider['locales']) {

Resources/config/schema/symfony-1.0.xsd

@@ -180,7 +180,6 @@
         <xsd:sequence>
             <xsd:element name="fallback" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="path" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
-            <xsd:element name="enabled-locale" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="pseudo-localization" type="pseudo_localization" minOccurs="0" maxOccurs="1" />
             <xsd:element name="provider" type="translation_provider" minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>

Tests/DependencyInjection/Fixtures/yml/legacy_translator_enabled_locales.yml

@@ -544,22 +544,6 @@ public function testRouter()
         $this->assertSame(['_locale' => 'fr|en'], $container->getDefinition('routing.loader')->getArgument(2));
     }
 
-    /**
-     * @group legacy
-     */
-    public function testRouterWithLegacyTranslatorEnabledLocales()
-    {
-        $container = $this->createContainerFromFile('legacy_translator_enabled_locales');
-
-        $this->assertTrue($container->has('router'), '->registerRouterConfiguration() loads routing.xml');
-        $arguments = $container->findDefinition('router')->getArguments();
-        $this->assertEquals($container->getParameter('kernel.project_dir').'/config/routing.xml', $container->getParameter('router.resource'), '->registerRouterConfiguration() sets routing resource');
-        $this->assertEquals('%router.resource%', $arguments[1], '->registerRouterConfiguration() sets routing resource');
-        $this->assertEquals('xml', $arguments[2]['resource_type'], '->registerRouterConfiguration() sets routing resource type');
-
-        $this->assertSame(['_locale' => 'fr|en'], $container->getDefinition('routing.loader')->getArgument(2));
-    }
-
     public function testRouterRequiresResourceOption()
     {
         $this->expectException(InvalidConfigurationException::class);