diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-06 19:12:59 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-06 19:12:59 +0200 |
| commit | ce07ac56f610bc9ca1ef11fddf90d38d3b72f85e (patch) | |
| tree | 5cce7f9ba7469c8ee4577a0b8ca3c8abe940f9ab /phpunit.xml.dist | |
| parent | 99d73ecb12dedf5c772aab7f00e7d39b60c5f4ed (diff) | |
| parent | 13818e3015a2a20025ae65b6f57756795eaeda7e (diff) | |
| download | symfony-security-ce07ac56f610bc9ca1ef11fddf90d38d3b72f85e.zip symfony-security-ce07ac56f610bc9ca1ef11fddf90d38d3b72f85e.tar.gz symfony-security-ce07ac56f610bc9ca1ef11fddf90d38d3b72f85e.tar.bz2 | |
Merge branch '2.7' into 2.8
Conflicts:
src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
src/Symfony/Component/Security/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php
src/Symfony/Component/Security/composer.json
Diffstat (limited to 'phpunit.xml.dist')
| -rw-r--r-- | phpunit.xml.dist | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpunit.xml.dist b/phpunit.xml.dist index c0dbb2d..0d9fe5f 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -12,6 +12,7 @@ <testsuites> <testsuite name="Symfony Security Component Test Suite"> + <directory>./Tests/</directory> <directory>./Acl/Tests/</directory> <directory>./Core/Tests/</directory> <directory>./Http/Tests/</directory> @@ -24,6 +25,7 @@ <directory>./</directory> <exclude> <directory>./vendor</directory> + <directory>./Tests</directory> <directory>./Acl/Tests</directory> <directory>./Core/Tests</directory> <directory>./Http/Tests</directory> |