From da4758a2af0577fae0d298af472da15d3ac63fb2 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Sat, 26 Sep 2015 10:16:59 -0400 Subject: [PATCH 1/2] Minor tweaks - lowering the required security-http requirement and nulling out a test field --- .../Guard/Tests/Firewall/GuardAuthenticationListenerTest.php | 1 + src/Symfony/Component/Security/Guard/composer.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php b/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php index 8fab3991f98a4..26d17dd8c71f6 100644 --- 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 index 1e0dc8ceddcbc..176754e335820 100644 --- 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", From 869d5a77f090faacb52c69c44e2cd1c499e9ba66 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Sat, 26 Sep 2015 10:22:30 -0400 Subject: [PATCH 2/2] tweaking message related to configuration edge case that we want to be helpful with --- .../Security/Factory/GuardAuthenticationFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php index 0d58c39b058e0..23752677775eb 100644 --- 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'] )); } pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy