minor #15920 Guard minor tweaks (weaverryan)

fabpot · fabpot · commit 9cf4ab74d352 · 2015-09-27T10:55:21.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- Guard minor tweaks | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Various completely minor things, most from suggestions on #14673 Commits ------- 869d5a7 tweaking message related to configuration edge case that we want to be helpful with da4758a Minor tweaks - lowering the required security-http requirement and nulling out a test field
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php
@@ -94,7 +94,7 @@ private function determineEntryPoint($defaultEntryPointId, array $config)
             // explode if they've configured the entry_point, but there is already one
             if ($config['entry_point']) {
                 throw new \LogicException(sprintf(
-                    'The guard authentication provider cannot use the "%s" entry_point because another entry point is already configured by another provider! Either remove the other provider or move the entry_point configuration as a root key under your firewall',
+                    'The guard authentication provider cannot use the "%s" entry_point because another entry point is already configured by another provider! Either remove the other provider or move the entry_point configuration as a root key under your firewall (i.e. at the same level as "guard").',
                     $config['entry_point']
                 ));
             }
diff --git a/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php b/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
@@ -218,5 +218,6 @@ protected function tearDown()
         $this->event = null;
         $this->logger = null;
         $this->request = null;
+        $this->rememberMeServices = null;
     }
 }
diff --git a/src/Symfony/Component/Security/Guard/composer.json b/src/Symfony/Component/Security/Guard/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=5.3.9",
         "symfony/security-core": "~2.8|~3.0.0",
-        "symfony/security-http": "~2.8|~3.0.0"
+        "symfony/security-http": "~2.7|~3.0.0"
     },
     "require-dev": {
         "symfony/phpunit-bridge": "~2.8|~3.0.0",

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ private function determineEntryPoint($defaultEntryPointId, array $config)`
`94`	`94`	`// explode if they've configured the entry_point, but there is already one`
`95`	`95`	`if ($config['entry_point']) {`
`96`	`96`	`throw new \LogicException(sprintf(`
`97`		`- 'The guard authentication provider cannot use the "%s" entry_point because another entry point is already configured by another provider! Either remove the other provider or move the entry_point configuration as a root key under your firewall',`
	`97`	`+ 'The guard authentication provider cannot use the "%s" entry_point because another entry point is already configured by another provider! Either remove the other provider or move the entry_point configuration as a root key under your firewall (i.e. at the same level as "guard").',`
`98`	`98`	`$config['entry_point']`
`99`	`99`	`));`
`100`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -218,5 +218,6 @@ protected function tearDown()`
`218`	`218`	`$this->event = null;`
`219`	`219`	`$this->logger = null;`
`220`	`220`	`$this->request = null;`
	`221`	`+ $this->rememberMeServices = null;`
`221`	`222`	`}`
`222`	`223`	`}`