summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2015-09-27 10:55:21 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2015-09-27 10:55:21 +0200
commit404d4eeb6f554cedc2863c817d659949ab52906b (patch)
tree9daca708fd71f9bb0a90207fc1fb41063d118223
parentb2696f86e862938c8ecd8f0b18e943d3d83737f1 (diff)
parent555335ad2110d0e312bca5259e864d1db1737c49 (diff)
downloadsymfony-security-404d4eeb6f554cedc2863c817d659949ab52906b.zip
symfony-security-404d4eeb6f554cedc2863c817d659949ab52906b.tar.gz
symfony-security-404d4eeb6f554cedc2863c817d659949ab52906b.tar.bz2
minor #15920 Guard minor tweaks (weaverryan)
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
-rw-r--r--Guard/Tests/Firewall/GuardAuthenticationListenerTest.php1
-rw-r--r--Guard/composer.json2
2 files changed, 2 insertions, 1 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/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",