Merge branch '2.8' into 3.2

* 2.8:
  fix deps
This commit is contained in:
Nicolas Grekas 2017-02-21 17:21:09 +01:00
commit 9ed5e8c184
4 changed files with 14 additions and 2 deletions

View File

@ -13,6 +13,10 @@ namespace Symfony\Bridge\PhpUnit;
use Doctrine\Common\Annotations\AnnotationRegistry;
if (!class_exists('PHPUnit_Framework_BaseTestListener')) {
return;
}
/**
* Collects and replays skipped tests.
*

View File

@ -11,6 +11,10 @@
namespace Symfony\Bridge\PhpUnit\TextUI;
if (!class_exists('PHPUnit_TextUI_Command')) {
return;
}
/**
* {@inheritdoc}
*/

View File

@ -13,6 +13,10 @@ namespace Symfony\Bridge\PhpUnit\TextUI;
use Symfony\Bridge\PhpUnit\SymfonyTestsListener;
if (!class_exists('PHPUnit_TextUI_TestRunner')) {
return;
}
/**
* {@inheritdoc}
*/

View File

@ -27,7 +27,7 @@
"symfony/console": "~2.8|~3.0",
"symfony/css-selector": "~2.8|~3.0",
"symfony/dom-crawler": "~2.8|~3.0",
"symfony/form": "~2.8|~3.0",
"symfony/form": "^2.8.18|^3.2.5",
"symfony/framework-bundle": "^3.2.5",
"symfony/http-foundation": "~2.8|~3.0",
"symfony/security-acl": "~2.8|~3.0",
@ -35,7 +35,7 @@
"symfony/twig-bundle": "~2.8|~3.0",
"symfony/twig-bridge": "~2.8|~3.0",
"symfony/process": "~2.8|~3.0",
"symfony/validator": "~2.8|~3.0",
"symfony/validator": "^2.8.18|^3.2.5",
"symfony/var-dumper": "~3.2",
"symfony/yaml": "~2.8|~3.0",
"symfony/expression-language": "~2.8|~3.0",