From de71a12f3bc4d7f3f13289f172776fee8bde0f52 Mon Sep 17 00:00:00 2001 From: Gennadi Janzen Date: Thu, 25 Jun 2020 21:17:33 +0200 Subject: [PATCH] Fix: compatibility with phpunit 9.3 --- src/Symfony/Bridge/PhpUnit/Legacy/CommandForV9.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/CommandForV9.php b/src/Symfony/Bridge/PhpUnit/Legacy/CommandForV9.php index aa48ca5f24..2511380257 100644 --- a/src/Symfony/Bridge/PhpUnit/Legacy/CommandForV9.php +++ b/src/Symfony/Bridge/PhpUnit/Legacy/CommandForV9.php @@ -12,9 +12,11 @@ namespace Symfony\Bridge\PhpUnit\Legacy; use PHPUnit\TextUI\Command as BaseCommand; -use PHPUnit\TextUI\Configuration\Configuration; +use PHPUnit\TextUI\Configuration\Configuration as LegacyConfiguration; use PHPUnit\TextUI\Configuration\Registry; use PHPUnit\TextUI\TestRunner as BaseRunner; +use PHPUnit\TextUI\XmlConfiguration\Configuration; +use PHPUnit\TextUI\XmlConfiguration\Loader; use Symfony\Bridge\PhpUnit\SymfonyTestsListener; /** @@ -43,9 +45,13 @@ class CommandForV9 extends BaseCommand if (isset($this->arguments['configuration'])) { $configuration = $this->arguments['configuration']; - if (!$configuration instanceof Configuration) { + + if (!class_exists(Configuration::class) && !$configuration instanceof LegacyConfiguration) { $configuration = Registry::getInstance()->get($this->arguments['configuration']); + } elseif (class_exists(Configuration::class) && !$configuration instanceof Configuration) { + $configuration = (new Loader())->load($this->arguments['configuration']); } + foreach ($configuration->listeners() as $registeredListener) { if ('Symfony\Bridge\PhpUnit\SymfonyTestsListener' === ltrim($registeredListener->className(), '\\')) { $registeredLocally = true;