Merge branch 'hotfix/4133'

Close #4133 Fixes #4103
zendframework · Apr 3, 2013 · 0f7346e · 0f7346e
2 parents ac9c3f9 + 1c527fb
commit 0f7346e
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 6 deletions.
diff --git a/library/Zend/Form/View/Helper/FormDateTimeSelect.php b/library/Zend/Form/View/Helper/FormDateTimeSelect.php
@@ -51,8 +51,9 @@ public function render(ElementInterface $element)
             ));
         }
 
+        $shouldRenderDelimiters = $element->shouldRenderDelimiters();
         $selectHelper = $this->getSelectElementHelper();
-        $pattern      = $this->parsePattern($element->shouldRenderDelimiters());
+        $pattern      = $this->parsePattern($shouldRenderDelimiters);
 
         $daysOptions   = $this->getDaysOptions($pattern['day']);
         $monthsOptions = $this->getMonthsOptions($pattern['month']);
@@ -78,16 +79,19 @@ public function render(ElementInterface $element)
         }
 
         $data = array();
-        $data[$pattern['day']]   = $selectHelper->render($dayElement);
-        $data[$pattern['month']] = $selectHelper->render($monthElement);
-        $data[$pattern['year']]  = $selectHelper->render($yearElement);
-        $data[$pattern['hour']]  = $selectHelper->render($hourElement);
-        $data[$pattern['minute']]  = $selectHelper->render($minuteElement);
+        $data[$pattern['day']]    = $selectHelper->render($dayElement);
+        $data[$pattern['month']]  = $selectHelper->render($monthElement);
+        $data[$pattern['year']]   = $selectHelper->render($yearElement);
+        $data[$pattern['hour']]   = $selectHelper->render($hourElement);
+        $data[$pattern['minute']] = $selectHelper->render($minuteElement);
 
         if ($element->shouldShowSeconds()) {
             $data[$pattern['second']]  = $selectHelper->render($secondElement);
         } else {
             unset($pattern['second']);
+            if ($shouldRenderDelimiters) {
+                unset($pattern[4]);
+            }
         }
 
         $markup = '';
@@ -99,6 +103,7 @@ public function render(ElementInterface $element)
                 $markup .= $data[$value];
             }
         }
+        $markup = trim($markup);
 
         return $markup;
     }
@@ -200,6 +205,9 @@ protected function parsePattern($renderDelimiters = true)
                 $result['minute'] = $value;
             } elseif (stripos($value, "'") === false && strpos($value, 's') !== false) {
                 $result['second'] = $value;
+            } elseif (stripos($value, "'") === false && stripos($value, 'a') !== false) {
+                // ignore ante/post meridiem marker
+                continue;
             } elseif ($renderDelimiters) {
                 $result[] = str_replace("'", '', $value);
             }

diff --git a/tests/ZendTest/Form/View/Helper/FormDateTimeSelectTest.php b/tests/ZendTest/Form/View/Helper/FormDateTimeSelectTest.php
@@ -110,4 +110,25 @@ public function testInvokeWithNoElementChainsHelper()
     {
         $this->assertSame($this->helper, $this->helper->__invoke());
     }
+
+    public function testNoMinutesDelimiterIfSecondsNotShown()
+    {
+        $element  = new DateTimeSelect('foo');
+        $element->setValue(array(
+            'year'   => '2012',
+            'month'  => '09',
+            'day'    => '24',
+            'hour'   => '03',
+            'minute' => '04',
+            'second' => '59',
+        ));
+
+        $element->setShouldShowSeconds(false);
+        $element->shouldRenderDelimiters(true);
+        $markup  = $this->helper->__invoke($element);
+
+        // the last $markup char should be the '>' of the minutes  html select
+        // closing tag and not the delimiter
+        $this->assertEquals('>', substr($markup, -1));
+    }
 }