Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit bd9c271

Browse filesBrowse files
fabpotfabpot
committed
minor #43580 Remove remaining deprecated features (chalasr)
This PR was merged into the 6.0 branch. Discussion ---------- Remove remaining deprecated features | Q | A | ------------- | --- | Branch? | 6.0 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | symfony/symfony-docs#15942 Includes `SwiftMailerHandler` from monolog-bridge, `translator.enabled_locales` from framework-bundle and `FirewallConfig::getListeners()` from security-bundle. Commits ------- 50ef4f0053 Remove remaining deprecated features
2 parents 15e9675 + f550ab1 commit bd9c271
Copy full SHA for bd9c271

File tree

6 files changed

+4
-47
lines changed
Filter options

6 files changed

+4
-47
lines changed

‎CHANGELOG.md

Copy file name to clipboardExpand all lines: CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ CHANGELOG
2020
* Register workflow services as private
2121
* Remove support for passing a `RouteCollectionBuilder` to `MicroKernelTrait::configureRoutes()`, type-hint `RoutingConfigurator` instead
2222
* Remove the `cache.adapter.doctrine` service
23+
* Remove the `framework.translator.enabled_locales` config option, use `framework.enabled_locales` instead
2324

2425
5.4
2526
---

‎DependencyInjection/Configuration.php

Copy file name to clipboardExpand all lines: DependencyInjection/Configuration.php
-6Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,6 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode, callable $e
785785
->{$enableIfStandalone('symfony/translation', Translator::class)}()
786786
->fixXmlConfig('fallback')
787787
->fixXmlConfig('path')
788-
->fixXmlConfig('enabled_locale')
789788
->fixXmlConfig('provider')
790789
->children()
791790
->arrayNode('fallbacks')
@@ -804,11 +803,6 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode, callable $e
804803
->arrayNode('paths')
805804
->prototype('scalar')->end()
806805
->end()
807-
->arrayNode('enabled_locales')
808-
->setDeprecated('symfony/framework-bundle', '5.3', 'Option "%node%" at "%path%" is deprecated, set the "framework.enabled_locales" option instead.')
809-
->prototype('scalar')->end()
810-
->defaultValue([])
811-
->end()
812806
->arrayNode('pseudo_localization')
813807
->canBeEnabled()
814808
->fixXmlConfig('localizable_html_attribute')

‎DependencyInjection/FrameworkExtension.php

Copy file name to clipboardExpand all lines: DependencyInjection/FrameworkExtension.php
+3-10Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -432,9 +432,7 @@ public function load(array $configs, ContainerBuilder $container)
432432
$this->registerProfilerConfiguration($config['profiler'], $container, $loader);
433433
$this->registerWorkflowConfiguration($config['workflows'], $container, $loader);
434434
$this->registerDebugConfiguration($config['php_errors'], $container, $loader);
435-
// @deprecated since Symfony 5.4, in 6.0 change to:
436-
// $this->registerRouterConfiguration($config['router'], $container, $loader, $config['enabled_locales']);
437-
$this->registerRouterConfiguration($config['router'], $container, $loader, $config['translator']['enabled_locales'] ?: $config['enabled_locales']);
435+
$this->registerRouterConfiguration($config['router'], $container, $loader, $config['enabled_locales']);
438436
$this->registerAnnotationsConfiguration($config['annotations'], $container, $loader);
439437
$this->registerPropertyAccessConfiguration($config['property_access'], $container, $loader);
440438
$this->registerSecretsConfiguration($config['secrets'], $container, $loader);
@@ -1223,10 +1221,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
12231221
$defaultOptions = $translator->getArgument(4);
12241222
$defaultOptions['cache_dir'] = $config['cache_dir'];
12251223
$translator->setArgument(4, $defaultOptions);
1226-
1227-
// @deprecated since Symfony 5.4, in 6.0 change to:
1228-
// $translator->setArgument(5, $enabledLocales);
1229-
$translator->setArgument(5, $config['enabled_locales'] ?: $enabledLocales);
1224+
$translator->setArgument(5, $enabledLocales);
12301225

12311226
$container->setParameter('translator.logging', $config['logging']);
12321227
$container->setParameter('translator.default_path', $config['default_path']);
@@ -1359,9 +1354,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
13591354
return;
13601355
}
13611356

1362-
// @deprecated since Symfony 5.4, in 6.0 change to:
1363-
// $locales = $enabledLocales;
1364-
$locales = $config['enabled_locales'] ?: $enabledLocales;
1357+
$locales = $enabledLocales;
13651358

13661359
foreach ($config['providers'] as $provider) {
13671360
if ($provider['locales']) {

‎Resources/config/schema/symfony-1.0.xsd

Copy file name to clipboardExpand all lines: Resources/config/schema/symfony-1.0.xsd
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@
180180
<xsd:sequence>
181181
<xsd:element name="fallback" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
182182
<xsd:element name="path" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
183-
<xsd:element name="enabled-locale" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
184183
<xsd:element name="pseudo-localization" type="pseudo_localization" minOccurs="0" maxOccurs="1" />
185184
<xsd:element name="provider" type="translation_provider" minOccurs="0" maxOccurs="unbounded" />
186185
</xsd:sequence>

‎Tests/DependencyInjection/Fixtures/yml/legacy_translator_enabled_locales.yml

Copy file name to clipboardExpand all lines: Tests/DependencyInjection/Fixtures/yml/legacy_translator_enabled_locales.yml
-14Lines changed: 0 additions & 14 deletions
This file was deleted.

‎Tests/DependencyInjection/FrameworkExtensionTest.php

Copy file name to clipboardExpand all lines: Tests/DependencyInjection/FrameworkExtensionTest.php
-16Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -544,22 +544,6 @@ public function testRouter()
544544
$this->assertSame(['_locale' => 'fr|en'], $container->getDefinition('routing.loader')->getArgument(2));
545545
}
546546

547-
/**
548-
* @group legacy
549-
*/
550-
public function testRouterWithLegacyTranslatorEnabledLocales()
551-
{
552-
$container = $this->createContainerFromFile('legacy_translator_enabled_locales');
553-
554-
$this->assertTrue($container->has('router'), '->registerRouterConfiguration() loads routing.xml');
555-
$arguments = $container->findDefinition('router')->getArguments();
556-
$this->assertEquals($container->getParameter('kernel.project_dir').'/config/routing.xml', $container->getParameter('router.resource'), '->registerRouterConfiguration() sets routing resource');
557-
$this->assertEquals('%router.resource%', $arguments[1], '->registerRouterConfiguration() sets routing resource');
558-
$this->assertEquals('xml', $arguments[2]['resource_type'], '->registerRouterConfiguration() sets routing resource type');
559-
560-
$this->assertSame(['_locale' => 'fr|en'], $container->getDefinition('routing.loader')->getArgument(2));
561-
}
562-
563547
public function testRouterRequiresResourceOption()
564548
{
565549
$this->expectException(InvalidConfigurationException::class);

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.