diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-10 11:36:22 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-10 11:36:22 +0200 |
| commit | 5ebc79576c9de0dd7089d226cfb8da3be3683766 (patch) | |
| tree | 90e16e2283db93685831145b92083d069a26fd0a /Http | |
| parent | 76a58d654dc896281771ac3d40261d4fda9c193f (diff) | |
| parent | 26be1f663009d4edb0b2551687d82e649e1ce785 (diff) | |
| download | symfony-security-5ebc79576c9de0dd7089d226cfb8da3be3683766.zip symfony-security-5ebc79576c9de0dd7089d226cfb8da3be3683766.tar.gz symfony-security-5ebc79576c9de0dd7089d226cfb8da3be3683766.tar.bz2 | |
Merge branch '2.7' into 2.8
* 2.7:
[tests] Use @requires annotation when possible
[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
Added more tests for PropertyAccess
Conflicts:
.travis.yml
src/Symfony/Bridge/Doctrine/composer.json
src/Symfony/Bridge/Monolog/composer.json
src/Symfony/Bridge/ProxyManager/composer.json
src/Symfony/Bridge/Swiftmailer/composer.json
src/Symfony/Bridge/Twig/composer.json
src/Symfony/Bundle/DebugBundle/composer.json
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Bundle/SecurityBundle/composer.json
src/Symfony/Bundle/TwigBundle/composer.json
src/Symfony/Bundle/WebProfilerBundle/composer.json
src/Symfony/Component/Asset/composer.json
src/Symfony/Component/BrowserKit/composer.json
src/Symfony/Component/ClassLoader/composer.json
src/Symfony/Component/Config/composer.json
src/Symfony/Component/Console/composer.json
src/Symfony/Component/CssSelector/composer.json
src/Symfony/Component/Debug/composer.json
src/Symfony/Component/DependencyInjection/composer.json
src/Symfony/Component/DomCrawler/composer.json
src/Symfony/Component/EventDispatcher/composer.json
src/Symfony/Component/ExpressionLanguage/composer.json
src/Symfony/Component/Filesystem/composer.json
src/Symfony/Component/Finder/composer.json
src/Symfony/Component/Form/composer.json
src/Symfony/Component/HttpFoundation/composer.json
src/Symfony/Component/HttpKernel/composer.json
src/Symfony/Component/Intl/composer.json
src/Symfony/Component/Locale/composer.json
src/Symfony/Component/OptionsResolver/composer.json
src/Symfony/Component/Process/composer.json
src/Symfony/Component/PropertyAccess/composer.json
src/Symfony/Component/Routing/composer.json
src/Symfony/Component/Security/Acl/composer.json
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/Serializer/composer.json
src/Symfony/Component/Stopwatch/composer.json
src/Symfony/Component/Templating/composer.json
src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php
src/Symfony/Component/Translation/composer.json
src/Symfony/Component/Validator/composer.json
src/Symfony/Component/VarDumper/composer.json
src/Symfony/Component/Yaml/composer.json
Diffstat (limited to 'Http')
| -rw-r--r-- | Http/composer.json | 1 | ||||
| -rw-r--r-- | Http/phpunit.xml.dist | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Http/composer.json b/Http/composer.json index 1171c8d..65978ee 100644 --- a/Http/composer.json +++ b/Http/composer.json @@ -25,7 +25,6 @@ "paragonie/random_compat": "~1.0" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7|~3.0.0", "symfony/routing": "~2.2|~3.0.0", "symfony/security-csrf": "~2.4|~3.0.0", "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> |