Fix merge

nicolas-grekas · nicolas-grekas · commit 380cc2c28b2e · 2017-03-02T13:29:22.000+01:00
diff --git a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php
@@ -38,6 +38,11 @@ public function __construct(array $mockedNamespaces = array())
         $this->trait = new Legacy\SymfonyTestsListenerTrait($mockedNamespaces);
     }
 
+    public function globalListenerDisabled()
+    {
+        $this->trait->globalListenerDisabled();
+    }
+
     public function startTestSuite(TestSuite $suite)
     {
         return $this->trait->startTestSuite($suite);

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,11 @@ public function __construct(array $mockedNamespaces = array())`
`38`	`38`	`$this->trait = new Legacy\SymfonyTestsListenerTrait($mockedNamespaces);`
`39`	`39`	`}`
`40`	`40`
	`41`	`+ public function globalListenerDisabled()`
	`42`	`+ {`
	`43`	`+ $this->trait->globalListenerDisabled();`
	`44`	`+ }`
	`45`	`+`
`41`	`46`	`public function startTestSuite(TestSuite $suite)`
`42`	`47`	`{`
`43`	`48`	`return $this->trait->startTestSuite($suite);`