Merge pull request #9354 from samsonasik/fix-namespaced-helper

fix: handle namespaced helper found on Common helper
codeigniter4 · Dec 30, 2024 · 4cd4918 · 4cd4918
2 parents c0c3e02 + f551dbd
commit 4cd4918
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/system/Common.php b/system/Common.php
@@ -598,7 +598,7 @@ function helper($filenames): void
             if (str_contains($filename, '\\')) {
                 $path = $loader->locateFile($filename, 'Helpers');
 
-                if ($path !== '') {
+                if ($path === false) {
                     throw FileNotFoundException::forFileNotFound($filename);
                 }
 

diff --git a/tests/system/CommonHelperTest.php b/tests/system/CommonHelperTest.php
@@ -13,7 +13,9 @@
 
 namespace CodeIgniter;
 
+use CodeIgniter\Autoloader\Autoloader;
 use CodeIgniter\Autoloader\FileLocator;
+use CodeIgniter\Files\Exceptions\FileNotFoundException;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Services;
 use PHPUnit\Framework\Attributes\CoversFunction;
@@ -148,4 +150,33 @@ function foo_bar_baz(): string
 
         $this->assertSame($this->dummyHelpers[0], foo_bar_baz());
     }
+
+    public function testNamespacedHelperNotFound(): void
+    {
+        $this->expectException(FileNotFoundException::class);
+
+        $locator = $this->getMockLocator();
+        Services::injectMock('locator', $locator);
+
+        helper('foo\barbaz');
+    }
+
+    public function testNamespacedHelperFound(): void
+    {
+        $autoloader = new Autoloader();
+        $autoloader->addNamespace('Tests\Support\Helpers', TESTPATH . '_support/Helpers');
+        $locator = new FileLocator($autoloader);
+
+        Services::injectMock('locator', $locator);
+
+        $found = true;
+
+        try {
+            helper('Tests\Support\Helpers\baguette');
+        } catch (FileNotFoundException) {
+            $found = false;
+        }
+
+        $this->assertTrue($found);
+    }
 }