Skip to content

Guard minor tweaks #15920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fabpot merged 2 commits into from
Sep 27, 2015
Merged

Guard minor tweaks #15920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da4758a
Minor tweaks - lowering the required security-http requirement and nu…
weaverryan Sep 26, 2015
869d5a7
tweaking message related to configuration edge case that we want to b…
weaverryan Sep 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
));
}
Expand Down
1 change: 1 addition & 0 deletions src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,5 +218,6 @@ protected function tearDown()
$this->event = null;
$this->logger = null;
$this->request = null;
$this->rememberMeServices = null;
Copy link
Member

@wouterj wouterj Sep 26, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't we simply combine this by changing all =s?

Copy link
Member

@stof stof Sep 26, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is more readable than when combined though.

}
}
2 changes: 1 addition & 1 deletion src/Symfony/Component/Security/Guard/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down