diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-11-18 14:41:01 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-11-18 14:41:01 +0100 |
| commit | 7260a65641af0c1896d3fe431cee16efe956fcbe (patch) | |
| tree | 89e908542fe1df3bc7cfd51857741051ba1b10ad | |
| parent | b56511b65e2fb12a0415863bc829d0ae98fe3e5b (diff) | |
| parent | 1dabcc78193413d90a6a1eeaaf50764b67ac61af (diff) | |
| download | symfony-security-7260a65641af0c1896d3fe431cee16efe956fcbe.zip symfony-security-7260a65641af0c1896d3fe431cee16efe956fcbe.tar.gz symfony-security-7260a65641af0c1896d3fe431cee16efe956fcbe.tar.bz2 | |
Merge branch '2.3' into 2.7
* 2.3:
Fix undefined array $server
[ProxyManager] Tmp fix composer reqs issue in ZF
Add missing exclusions from phpunit.xml.dist
Fix the server variables in the router_*.php files
[Validator] Allow an empty path with a non empty fragment or a query
The following change adds support for Armenian pluralization.
[2.3][Process] fix Proccess run with pts enabled
Conflicts:
composer.json
src/Symfony/Bridge/ProxyManager/composer.json
src/Symfony/Bundle/DebugBundle/phpunit.xml.dist
src/Symfony/Component/Security/phpunit.xml.dist
| -rw-r--r-- | Acl/phpunit.xml.dist | 3 | ||||
| -rw-r--r-- | Core/phpunit.xml.dist | 3 | ||||
| -rw-r--r-- | Csrf/phpunit.xml.dist | 2 | ||||
| -rw-r--r-- | Http/phpunit.xml.dist | 2 | ||||
| -rw-r--r-- | phpunit.xml.dist | 13 |
5 files changed, 12 insertions, 11 deletions
diff --git a/Acl/phpunit.xml.dist b/Acl/phpunit.xml.dist index 7552339..b1ea047 100644 --- a/Acl/phpunit.xml.dist +++ b/Acl/phpunit.xml.dist @@ -25,8 +25,9 @@ <whitelist> <directory>./</directory> <exclude> - <directory>./vendor</directory> + <directory>./Resources</directory> <directory>./Tests</directory> + <directory>./vendor</directory> </exclude> </whitelist> </filter> diff --git a/Core/phpunit.xml.dist b/Core/phpunit.xml.dist index 8a1a291..2dc341a 100644 --- a/Core/phpunit.xml.dist +++ b/Core/phpunit.xml.dist @@ -25,8 +25,9 @@ <whitelist> <directory>./</directory> <exclude> - <directory>./vendor</directory> + <directory>./Resources</directory> <directory>./Tests</directory> + <directory>./vendor</directory> </exclude> </whitelist> </filter> diff --git a/Csrf/phpunit.xml.dist b/Csrf/phpunit.xml.dist index 8f950a3..f5b1e65 100644 --- a/Csrf/phpunit.xml.dist +++ b/Csrf/phpunit.xml.dist @@ -25,8 +25,8 @@ <whitelist> <directory>./</directory> <exclude> - <directory>./vendor</directory> <directory>./Tests</directory> + <directory>./vendor</directory> </exclude> </whitelist> </filter> diff --git a/Http/phpunit.xml.dist b/Http/phpunit.xml.dist index 49b36f2..8d636e9 100644 --- a/Http/phpunit.xml.dist +++ b/Http/phpunit.xml.dist @@ -25,8 +25,8 @@ <whitelist> <directory>./</directory> <exclude> - <directory>./vendor</directory> <directory>./Tests</directory> + <directory>./vendor</directory> </exclude> </whitelist> </filter> diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 3e7ec38..6b56bf2 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -13,9 +13,7 @@ <testsuites> <testsuite name="Symfony Security Component Test Suite"> <directory>./Tests/</directory> - <directory>./Acl/Tests/</directory> - <directory>./Core/Tests/</directory> - <directory>./Http/Tests/</directory> + <directory>./*/Tests/</directory> </testsuite> </testsuites> @@ -23,11 +21,12 @@ <whitelist> <directory>./</directory> <exclude> - <directory>./vendor</directory> + <directory>./Resources</directory> <directory>./Tests</directory> - <directory>./Acl/Tests</directory> - <directory>./Core/Tests</directory> - <directory>./Http/Tests</directory> + <directory>./vendor</directory> + <directory>./*/Resources</directory> + <directory>./*/Tests</directory> + <directory>./*/vendor</directory> </exclude> </whitelist> </filter> |