Skip to content

Commit

Permalink
Fix TestRunner compatibility to PhpUnit 8
Browse files Browse the repository at this point in the history
  • Loading branch information
alexander-schranz authored and nicolas-grekas committed Apr 8, 2019
1 parent 77320cb commit a0c66a3
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 175 deletions.
20 changes: 19 additions & 1 deletion src/Symfony/Bridge/PhpUnit/Legacy/CommandForV5.php
Expand Up @@ -23,6 +23,24 @@ class CommandForV5 extends \PHPUnit_TextUI_Command
*/
protected function createRunner()
{
return new TestRunnerForV5($this->arguments['loader']);
$listener = new SymfonyTestsListenerForV5();

$this->arguments['listeners'] = isset($this->arguments['listeners']) ? $this->arguments['listeners'] : array();

$registeredLocally = false;

foreach ($this->arguments['listeners'] as $registeredListener) {
if ($registeredListener instanceof SymfonyTestsListenerForV5) {
$registeredListener->globalListenerDisabled();
$registeredLocally = true;
break;
}
}

if (!$registeredLocally) {
$this->arguments['listeners'][] = $listener;
}

return parent::createRunner();
}
}
22 changes: 20 additions & 2 deletions src/Symfony/Bridge/PhpUnit/Legacy/CommandForV6.php
Expand Up @@ -13,7 +13,7 @@

use PHPUnit\TextUI\Command as BaseCommand;
use PHPUnit\TextUI\TestRunner as BaseRunner;
use Symfony\Bridge\PhpUnit\TextUI\TestRunner;
use Symfony\Bridge\PhpUnit\SymfonyTestsListener;

/**
* {@inheritdoc}
Expand All @@ -27,6 +27,24 @@ class CommandForV6 extends BaseCommand
*/
protected function createRunner(): BaseRunner
{
return new TestRunner($this->arguments['loader']);
$listener = new SymfonyTestsListener();

$this->arguments['listeners'] = isset($this->arguments['listeners']) ? $this->arguments['listeners'] : [];

$registeredLocally = false;

foreach ($this->arguments['listeners'] as $registeredListener) {
if ($registeredListener instanceof SymfonyTestsListener) {
$registeredListener->globalListenerDisabled();
$registeredLocally = true;
break;
}
}

if (!$registeredLocally) {
$this->arguments['listeners'][] = $listener;
}

return parent::createRunner();
}
}
48 changes: 0 additions & 48 deletions src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV5.php

This file was deleted.

49 changes: 0 additions & 49 deletions src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV6.php

This file was deleted.

49 changes: 0 additions & 49 deletions src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV7.php

This file was deleted.

26 changes: 0 additions & 26 deletions src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php

This file was deleted.

0 comments on commit a0c66a3

Please sign in to comment.