bug #37418 [PhpUnitBridge] Fix compatibility with phpunit 9.3 (Gennadi Janzen)

nicolas-grekas · nicolas-grekas · commit 9709500d29be · 2020-06-28T17:12:52.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [PhpUnitBridge] Fix compatibility with phpunit 9.3 | Q | A | ------------- | --- | Branch? | master for features / 4.4  | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | -  | License | MIT | Doc PR | - In PHPUnit 9.3 some Classes were moved or renamed, to make the PhpunitBridge compatible with PhpUnit 9.3 it necessary to call the new Loader instead of the Registry.  Commits ------- de71a12 Fix: compatibility with phpunit 9.3
diff --git 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 @@ protected function createRunner(): BaseRunner
 
         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;
