Merge branch '3.4' into 4.3

* 3.4: [Validator] Add ConstraintValidator::formatValue() tests [Validator] Sync string to date behavior and throw a better exception Check phpunit configuration for listeners
symfony · Sep 3, 2019 · b592dcb · b592dcb
2 parents 9215cc5 + 37a1e99
commit b592dcb
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 6 deletions.
diff --git a/Legacy/CommandForV5.php b/Legacy/CommandForV5.php
@@ -23,8 +23,6 @@ class CommandForV5 extends \PHPUnit_TextUI_Command
      */
     protected function createRunner()
     {
-        $listener = new SymfonyTestsListenerForV5();
-
         $this->arguments['listeners'] = isset($this->arguments['listeners']) ? $this->arguments['listeners'] : array();
 
         $registeredLocally = false;
@@ -37,8 +35,21 @@ protected function createRunner()
             }
         }
 
+        if (isset($this->arguments['configuration'])) {
+            $configuration = $this->arguments['configuration'];
+            if (!$configuration instanceof \PHPUnit_Util_Configuration) {
+                $configuration = \PHPUnit_Util_Configuration::getInstance($this->arguments['configuration']);
+            }
+            foreach ($configuration->getListenerConfiguration() as $registeredListener) {
+                if ('Symfony\Bridge\PhpUnit\SymfonyTestsListener' === ltrim($registeredListener['class'], '\\')) {
+                    $registeredLocally = true;
+                    break;
+                }
+            }
+        }
+
         if (!$registeredLocally) {
-            $this->arguments['listeners'][] = $listener;
+            $this->arguments['listeners'][] = new SymfonyTestsListenerForV5();
         }
 
         return parent::createRunner();

diff --git a/Legacy/CommandForV6.php b/Legacy/CommandForV6.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\TextUI\Command as BaseCommand;
 use PHPUnit\TextUI\TestRunner as BaseRunner;
+use PHPUnit\Util\Configuration;
 use Symfony\Bridge\PhpUnit\SymfonyTestsListener;
 
 /**
@@ -27,8 +28,6 @@ class CommandForV6 extends BaseCommand
      */
     protected function createRunner(): BaseRunner
     {
-        $listener = new SymfonyTestsListener();
-
         $this->arguments['listeners'] = isset($this->arguments['listeners']) ? $this->arguments['listeners'] : [];
 
         $registeredLocally = false;
@@ -41,8 +40,21 @@ protected function createRunner(): BaseRunner
             }
         }
 
+        if (isset($this->arguments['configuration'])) {
+            $configuration = $this->arguments['configuration'];
+            if (!$configuration instanceof Configuration) {
+                $configuration = Configuration::getInstance($this->arguments['configuration']);
+            }
+            foreach ($configuration->getListenerConfiguration() as $registeredListener) {
+                if ('Symfony\Bridge\PhpUnit\SymfonyTestsListener' === ltrim($registeredListener['class'], '\\')) {
+                    $registeredLocally = true;
+                    break;
+                }
+            }
+        }
+
         if (!$registeredLocally) {
-            $this->arguments['listeners'][] = $listener;
+            $this->arguments['listeners'][] = new SymfonyTestsListener();
         }
 
         return parent::createRunner();