Use more user-friendly format Y-m-d instead of Y-n-j

zendframework · Aug 15, 2012 · 056a5ba · 056a5ba
1 parent eb27880
commit 056a5ba
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/library/Zend/Form/Element/DateSelect.php b/library/Zend/Form/Element/DateSelect.php
@@ -195,7 +195,7 @@ public function prepareElement(Form $form)
     protected function getValidator()
     {
         if (null === $this->validator) {
-            $this->validator = new DateValidator(array('format' => 'Y-n-j'));
+            $this->validator = new DateValidator(array('format' => 'Y-m-d'));
         }
 
         return $this->validator;

diff --git a/library/Zend/Form/View/Helper/FormDateSelect.php b/library/Zend/Form/View/Helper/FormDateSelect.php
@@ -214,12 +214,16 @@ public function getLocale()
      */
     public function getDaysOptions($pattern)
     {
-        $formatter  = new IntlDateFormatter($this->getLocale(), null, null, null, null, $pattern);
+        $keyFormatter   = new IntlDateFormatter($this->getLocale(), null, null, null, null, 'dd');
-        $date       = new DateTime('1970-01-01');
+        $valueFormatter = new IntlDateFormatter($this->getLocale(), null, null, null, null, $pattern);
+        $date           = new DateTime('1970-01-01');
 
         $result = array();
         for ($day = 1; $day <= 31; $day++) {
-            $result[$day] = $formatter->format($date);
+            $key   = $keyFormatter->format($date);
+            $value = $valueFormatter->format($date);
+            $result[$key] = $value;
+
             $date->modify('+1 day');
         }
 
@@ -234,12 +238,16 @@ public function getDaysOptions($pattern)
      */
     public function getMonthsOptions($pattern)
     {
-        $formatter  = new IntlDateFormatter($this->getLocale(), null, null, null, null, $pattern);
+        $keyFormatter   = new IntlDateFormatter($this->getLocale(), null, null, null, null, 'MM');
-        $date       = new DateTime('1970-01-01');
+        $valueFormatter = new IntlDateFormatter($this->getLocale(), null, null, null, null, $pattern);
+        $date           = new DateTime('1970-01-01');
 
         $result = array();
         for ($month = 1; $month <= 12; $month++) {
-            $result[$month] = $formatter->format($date);
+            $key   = $keyFormatter->format($date);
+            $value = $valueFormatter->format($date);
+            $result[$key] = $value;
+
             $date->modify('+1 month');
         }
 

diff --git a/library/Zend/Validator/Regex.php b/library/Zend/Validator/Regex.php
@@ -118,7 +118,7 @@ public function isValid($value)
             $this->error(self::INVALID);
             return false;
         }
-var_dump($value);
+
         $this->setValue($value);
 
         $status = @preg_match($this->pattern, $value);