Merge pull request #7686 from kenjis/fix-view-cells-same-short-name

fix: [ViewCells] when there are cells with the same short name, only the first cell is loaded

system/View/Cell.php

@@ -178,7 +178,8 @@ protected function determineClass(string $library): array
         }
 
         // locate and return an instance of the cell
-        $object = Factories::cells($class);
+        // @TODO extend Factories to be able to load classes with the same short name.
+        $object = class_exists($class) ? new $class() : Factories::cells($class);
 
         if (! is_object($object)) {
             throw ViewException::forInvalidCellClass($class);

tests/_support/View/OtherCells/SampleClass.php

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <[email protected]>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\View\OtherCells;
+
+/**
+ * Two classes with the same short name.
+ *
+ * - Tests\Support\View\SampleClass
+ * - Tests\Support\View\OtherCells\SampleClass
+ */
+class SampleClass
+{
+    public function hello()
+    {
+        return 'Good-bye!';
+    }
+}

tests/system/View/CellTest.php

@@ -113,6 +113,17 @@ public function testDisplayRendersWithNamespacedClass()
         $this->assertSame($expected, $this->cell->render('\Tests\Support\View\SampleClass::hello'));
     }
 
+    public function testDisplayRendersTwoCellsWithSameShortName()
+    {
+        $output = $this->cell->render('\Tests\Support\View\SampleClass::hello');
+
+        $this->assertSame('Hello', $output);
+
+        $output = $this->cell->render('\Tests\Support\View\OtherCells\SampleClass::hello');
+
+        $this->assertSame('Good-bye!', $output);
+    }
+
     public function testDisplayRendersWithValidParamString()
     {
         $params   = 'one=two,three=four';