remove if

symfony · Apr 23, 2020 · ffd0047 · ffd0047
1 parent 3ad44bf
commit ffd0047
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -47,13 +47,10 @@ public function __construct(array $mockedNamespaces = array())
     {
         if (class_exists('PHPUnit_Util_Blacklist')) {
             \PHPUnit_Util_Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait'] = 2;
-        } elseif (class_exists(Blacklist::class)) {
-            $className = '\Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait';
-            if (method_exists(Blacklist::class, 'addDirectory')) {
-                Blacklist::addDirectory($className);
-            } else {
-                Blacklist::$blacklistedClassNames[$className] = 2;
-            }
+        } elseif (method_exists(Blacklist::class, 'addDirectory')) {
+            Blacklist::addDirectory('\Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait');
+        } else {
+            Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait'] = 2;
         }
 
         $warn = false;

diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -126,14 +126,12 @@ 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(\PHPUnit\Util\Blacklist::class)) {
-    if (method_exists(\PHPUnit\Util\Blacklist::class, 'addDirectory')) {
-        \PHPUnit\Util\Blacklist::addDirectory('SymfonyBlacklistPhpunit');
-        \PHPUnit\Util\Blacklist::addDirectory('SymfonyBlacklistSimplePhpunit');
-    } else {
-        \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');
+} else {
+    PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyBlacklistPhpunit'] = 1;
+    PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyBlacklistSimplePhpunit'] = 1;
 }
 
 Symfony\Bridge\PhpUnit\TextUI\Command::main();