Fix CS/WS issues

sebastianbergmann · Oct 28, 2019 · bf0010f · bf0010f
1 parent 5f61126
commit bf0010f
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/src/Util/Filter.php b/src/Util/Filter.php
@@ -75,26 +75,23 @@ private static function shouldPrintFrame($frame, $prefix, Blacklist $blacklist):
         $fileIsNotPrefixed = $prefix === false || \strpos($file, $prefix) !== 0;
         $script            = \realpath($GLOBALS['_SERVER']['SCRIPT_NAME']);
 
-        return \is_file($file)
-            && self::fileIsBlacklisted($file, $blacklist)
-            && $fileIsNotPrefixed
-            && $file !== $script;
+        return \is_file($file) &&
+               self::fileIsBlacklisted($file, $blacklist) &&
+               $fileIsNotPrefixed &&
+               $file !== $script;
     }
 
-    private static function fileIsBlacklisted($file, Blacklist $blacklist)
+    private static function fileIsBlacklisted($file, Blacklist $blacklist): bool
     {
-        return (
-            empty($GLOBALS['__PHPUNIT_ISOLATION_BLACKLIST'])
-         || !\in_array($file, $GLOBALS['__PHPUNIT_ISOLATION_BLACKLIST'])
-        )
-        && !$blacklist->isBlacklisted($file);
+        return (empty($GLOBALS['__PHPUNIT_ISOLATION_BLACKLIST']) ||
+                !\in_array($file, $GLOBALS['__PHPUNIT_ISOLATION_BLACKLIST'], true)) &&
+               !$blacklist->isBlacklisted($file);
     }
 
     private static function frameExists(array $trace, string $file, int $line): bool
     {
         foreach ($trace as $frame) {
-            if (isset($frame['file']) && $frame['file'] === $file &&
-                isset($frame['line']) && $frame['line'] === $line) {
+            if (isset($frame['file'], $frame['line']) && $frame['file'] === $file && $frame['line'] === $line) {
                 return true;
             }
         }