disable global test listener when not registered

xabbuh · xabbuh · commit f4cd6708b738 · 2017-03-01T20:12:35.000+01:00
The global test listener is always initialized to register the clock
mock and DNS mock as soon as possible. However, when the listener is
registered locally through the PHPUnit config, it will never be
registered as a listener. In thise case, the state of the local
listener must be reset to correctly report expected deprecation test
results.
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListener.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListener.php
@@ -27,6 +27,11 @@ public function __construct(array $mockedNamespaces = array())
         $this->trait = new SymfonyTestsListenerTrait($mockedNamespaces);
     }
 
+    public function globalListenerDisabled()
+    {
+        $this->trait->globalListenerDisabled();
+    }
+
     public function startTestSuite(\PHPUnit_Framework_TestSuite $suite)
     {
         return $this->trait->startTestSuite($suite);
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -93,6 +93,12 @@ public function __destruct()
         }
     }
 
+    public function globalListenerDisabled()
+    {
+        self::$globallyEnabled = false;
+        $this->state = -1;
+    }
+
     public function startTestSuite($suite)
     {
         if (class_exists('PHPUnit_Util_Blacklist', false)) {
diff --git a/src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php b/src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php
@@ -38,7 +38,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
`@@ -27,6 +27,11 @@ public function __construct(array $mockedNamespaces = array())`
`27`	`27`	`$this->trait = new SymfonyTestsListenerTrait($mockedNamespaces);`
`28`	`28`	`}`
`29`	`29`
	`30`	`+ public function globalListenerDisabled()`
	`31`	`+ {`
	`32`	`+ $this->trait->globalListenerDisabled();`
	`33`	`+ }`
	`34`	`+`
`30`	`35`	`public function startTestSuite(\PHPUnit_Framework_TestSuite $suite)`
`31`	`36`	`{`
`32`	`37`	`return $this->trait->startTestSuite($suite);`
Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,12 @@ public function __destruct()`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
	`96`	`+ public function globalListenerDisabled()`
	`97`	`+ {`
	`98`	`+ self::$globallyEnabled = false;`
	`99`	`+ $this->state = -1;`
	`100`	`+ }`
	`101`	`+`
`96`	`102`	`public function startTestSuite($suite)`
`97`	`103`	`{`
`98`	`104`	`if (class_exists('PHPUnit_Util_Blacklist', false)) {`