diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-07 09:44:07 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-07 09:44:07 +0200 |
| commit | 82a1ebbc0f0a570b28d5ede8243733c20971564c (patch) | |
| tree | 8f5c8b38de75c2eb26bf7412cd714b6756c9738f /phpunit.xml.dist | |
| parent | 4e3ea9f244ad465865c2384f3d9ba2f89361d364 (diff) | |
| parent | 5d74e1996313fc483fed9d4040acfa7f7b4fd297 (diff) | |
| download | symfony-security-82a1ebbc0f0a570b28d5ede8243733c20971564c.zip symfony-security-82a1ebbc0f0a570b28d5ede8243733c20971564c.tar.gz symfony-security-82a1ebbc0f0a570b28d5ede8243733c20971564c.tar.bz2 | |
Merge branch '2.8'
Conflicts:
composer.json
src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
src/Symfony/Bundle/FrameworkBundle/Resources/config/security_csrf.xml
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Component/DependencyInjection/ContainerBuilder.php
src/Symfony/Component/Security/Core/composer.json
src/Symfony/Component/Security/Csrf/composer.json
src/Symfony/Component/Security/Http/composer.json
src/Symfony/Component/Security/composer.json
src/Symfony/Component/Translation/PluralizationRules.php
src/Symfony/Component/VarDumper/Exception/ThrowingCasterException.php
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> |