Improved code for Symfony 5

javiereguiluz · javiereguiluz · commit ef133dc21987 · 2019-02-08T16:00:20.000+01:00
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -218,18 +218,21 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
                 ->fixXmlConfig('delete_cookie')
                 ->children()
                     ->arrayNode('delete_cookies')
-                        ->normalizeKeys(true) // TRUE for BC reasons. Change it to FALSE in Symfony 5.0
+                        ->normalizeKeys(false)
                         ->beforeNormalization()
                             ->ifTrue(function ($v) { return \is_array($v) && \is_int(key($v)); })
                             ->then(function ($v) { return array_map(function ($v) { return ['name' => $v]; }, $v); })
                         ->end()
                         ->beforeNormalization()
                             ->ifArray()->then(function ($v) {
-                                foreach ($v as $originalName => $config) {
+                                foreach ($v as $originalName => $cookieConfig) {
                                     if (false !== strpos($originalName, '-')) {
                                         $normalizedName = str_replace('-', '_', $originalName);
-                                        // when removing this deprecation, don't forget to set normalizeKeys() to FALSE above
                                         @trigger_error(sprintf('Normalization of cookie names is deprecated since Symfony 4.3. Starting from Symfony 5.0, the "%s" cookie configured in "logout.delete_cookies" will delete the "%s" cookie instead of the "%s" cookie.', $originalName, $originalName, $normalizedName), E_USER_DEPRECATED);
+
+                                        // normalize cookie names manually for BC reasons. Remove it in Symfony 5.0.
+                                        $v[$normalizedName] = $cookieConfig;
+                                        unset($v[$originalName]);
                                     }
                                 }
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -515,7 +515,7 @@ public function testLogoutDeleteCookieNamesNormalization()
     {
         $container = $this->getContainer('logout_delete_cookies');
         $cookiesToDelete = $container->getDefinition('security.logout.handler.cookie_clearing.main')->getArgument(0);
-        $expectedCookieNames = ['cookie1-name', 'cookie2_name', 'cookie3-long_name'];
+        $expectedCookieNames = ['cookie2_name', 'cookie1_name', 'cookie3_long_name'];
 
         $this->assertSame($expectedCookieNames, array_keys($cookiesToDelete));
     }

Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,7 @@ public function testLogoutDeleteCookieNamesNormalization()`
`515`	`515`	`{`
`516`	`516`	`$container = $this->getContainer('logout_delete_cookies');`
`517`	`517`	`$cookiesToDelete = $container->getDefinition('security.logout.handler.cookie_clearing.main')->getArgument(0);`
`518`		`- $expectedCookieNames = ['cookie1-name', 'cookie2_name', 'cookie3-long_name'];`
	`518`	`+ $expectedCookieNames = ['cookie2_name', 'cookie1_name', 'cookie3_long_name'];`
`519`	`519`
`520`	`520`	`$this->assertSame($expectedCookieNames, array_keys($cookiesToDelete));`
`521`	`521`	`}`