Cleanup of FileLoader

sebastianbergmann · Jan 22, 2020 · 884be43 · 884be43
1 parent 4a014c8
commit 884be43
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/src/Util/FileLoader.php b/src/Util/FileLoader.php
@@ -30,15 +30,12 @@ public static function checkAndLoad(string $filename): string
     {
         $includePathFilename = \stream_resolve_include_path($filename);
 
-        if (!$includePathFilename) {
-            throw new Exception(
-                \sprintf('Cannot open file "%s".' . "\n", $filename)
-            );
-        }
-
         $localFile = __DIR__ . \DIRECTORY_SEPARATOR . $filename;
 
-        if ($includePathFilename === $localFile || !self::isReadable($includePathFilename)) {
+        if (!$includePathFilename ||
+            $includePathFilename === $localFile ||
+            !self::isReadable($includePathFilename)
+        ) {
             throw new Exception(
                 \sprintf('Cannot open file "%s".' . "\n", $filename)
             );