From ffd0047030271b67ad73f241f3ae171b83b24289 Mon Sep 17 00:00:00 2001 From: Massimiliano Arione Date: Thu, 23 Apr 2020 14:29:09 +0200 Subject: [PATCH] remove if --- .../PhpUnit/Legacy/SymfonyTestsListenerTrait.php | 11 ++++------- src/Symfony/Bridge/PhpUnit/bin/simple-phpunit | 14 ++++++-------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php index 290c53cfee9d7..beffc4c290d6e 100644 --- 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 index 90d6ac51834eb..edd38441242a7 100755 --- 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();