diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #15920 Guard minor tweaks (weaverryan)

Browse Source 
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
This commit is contained in:
Fabien Potencier 2015-09-27 10:55:21 +02:00
commit 9cf4ab74d3
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php
View File

@ -94,7 +94,7 @@ class GuardAuthenticationFactory implements SecurityFactoryInterface
// 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']
));
}

1
src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
View File

@ -218,5 +218,6 @@ class GuardAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
$this->event = null;
$this->logger = null;
$this->request = null;
$this->rememberMeServices = null;
}
}

2
src/Symfony/Component/Security/Guard/composer.json
View File

@ -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",