Fix laminas#3

Signed-off-by: Eric Richer [email protected] <[email protected]>

src/PHPUnit/Controller/AbstractControllerTestCase.php

@@ -817,11 +817,15 @@ public function assertNotTemplateName($templateName)
      */
     protected function searchTemplates($viewModel, $templateName)
     {
+        $found = false;
         if ($viewModel->getTemplate($templateName) === $templateName) {
             return true;
         }
         foreach ($viewModel->getChildren() as $child) {
-            return $this->searchTemplates($child, $templateName);
+            $found = $this->searchTemplates($child, $templateName);
+            if ($found) {
+                return $found;
+            }
         }
 
         return false;

test/PHPUnit/Controller/TemplateNameTest.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LaminasTest\Test\PHPUnit\Controller;
+
+use LaminasTest\Test\PHPUnit\Controller\AbstractHttpControllerTestCaseTest;
+
+class TemplateNameTest extends AbstractHttpControllerTestCaseTest
+{
+    public function setUp(): void
+    {
+        $this->setApplicationConfig(
+            include __DIR__ . '/../../_files/application.config.php'
+        );
+        parent::setUp();
+    }
+
+    /**
+     * Test case for a controller returning a view with 2 children
+     * View hierarchy:
+     *   layout/layout -> baz/index/childview -> child1
+     *                                        -> child2
+     */
+    public function testAssertTemplateWithMultipleChildren(): void
+    {
+        $this->dispatch('/childview');
+
+        // Check that the rendered content
+        $this->assertQueryContentContains('p', 'Parent');
+        $this->assertQueryContentContains('p', 'Child 1');
+        $this->assertQueryContentContains('p', 'Child 2');
+
+        $this->assertTemplateName('layout/layout');
+        $this->assertTemplateName('baz/index/childview');
+        $this->assertTemplateName('child1');
+        $this->assertTemplateName('child2');
+        $this->assertNotTemplateName('foo');
+    }
+}

test/_files/Baz/config/module.config.php

@@ -108,6 +108,16 @@
                     ],
                 ],
             ],
+            'childview'                => [
+                'type'    => 'literal',
+                'options' => [
+                    'route'    => '/childview',
+                    'defaults' => [
+                        'controller' => 'baz_index',
+                        'action'     => 'childview',
+                    ],
+                ],
+            ],
         ],
     ],
     'controllers'  => [
@@ -117,8 +127,10 @@
     ],
     'view_manager' => [
         'template_map'        => [
-            '404'   => __DIR__ . '/../view/baz/error/404.phtml',
-            'error' => __DIR__ . '/../view/baz/error/error.phtml',
+            '404'    => __DIR__ . '/../view/baz/error/404.phtml',
+            'error'  => __DIR__ . '/../view/baz/error/error.phtml',
+            'child1' => __DIR__ . '/../view/baz/index/child1.phtml',
+            'child2' => __DIR__ . '/../view/baz/index/child2.phtml',
         ],
         'template_path_stack' => [
             __DIR__ . '/../view',

test/_files/Baz/src/Baz/Controller/IndexController.php

@@ -6,6 +6,7 @@
 
 use Laminas\Http\Response;
 use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
 use RuntimeException;
 
 class IndexController extends AbstractActionController
@@ -61,4 +62,16 @@ public function customResponseAction()
     public function registerxpathnamespaceAction()
     {
     }
+
+    public function childViewAction(): ViewModel
+    {
+        $child1 = new ViewModel();
+        $child1->setTemplate('child1');
+        $child2 = new ViewModel();
+        $child2->setTemplate('child2');
+        $view = new ViewModel();
+        $view->addChild($child1, 'child1');
+        $view->addChild($child2, 'child2');
+        return $view;
+    }
 }

test/_files/Baz/view/baz/index/child1.phtml

@@ -0,0 +1 @@
+<p>Child 1</p>

test/_files/Baz/view/baz/index/child2.phtml

@@ -0,0 +1 @@
+<p>Child 2</p>

test/_files/Baz/view/baz/index/childview.phtml

@@ -0,0 +1,3 @@
+<p>Parent</p>
+<?php echo $this->child1; ?>
+<?php echo $this->child2; ?>