fix blacklist

symfony · Apr 24, 2020 · 36213a5 · 36213a5
1 parent 0ecae1e
commit 36213a5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -46,11 +46,12 @@ class SymfonyTestsListenerTrait
     public function __construct(array $mockedNamespaces = array())
     {
         if (class_exists('PHPUnit_Util_Blacklist')) {
-            \PHPUnit_Util_Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait'] = 2;
+            \PHPUnit_Util_Blacklist::$blacklistedClassNames[__CLASS__] = 2;
         } elseif (method_exists(Blacklist::class, 'addDirectory')) {
-            Blacklist::addDirectory('\Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait');
+            (new BlackList())->getBlacklistedDirectories();
+            Blacklist::addDirectory(\dirname(\dirname((new \ReflectionClass(__CLASS__))->getFileName())));
         } else {
-            Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait'] = 2;
+            Blacklist::$blacklistedClassNames[__CLASS__] = 2;
         }
 
         $warn = false;

diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -127,8 +127,9 @@ if (class_exists('PHPUnit_Util_Blacklist')) {
     PHPUnit_Util_Blacklist::$blacklistedClassNames['SymfonyBlacklistPhpunit'] = 1;
     PHPUnit_Util_Blacklist::$blacklistedClassNames['SymfonyBlacklistSimplePhpunit'] = 1;
 } elseif (method_exists('PHPUnit\Util\Blacklist', 'addDirectory')) {
-    PHPUnit\Util\Blacklist::addDirectory('SymfonyBlacklistPhpunit');
-    PHPUnit\Util\Blacklist::addDirectory('SymfonyBlacklistSimplePhpunit');
+    (new PHPUnit\Util\BlackList())->getBlacklistedDirectories();
+    PHPUnit\Util\Blacklist::addDirectory(\dirname(\dirname((new \ReflectionClass('SymfonyBlacklistPhpunit'))->getFileName())));
+    PHPUnit\Util\Blacklist::addDirectory(\dirname(\dirname((new \ReflectionClass('SymfonyBlacklistSimplePhpunit'))->getFileName())));
 } else {
     PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyBlacklistPhpunit'] = 1;
     PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyBlacklistSimplePhpunit'] = 1;