diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-10 11:26:25 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-10 11:26:25 +0200 |
| commit | a08da3494fc2019ec4babbc82b952c2ee0b6b91c (patch) | |
| tree | 6b09a97cb065f7a0157bf07c3ff282e90e8512ee | |
| parent | 13818e3015a2a20025ae65b6f57756795eaeda7e (diff) | |
| parent | 94e661a60e9cca2c83879a88584fed6e1514bd00 (diff) | |
| download | symfony-security-a08da3494fc2019ec4babbc82b952c2ee0b6b91c.zip symfony-security-a08da3494fc2019ec4babbc82b952c2ee0b6b91c.tar.gz symfony-security-a08da3494fc2019ec4babbc82b952c2ee0b6b91c.tar.bz2 | |
Merge branch '2.3' into 2.7
* 2.3:
[tests] Use @requires annotation when possible
[ci] Enable collecting and replaying skipped tests
[Process] Workaround buggy PHP warning
[Console] Add additional ways to detect OS400 platform
[Yaml] Allow tabs before comments at the end of a line
Conflicts:
composer.json
src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php
src/Symfony/Bridge/Monolog/composer.json
src/Symfony/Bridge/Twig/composer.json
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Bundle/SecurityBundle/composer.json
src/Symfony/Component/Asset/composer.json
src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php
src/Symfony/Component/Console/composer.json
src/Symfony/Component/Debug/composer.json
src/Symfony/Component/DomCrawler/composer.json
src/Symfony/Component/EventDispatcher/composer.json
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
src/Symfony/Component/HttpFoundation/composer.json
src/Symfony/Component/Intl/composer.json
src/Symfony/Component/Routing/composer.json
src/Symfony/Component/Security/composer.json
src/Symfony/Component/Serializer/composer.json
src/Symfony/Component/Templating/composer.json
src/Symfony/Component/Translation/composer.json
src/Symfony/Component/Validator/composer.json
| -rw-r--r-- | Acl/composer.json | 1 | ||||
| -rw-r--r-- | Acl/phpunit.xml.dist | 4 | ||||
| -rw-r--r-- | Core/composer.json | 1 | ||||
| -rw-r--r-- | Core/phpunit.xml.dist | 4 | ||||
| -rw-r--r-- | Csrf/composer.json | 1 | ||||
| -rw-r--r-- | Csrf/phpunit.xml.dist | 4 | ||||
| -rw-r--r-- | Http/composer.json | 1 | ||||
| -rw-r--r-- | Http/phpunit.xml.dist | 4 | ||||
| -rw-r--r-- | composer.json | 1 | ||||
| -rw-r--r-- | phpunit.xml.dist | 4 |
10 files changed, 20 insertions, 5 deletions
diff --git a/Acl/composer.json b/Acl/composer.json index 917c061..7cd89a8 100644 --- a/Acl/composer.json +++ b/Acl/composer.json @@ -20,7 +20,6 @@ "symfony/security-core": "~2.4" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "doctrine/common": "~2.2", "doctrine/dbal": "~2.2", "psr/log": "~1.0" diff --git a/Acl/phpunit.xml.dist b/Acl/phpunit.xml.dist index 7552339..b252921 100644 --- a/Acl/phpunit.xml.dist +++ b/Acl/phpunit.xml.dist @@ -30,4 +30,8 @@ </exclude> </whitelist> </filter> + + <listeners> + <listener class="Symfony\Bridge\PhpUnit\SkippedTestsListener" /> + </listeners> </phpunit> diff --git a/Core/composer.json b/Core/composer.json index 38054df..c73a5b5 100644 --- a/Core/composer.json +++ b/Core/composer.json @@ -19,7 +19,6 @@ "php": ">=5.3.9" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "symfony/event-dispatcher": "~2.1", "symfony/expression-language": "~2.6", "symfony/http-foundation": "~2.4", diff --git a/Core/phpunit.xml.dist b/Core/phpunit.xml.dist index 8a1a291..739cb6e 100644 --- a/Core/phpunit.xml.dist +++ b/Core/phpunit.xml.dist @@ -30,4 +30,8 @@ </exclude> </whitelist> </filter> + + <listeners> + <listener class="Symfony\Bridge\PhpUnit\SkippedTestsListener" /> + </listeners> </phpunit> diff --git a/Csrf/composer.json b/Csrf/composer.json index a0de39d..12077d4 100644 --- a/Csrf/composer.json +++ b/Csrf/composer.json @@ -20,7 +20,6 @@ "symfony/security-core": "~2.4" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "symfony/http-foundation": "~2.1" }, "suggest": { diff --git a/Csrf/phpunit.xml.dist b/Csrf/phpunit.xml.dist index 8f950a3..3e3d430 100644 --- a/Csrf/phpunit.xml.dist +++ b/Csrf/phpunit.xml.dist @@ -30,4 +30,8 @@ </exclude> </whitelist> </filter> + + <listeners> + <listener class="Symfony\Bridge\PhpUnit\SkippedTestsListener" /> + </listeners> </phpunit> diff --git a/Http/composer.json b/Http/composer.json index 7b08d00..1d40882 100644 --- a/Http/composer.json +++ b/Http/composer.json @@ -23,7 +23,6 @@ "symfony/http-kernel": "~2.4" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "symfony/routing": "~2.2", "symfony/security-csrf": "~2.4", "psr/log": "~1.0" diff --git a/Http/phpunit.xml.dist b/Http/phpunit.xml.dist index 49b36f2..33e60d7 100644 --- a/Http/phpunit.xml.dist +++ b/Http/phpunit.xml.dist @@ -30,4 +30,8 @@ </exclude> </whitelist> </filter> + + <listeners> + <listener class="Symfony\Bridge\PhpUnit\SkippedTestsListener" /> + </listeners> </phpunit> diff --git a/composer.json b/composer.json index 826dceb..f2c4e13 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,6 @@ }, "require-dev": { "symfony/finder": "~2.3", - "symfony/phpunit-bridge": "~2.7", "symfony/intl": "~2.3", "symfony/routing": "~2.2", "symfony/translation": "~2.0,>=2.0.5", diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 3e7ec38..681298e 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -31,4 +31,8 @@ </exclude> </whitelist> </filter> + + <listeners> + <listener class="Symfony\Bridge\PhpUnit\SkippedTestsListener" /> + </listeners> </phpunit> |