Merge pull request #268 from laminas/3.19.x-merge-up-into-3.20.x_uOrr…

…wkar Merge release 3.19.2 into 3.20.x
laminas · Feb 19, 2024 · 075c888 · 075c888
2 parents e809c61 + f2ae01f
commit 075c888
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 15 deletions.
diff --git a/src/View/Helper/AbstractFormDateSelect.php b/src/View/Helper/AbstractFormDateSelect.php
@@ -9,7 +9,6 @@
 use Laminas\Form\Exception;
 use Locale;
 
-use function assert;
 use function extension_loaded;
 use function method_exists;
 use function preg_split;
@@ -224,12 +223,13 @@ protected function getSelectElementHelper(): FormSelect
             return $this->selectHelper;
         }
 
-        if (method_exists($this->view, 'plugin')) {
-            $selectHelper = $this->view->plugin('formselect');
-            assert($selectHelper instanceof FormSelect);
-            $this->selectHelper = $selectHelper;
+        if (null !== $this->view && method_exists($this->view, 'plugin')) {
+            $this->selectHelper = $this->view->plugin('formselect');
+        }
+
+        if (null === $this->selectHelper) {
+            $this->selectHelper = new FormSelect();
         }
-        assert(null !== $this->selectHelper);
 
         return $this->selectHelper;
     }

diff --git a/src/View/Helper/FormMultiCheckbox.php b/src/View/Helper/FormMultiCheckbox.php
@@ -393,11 +393,11 @@ protected function getInputHelper(): FormInput
             return $this->inputHelper;
         }
 
-        if (method_exists($this->view, 'plugin')) {
+        if (null !== $this->view && method_exists($this->view, 'plugin')) {
             $this->inputHelper = $this->view->plugin('form_input');
         }
 
-        if (! $this->inputHelper instanceof FormInput) {
+        if (null === $this->inputHelper) {
             $this->inputHelper = new FormInput();
         }
 

diff --git a/src/View/Helper/FormSelect.php b/src/View/Helper/FormSelect.php
@@ -297,14 +297,16 @@ protected function renderHiddenElement(SelectElement $element): string
 
     protected function getFormHiddenHelper(): FormHidden
     {
-        if (! $this->formHiddenHelper) {
-            if (method_exists($this->view, 'plugin')) {
-                $this->formHiddenHelper = $this->view->plugin('formhidden');
-            }
+        if (null !== $this->formHiddenHelper) {
+            return $this->formHiddenHelper;
+        }
 
-            if (! $this->formHiddenHelper instanceof FormHidden) {
-                $this->formHiddenHelper = new FormHidden();
-            }
+        if (null !== $this->view && method_exists($this->view, 'plugin')) {
+            $this->formHiddenHelper = $this->view->plugin('formhidden');
+        }
+
+        if (null === $this->formHiddenHelper) {
+            $this->formHiddenHelper = new FormHidden();
         }
 
         return $this->formHiddenHelper;

diff --git a/test/View/Helper/FormDateSelectTest.php b/test/View/Helper/FormDateSelectTest.php
@@ -44,6 +44,16 @@ public function testGeneratesThreeSelectsWithElement(): void
         self::assertStringContainsString('<select name="year"', $markup);
     }
 
+    public function testGeneratesWithoutRenderer(): void
+    {
+        $element = new DateSelect('foo');
+        $helper  = new FormDateSelectHelper();
+        $markup  = $helper->render($element);
+        self::assertStringContainsString('<select name="day"', $markup);
+        self::assertStringContainsString('<select name="month"', $markup);
+        self::assertStringContainsString('<select name="year"', $markup);
+    }
+
     public function testCanGenerateSelectsWithEmptyOption(): void
     {
         $element = new DateSelect('foo');

diff --git a/test/View/Helper/FormSelectTest.php b/test/View/Helper/FormSelectTest.php
@@ -395,6 +395,16 @@ public function testHiddenElementWhenAttributeMultipleIsSet(): void
         self::assertStringContainsString('<input type="hidden" name="foo" value="empty"><select', $markup);
     }
 
+    public function testHiddenElementWhenNoRenderer(): void
+    {
+        $element = new SelectElement('foo');
+        $element->setUseHiddenElement(true);
+        $element->setUnselectedValue('empty');
+        $helper = new FormSelectHelper();
+        $markup = $helper->render($element);
+        self::assertStringContainsString('<input type="hidden" name="foo" value="empty"><select', $markup);
+    }
+
     public function testRenderInputNotSelectElementRaisesException(): void
     {
         $element = new Element\Text('foo');