diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-11-18 14:45:00 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-11-18 14:45:00 +0100 |
| commit | 4e473f4aa100d293f68dae683464f23407b0058e (patch) | |
| tree | 96e5e424f0a00bce0e9c894e360a9a6cf6f32f29 | |
| parent | b78eacaa57a9b0171fd4817b99510ab15f60d778 (diff) | |
| parent | 7260a65641af0c1896d3fe431cee16efe956fcbe (diff) | |
| download | symfony-security-4e473f4aa100d293f68dae683464f23407b0058e.zip symfony-security-4e473f4aa100d293f68dae683464f23407b0058e.tar.gz symfony-security-4e473f4aa100d293f68dae683464f23407b0058e.tar.bz2 | |
Merge branch '2.7' into 2.8
* 2.7:
Fix undefined array $server
Fix bug in windows detection
[ProxyManager] Tmp fix composer reqs issue in ZF
Add missing exclusions from phpunit.xml.dist
[Serializer] ObjectNormalizer: don't serialize static methods and props
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/Component/Security/phpunit.xml.dist
| -rw-r--r-- | Core/phpunit.xml.dist | 3 | ||||
| -rw-r--r-- | Csrf/phpunit.xml.dist | 2 | ||||
| -rw-r--r-- | Guard/phpunit.xml.dist | 3 | ||||
| -rw-r--r-- | Http/phpunit.xml.dist | 2 | ||||
| -rw-r--r-- | phpunit.xml.dist | 14 |
5 files changed, 12 insertions, 12 deletions
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/Guard/phpunit.xml.dist b/Guard/phpunit.xml.dist index 093628b..da5a382 100644 --- a/Guard/phpunit.xml.dist +++ b/Guard/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/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 0d9fe5f..6b56bf2 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -13,10 +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>./Guard/Tests/</directory> + <directory>./*/Tests/</directory> </testsuite> </testsuites> @@ -24,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> |