[SecurityBundle] Remove auto picking the first provider

ogizanagi · ogizanagi · commit aeb57ab658e1 · 2017-09-30T16:22:30.000+02:00
when no provider is explicitly configured on a firewall
diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -13,6 +13,7 @@ CHANGELOG
  * removed command `acl:set` along with `SetAclCommand` class
  * removed command `init:acl` along with `InitAclCommand` class
  * removed `acl` configuration key and related services, use symfony/acl-bundle instead
+ * removed auto picking the first registered provider when no configured provider on a firewall and ambiguous
 
 3.4.0
 -----
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -261,6 +261,10 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
             }
             $defaultProvider = $providerIds[$normalizedName];
         } else {
+            if (count($providerIds) > 1) {
+                throw new InvalidConfigurationException(sprintf('Not configuring explicitly the provider on "%s" firewall is ambiguous as there is more than one registered provider.', $id));
+            }
+
             $defaultProvider = reset($providerIds);
 
             if (count($providerIds) > 1) {
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -175,8 +175,8 @@ public function testSwitchUserNotStatelessOnStatelessFirewall()
     }
 
     /**
-     * @group legacy
-     * @expectedDeprecation Firewall "default" has no "provider" set but multiple providers exist. Using the first configured provider (first) is deprecated since 3.4 and will throw an exception in 4.0, set the "provider" key on the firewall instead.
+     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
+     * @expectedExceptionMessage Not configuring explicitly the provider on "default" firewall is ambiguous as there is more than one registered provider.
      */
     public function testDeprecationForAmbiguousProvider()
     {

Original file line number	Diff line number	Diff line change
`@@ -175,8 +175,8 @@ public function testSwitchUserNotStatelessOnStatelessFirewall()`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`/**`
`178`		`- * @group legacy`
`179`		`- * @expectedDeprecation Firewall "default" has no "provider" set but multiple providers exist. Using the first configured provider (first) is deprecated since 3.4 and will throw an exception in 4.0, set the "provider" key on the firewall instead.`
	`178`	`+ * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException`
	`179`	`+ * @expectedExceptionMessage Not configuring explicitly the provider on "default" firewall is ambiguous as there is more than one registered provider.`
`180`	`180`	`*/`
`181`	`181`	`public function testDeprecationForAmbiguousProvider()`
`182`	`182`	`{`