Merge branch '3.4' into 4.0

* 3.4:
  [PhpUnitBridge] Fix
This commit is contained in:
Nicolas Grekas 2018-04-30 08:37:01 -07:00
commit 233518f2d1

View File

@ -13,7 +13,7 @@ namespace Symfony\Bridge\PhpUnit\TextUI;
if (class_exists('PHPUnit_Runner_Version') && version_compare(\PHPUnit_Runner_Version::id(), '6.0.0', '<')) {
class_alias('Symfony\Bridge\PhpUnit\Legacy\TestRunnerForV5', 'Symfony\Bridge\PhpUnit\TextUI\TestRunner');
} elseif (version_compare(\PHPUnit_Runner_Version::id(), '7.0.0', '<')) {
} elseif (version_compare(\PHPUnit\Runner\Version::id(), '7.0.0', '<')) {
class_alias('Symfony\Bridge\PhpUnit\Legacy\TestRunnerForV6', 'Symfony\Bridge\PhpUnit\TextUI\TestRunner');
} else {
class_alias('Symfony\Bridge\PhpUnit\Legacy\TestRunnerForV7', 'Symfony\Bridge\PhpUnit\TextUI\TestRunner');