Merge pull request #6681 from michalsn/fix/view-extra-data-for-controlled-cells

fix: support for assigning extra data for the view() method in controlled cells

Author: kenjis

system/View/Cells/Cell.php

@@ -65,10 +65,11 @@ public function setView(string $view)
      * current scope and captures the output buffer instead of
      * relying on the view service.
      */
-    final protected function view(?string $view): string
+    final protected function view(?string $view, array $data = []): string
     {
         $properties = $this->getPublicProperties();
         $properties = $this->includeComputedProperties($properties);
+        $properties = array_merge($properties, $data);
 
         // If no view is specified, we'll try to guess it based on the class name.
         if (empty($view)) {

tests/_support/View/Cells/RenderedExtraDataNotice.php

@@ -0,0 +1,24 @@
+<?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\Cells;
+
+use CodeIgniter\View\Cells\Cell;
+
+class RenderedExtraDataNotice extends Cell
+{
+    public string $message = '4, 8, 15, 16, 23, 42';
+
+    public function render(): string
+    {
+        return $this->view('notice', ['message' => '42, 23, 16, 15, 8, 4']);
+    }
+}

tests/system/View/ControlledCellTest.php

@@ -18,6 +18,7 @@
 use Tests\Support\View\Cells\GreetingCell;
 use Tests\Support\View\Cells\ListerCell;
 use Tests\Support\View\Cells\MultiplierCell;
+use Tests\Support\View\Cells\RenderedExtraDataNotice;
 use Tests\Support\View\Cells\RenderedNotice;
 use Tests\Support\View\Cells\SimpleNotice;
 
@@ -47,6 +48,13 @@ public function testCellThroughRenderMethod()
         $this->assertStringContainsString('4, 8, 15, 16, 23, 42', $result);
     }
 
+    public function testCellThroughRenderMethodWithExtraData()
+    {
+        $result = view_cell(RenderedExtraDataNotice::class);
+
+        $this->assertStringContainsString('42, 23, 16, 15, 8, 4', $result);
+    }
+
     public function testCellWithParameters()
     {
         $result = view_cell(GreetingCell::class, 'greeting=Hi, name=CodeIgniter');