Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix TestRunner compatibility to PhpUnit 8 #30085

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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();
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nicolas-grekas but here the long array syntax is correct or not?


$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.