diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-09-24 11:03:02 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-09-24 11:03:02 +0200 |
| commit | a54d98450e87864bc89aabcf5ad8f4d61c9c430f (patch) | |
| tree | 633ee8309506cf877ff3db3b7e9dcb6218e0d9a1 /phpunit.xml.dist | |
| parent | c0ef55f174c82a88f68907272bec899873478e6e (diff) | |
| parent | 4a5dea2861a51b6b0f3c07dc541d9449882c44e1 (diff) | |
| download | symfony-security-a54d98450e87864bc89aabcf5ad8f4d61c9c430f.zip symfony-security-a54d98450e87864bc89aabcf5ad8f4d61c9c430f.tar.gz symfony-security-a54d98450e87864bc89aabcf5ad8f4d61c9c430f.tar.bz2 | |
Merge branch '2.8'
* 2.8: (29 commits)
Updating AbstractVoter so that the method receives the TokenInterface
Adding the necessary files so that Guard can be its own installable component
Fix syntax in a test
Normalize the way we check versions
Avoid errors when generating the logout URL when there is no firewall key
Removing unnecessary override
fabbot
Adding a new exception and throwing it when the User changes
Fixing a bug where having an authentication failure would log you out.
Tweaks thanks to Wouter
Adding logging on this step and switching the order - not for any huge reason
Adding a base class to assist with form login authentication
Allowing for other authenticators to be checked
meaningless author and license changes
Adding missing factory registration
Thanks again fabbot!
A few more changes thanks to @iltar
Splitting the getting of the user and checking credentials into two steps
Tweaking docblock on interface thanks to @iltar
Adding periods at the end of exceptions, and changing one class name to LogicException thanks to @iltar
...
Conflicts:
UPGRADE-2.8.md
src/Symfony/Bridge/Twig/Tests/Node/DumpNodeTest.php
src/Symfony/Bundle/FrameworkBundle/Command/ServerCommand.php
src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
src/Symfony/Component/Validator/Tests/Constraints/IdenticalToValidatorTest.php
src/Symfony/Component/Validator/Tests/Constraints/RangeValidatorTest.php
Diffstat (limited to 'phpunit.xml.dist')
| -rw-r--r-- | phpunit.xml.dist | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 7747b37..c0dbb2d 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -15,6 +15,7 @@ <directory>./Acl/Tests/</directory> <directory>./Core/Tests/</directory> <directory>./Http/Tests/</directory> + <directory>./Guard/Tests/</directory> </testsuite> </testsuites> |