bug #21834 [PhpUnitBridge] fix merge (xabbuh)

nicolas-grekas · nicolas-grekas · commit 75dffd1cbd14 · 2017-03-02T13:59:20.000+01:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [PhpUnitBridge] fix merge | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 39c936c [PhpUnitBridge] fix merge
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/TestRunner.php b/src/Symfony/Bridge/PhpUnit/Legacy/TestRunner.php
@@ -29,7 +29,17 @@ protected function handleConfiguration(array &$arguments)
 
         $arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : array();
 
-        if (!array_filter($arguments['listeners'], function ($listener) { return $listener instanceof SymfonyTestsListener; })) {
+        $registeredLocally = false;
+
+        foreach ($arguments['listeners'] as $registeredListener) {
+            if ($registeredListener instanceof SymfonyTestsListener) {
+                $registeredListener->globalListenerDisabled();
+                $registeredLocally = true;
+                break;
+            }
+        }
+
+        if (!$registeredLocally) {
             $arguments['listeners'][] = $listener;
         }
 
