diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-11 11:14:55 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-11 11:14:55 +0200 |
| commit | 77942bb3fb0796e6bf1e045e4836de8b4bbd4e81 (patch) | |
| tree | 452e83b0af19482a824e4a699b89d794bbdb36ef | |
| parent | 1d2585926ab63fd5b139b1f86111dd1b2cbccb1b (diff) | |
| parent | 8701aa551dc9824ae920c2bb55f3a77be063429c (diff) | |
| download | symfony-security-77942bb3fb0796e6bf1e045e4836de8b4bbd4e81.zip symfony-security-77942bb3fb0796e6bf1e045e4836de8b4bbd4e81.tar.gz symfony-security-77942bb3fb0796e6bf1e045e4836de8b4bbd4e81.tar.bz2 | |
Merge branch '2.8'
* 2.8:
[PhpUnit] Auto-register SymfonyTestsListener
[phpunit] Upgrade when a change is detected and when install subcommand is used
[Filesystem] Fix test on Windows
Fix merge
[HttpFoundation] Extend ClockMock to session storage tests
[Process] Don't use @requires on abstract class
[VarDumper] Fix wordwrap with Bootstrap
Fix the BC layer for the key->secret renaming for remember_me
Fix potential access to undefined index
Conflicts:
src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php
src/Symfony/Component/Locale/phpunit.xml.dist
| -rw-r--r-- | Core/phpunit.xml.dist | 4 | ||||
| -rw-r--r-- | Csrf/phpunit.xml.dist | 4 | ||||
| -rw-r--r-- | Guard/phpunit.xml.dist | 4 | ||||
| -rw-r--r-- | Http/phpunit.xml.dist | 4 | ||||
| -rw-r--r-- | phpunit.xml.dist | 4 |
5 files changed, 0 insertions, 20 deletions
diff --git a/Core/phpunit.xml.dist b/Core/phpunit.xml.dist index 739cb6e..8a1a291 100644 --- a/Core/phpunit.xml.dist +++ b/Core/phpunit.xml.dist @@ -30,8 +30,4 @@ </exclude> </whitelist> </filter> - - <listeners> - <listener class="Symfony\Bridge\PhpUnit\SkippedTestsListener" /> - </listeners> </phpunit> diff --git a/Csrf/phpunit.xml.dist b/Csrf/phpunit.xml.dist index 3e3d430..8f950a3 100644 --- a/Csrf/phpunit.xml.dist +++ b/Csrf/phpunit.xml.dist @@ -30,8 +30,4 @@ </exclude> </whitelist> </filter> - - <listeners> - <listener class="Symfony\Bridge\PhpUnit\SkippedTestsListener" /> - </listeners> </phpunit> diff --git a/Guard/phpunit.xml.dist b/Guard/phpunit.xml.dist index 99251f1..093628b 100644 --- a/Guard/phpunit.xml.dist +++ b/Guard/phpunit.xml.dist @@ -30,8 +30,4 @@ </exclude> </whitelist> </filter> - - <listeners> - <listener class="Symfony\Bridge\PhpUnit\SkippedTestsListener" /> - </listeners> </phpunit> diff --git a/Http/phpunit.xml.dist b/Http/phpunit.xml.dist index 33e60d7..49b36f2 100644 --- a/Http/phpunit.xml.dist +++ b/Http/phpunit.xml.dist @@ -30,8 +30,4 @@ </exclude> </whitelist> </filter> - - <listeners> - <listener class="Symfony\Bridge\PhpUnit\SkippedTestsListener" /> - </listeners> </phpunit> diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 1ca767d..0d9fe5f 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -32,8 +32,4 @@ </exclude> </whitelist> </filter> - - <listeners> - <listener class="Symfony\Bridge\PhpUnit\SkippedTestsListener" /> - </listeners> </phpunit> |