Merge branch '2.8' into 3.2

fabpot · fabpot · commit b45e99f7ccf5 · 2017-03-01T17:46:11.000-08:00
* 2.8:
  disable global test listener when not registered
diff --git a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php
@@ -79,6 +79,12 @@ public function __destruct()
         }
     }
 
+    public function globalListenerDisabled()
+    {
+        self::$globallyEnabled = false;
+        $this->state = -1;
+    }
+
     public function startTestSuite(\PHPUnit_Framework_TestSuite $suite)
     {
         $suiteName = $suite->getName();
diff --git a/src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php b/src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php
@@ -33,7 +33,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;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,12 @@ public function __destruct()`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
	`82`	`+ public function globalListenerDisabled()`
	`83`	`+ {`
	`84`	`+ self::$globallyEnabled = false;`
	`85`	`+ $this->state = -1;`
	`86`	`+ }`
	`87`	`+`
`82`	`88`	`public function startTestSuite(\PHPUnit_Framework_TestSuite $suite)`
`83`	`89`	`{`
`84`	`90`	`$suiteName = $suite->getName();`