fix simple-phpunit

garak · garak · commit 67cdd07b7178 · 2020-04-23T10:59:49.000+02:00
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -126,26 +126,16 @@ if (!class_exists('SymfonyBlacklistPhpunit', false)) {
 if (class_exists('PHPUnit_Util_Blacklist')) {
     PHPUnit_Util_Blacklist::$blacklistedClassNames['SymfonyBlacklistPhpunit'] = 1;
     PHPUnit_Util_Blacklist::$blacklistedClassNames['SymfonyBlacklistSimplePhpunit'] = 1;
-} elseif (class_exists(Blacklist::class)) {
-    if (method_exists(Blacklist::class, 'addDirectory')) {
-        Blacklist::addDirectory('SymfonyBlacklistPhpunit');
-        Blacklist::addDirectory('SymfonyBlacklistSimplePhpunit');
+} elseif (class_exists(\PHPUnit\Util\Blacklist::class)) {
+    if (method_exists(\PHPUnit\Util\Blacklist::class, 'addDirectory')) {
+        \PHPUnit\Util\Blacklist::addDirectory('SymfonyBlacklistPhpunit');
+        \PHPUnit\Util\Blacklist::addDirectory('SymfonyBlacklistSimplePhpunit');
     } else {
-        Blacklist::$blacklistedClassNames['SymfonyBlacklistPhpunit'] = 1;
-        Blacklist::$blacklistedClassNames['SymfonyBlacklistSimplePhpunit'] = 1;
+        \PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyBlacklistPhpunit'] = 1;
+        \PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyBlacklistSimplePhpunit'] = 1;
     }
 }
 
-
-
-if (class_exists('PHPUnit_Util_Blacklist')) {
-    PHPUnit_Util_Blacklist::$blacklistedClassNames['SymfonyBlacklistPhpunit'] = 1;
-    PHPUnit_Util_Blacklist::$blacklistedClassNames['SymfonyBlacklistSimplePhpunit'] = 1;
-} else {
-    PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyBlacklistPhpunit'] = 1;
-    PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyBlacklistSimplePhpunit'] = 1;
-}
-
 Symfony\Bridge\PhpUnit\TextUI\Command::main();
 
 EOPHP
