merged branch johannes85/2.0 (PR symfony#3791)

fabpot · fabpot · commit 57990cc53ff0 · 2012-04-10T20:26:31.000+02:00
Commits ------- 0024ddc Fix for using route name as check_path. Discussion ---------- Security Bundle route as check_path In the current 2.0 branch you can't use a route as firewalls: admin_area: login_path: you will get a InvalidConfigurationException. In the 2.1 version this is fixed. Since 2.1 isn't released i think this fix should be merged into the 2.0 branch too. Many people have this problem (schmittjoh/JMSI18nRoutingBundle#7) for example which effectively blocks internationalisation in combination with the firewall. --------------------------------------------------------------------------- by stof at 2012-04-10T13:35:13Z @fabpot ping
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -274,7 +274,7 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
                             continue;
                         }
 
-                        if (!preg_match('#'.$firewall['pattern'].'#', $firewall[$k]['check_path'])) {
+                        if (false !== strpos('/', $firewall[$k]['check_path']) && !preg_match('#'.$firewall['pattern'].'#', $firewall[$k]['check_path'])) {
                             throw new \LogicException(sprintf('The check_path "%s" for login method "%s" is not matched by the firewall pattern "%s".', $firewall[$k]['check_path'], $k, $firewall['pattern']));
                         }
                     }

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto`
`274`	`274`	`continue;`
`275`	`275`	`}`
`276`	`276`
`277`		`- if (!preg_match('#'.$firewall['pattern'].'#', $firewall[$k]['check_path'])) {`
	`277`	`+ if (false !== strpos('/', $firewall[$k]['check_path']) && !preg_match('#'.$firewall['pattern'].'#', $firewall[$k]['check_path'])) {`
`278`	`278`	`throw new \LogicException(sprintf('The check_path "%s" for login method "%s" is not matched by the firewall pattern "%s".', $firewall[$k]['check_path'], $k, $firewall['pattern']));`
`279`	`279`	`}`
`280`	`280`	`}`