summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Guard/Tests/Firewall/GuardAuthenticationListenerTest.php1
-rw-r--r--Guard/Token/GuardTokenInterface.php4
-rw-r--r--Guard/composer.json2
-rw-r--r--composer.json1
4 files changed, 6 insertions, 2 deletions
diff --git a/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php b/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
index 8fab399..26d17dd 100644
--- a/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
+++ b/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
@@ -218,5 +218,6 @@ class GuardAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
$this->event = null;
$this->logger = null;
$this->request = null;
+ $this->rememberMeServices = null;
}
}
diff --git a/Guard/Token/GuardTokenInterface.php b/Guard/Token/GuardTokenInterface.php
index f0db250..063ffd3 100644
--- a/Guard/Token/GuardTokenInterface.php
+++ b/Guard/Token/GuardTokenInterface.php
@@ -11,6 +11,8 @@
namespace Symfony\Component\Security\Guard\Token;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+
/**
* A marker interface that both guard tokens implement.
*
@@ -20,6 +22,6 @@ namespace Symfony\Component\Security\Guard\Token;
*
* @author Ryan Weaver <ryan@knpuniversity.com>
*/
-interface GuardTokenInterface
+interface GuardTokenInterface extends TokenInterface
{
}
diff --git a/Guard/composer.json b/Guard/composer.json
index 1e0dc8c..176754e 100644
--- a/Guard/composer.json
+++ b/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",
diff --git a/composer.json b/composer.json
index 9df0bf0..708c60f 100644
--- a/composer.json
+++ b/composer.json
@@ -25,6 +25,7 @@
"replace": {
"symfony/security-core": "self.version",
"symfony/security-csrf": "self.version",
+ "symfony/security-guard": "self.version",
"symfony/security-http": "self.version"
},
"require-dev": {