Skip to content

Commit fb40167

Browse files
Merge branch '5.0' into 5.1
* 5.0: Fix test that fails on old distros Fix: compatibility with phpunit 9.3 [DoctrineBridge] work around Connection::ping() deprecation [MimeType] Duplicated MimeType due to PHP Bug [DI] fix parsing of argument type=binary in xml fix guessing form types for DateTime types fix handling typed properties as constraint options Fix the 'supports' method argument type of the security voter Use the driverConnection executeUpdate method
2 parents cbef5f6 + 8dad5c5 commit fb40167

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

Legacy/CommandForV9.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@
1212
namespace Symfony\Bridge\PhpUnit\Legacy;
1313

1414
use PHPUnit\TextUI\Command as BaseCommand;
15-
use PHPUnit\TextUI\Configuration\Configuration;
15+
use PHPUnit\TextUI\Configuration\Configuration as LegacyConfiguration;
1616
use PHPUnit\TextUI\Configuration\Registry;
1717
use PHPUnit\TextUI\TestRunner as BaseRunner;
18+
use PHPUnit\TextUI\XmlConfiguration\Configuration;
19+
use PHPUnit\TextUI\XmlConfiguration\Loader;
1820
use Symfony\Bridge\PhpUnit\SymfonyTestsListener;
1921

2022
/**
@@ -43,9 +45,13 @@ protected function createRunner(): BaseRunner
4345

4446
if (isset($this->arguments['configuration'])) {
4547
$configuration = $this->arguments['configuration'];
46-
if (!$configuration instanceof Configuration) {
48+
49+
if (!class_exists(Configuration::class) && !$configuration instanceof LegacyConfiguration) {
4750
$configuration = Registry::getInstance()->get($this->arguments['configuration']);
51+
} elseif (class_exists(Configuration::class) && !$configuration instanceof Configuration) {
52+
$configuration = (new Loader())->load($this->arguments['configuration']);
4853
}
54+
4955
foreach ($configuration->listeners() as $registeredListener) {
5056
if ('Symfony\Bridge\PhpUnit\SymfonyTestsListener' === ltrim($registeredListener->className(), '\\')) {
5157
$registeredLocally = true;

0 commit comments

Comments
 (0)