Merge pull request #8216 from colethorsen/feature/fix-file-locator

fix issue where running FileLocator::getClassname() on a directory would cause a PHP error
codeigniter4 · Nov 19, 2023 · 0344aa6 · 0344aa6
2 parents 14b7679 + 3ba7ef6
commit 0344aa6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
@@ -119,6 +119,10 @@ public function locateFile(string $file, ?string $folder = null, string $ext = '
      */
     public function getClassname(string $file): string
     {
+        if (is_dir($file)) {
+            return '';
+        }
+
         $php       = file_get_contents($file);
         $tokens    = token_get_all($php);
         $dlm       = false;

diff --git a/tests/system/Autoloader/FileLocatorTest.php b/tests/system/Autoloader/FileLocatorTest.php
@@ -312,4 +312,12 @@ public function testGetClassNameFromNonClassFile(): void
             $this->locator->getClassname(SYSTEMPATH . 'bootstrap.php')
         );
     }
+
+    public function testGetClassNameFromDirectory(): void
+    {
+        $this->assertSame(
+            '',
+            $this->locator->getClassname(SYSTEMPATH)
+        );
+    }
 }