diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.4' into 4.0 

* 3.4:
  [Bridge/PhpUnit] hotfix
This commit is contained in:
Nicolas Grekas 2018-02-11 18:57:08 +01:00
parent c422bac6b6 292fb56c70
commit f75730df46
4 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerForV6.php
View File

@ -29,7 +29,7 @@ class SymfonyTestsListenerForV6 extends BaseTestListener
public function __construct(array $mockedNamespaces = array())
{
$this->trait = new Legacy\SymfonyTestsListenerTrait($mockedNamespaces);
$this->trait = new SymfonyTestsListenerTrait($mockedNamespaces);
}
public function globalListenerDisabled()

4
src/Symfony/Bridge/PhpUnit/Legacy/TestRunner.php
View File

@ -23,7 +23,7 @@ class TestRunner extends \PHPUnit_TextUI_TestRunner
*/
protected function handleConfiguration(array &$arguments)
{
$listener = new SymfonyTestsListener();
$listener = new SymfonyTestsListenerForV5();
$result = parent::handleConfiguration($arguments);
@ -32,7 +32,7 @@ class TestRunner extends \PHPUnit_TextUI_TestRunner
$registeredLocally = false;
foreach ($arguments['listeners'] as $registeredListener) {
if ($registeredListener instanceof SymfonyTestsListener) {
if ($registeredListener instanceof SymfonyTestsListenerForV5) {
$registeredListener->globalListenerDisabled();
$registeredLocally = true;
break;

24
src/Symfony/Bridge/PhpUnit/TextUI/Command.php
View File

@ -15,22 +15,20 @@ use PHPUnit\TextUI\Command as BaseCommand;
if (class_exists('PHPUnit_Runner_Version') && version_compare(\PHPUnit_Runner_Version::id(), '6.0.0', '<')) {
class_alias('Symfony\Bridge\PhpUnit\Legacy\Command', 'Symfony\Bridge\PhpUnit\TextUI\Command');
return;
}
/**
* {@inheritdoc}
*
* @internal
*/
class Command extends BaseCommand
{
} else {
/**
* {@inheritdoc}
*
* @internal
*/
protected function createRunner()
class Command extends BaseCommand
{
return new TestRunner($this->arguments['loader']);
/**
* {@inheritdoc}
*/
protected function createRunner()
{
return new TestRunner($this->arguments['loader']);
}
}
}

50
src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php
View File

@ -16,42 +16,40 @@ use Symfony\Bridge\PhpUnit\SymfonyTestsListener;
if (class_exists('PHPUnit_Runner_Version') && version_compare(\PHPUnit_Runner_Version::id(), '6.0.0', '<')) {
class_alias('Symfony\Bridge\PhpUnit\Legacy\TestRunner', 'Symfony\Bridge\PhpUnit\TextUI\TestRunner');
return;
}
/**
* {@inheritdoc}
*
* @internal
*/
class TestRunner extends BaseRunner
{
} else {
/**
* {@inheritdoc}
*
* @internal
*/
protected function handleConfiguration(array &$arguments)
class TestRunner extends BaseRunner
{
$listener = new SymfonyTestsListener();
/**
* {@inheritdoc}
*/
protected function handleConfiguration(array &$arguments)
{
$listener = new SymfonyTestsListener();
$result = parent::handleConfiguration($arguments);
$result = parent::handleConfiguration($arguments);
$arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : array();
$arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : array();
$registeredLocally = false;
$registeredLocally = false;
foreach ($arguments['listeners'] as $registeredListener) {
if ($registeredListener instanceof SymfonyTestsListener) {
$registeredListener->globalListenerDisabled();
$registeredLocally = true;
break;
foreach ($arguments['listeners'] as $registeredListener) {
if ($registeredListener instanceof SymfonyTestsListener) {
$registeredListener->globalListenerDisabled();
$registeredLocally = true;
break;
}
}
}
if (!$registeredLocally) {
$arguments['listeners'][] = $listener;
}
if (!$registeredLocally) {
$arguments['listeners'][] = $listener;
}
return $result;
return $result;
}
}
}