Merge remote-tracking branch 'adamlundrigan/hotfiz/ZF-12070'

zendframework · Feb 25, 2012 · dd490e0 · dd490e0
2 parents bf56dde + 00fc5c4
commit dd490e0
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 4 deletions.
diff --git a/src/Writer/Deleted.php b/src/Writer/Deleted.php
@@ -131,7 +131,7 @@ public function setWhen($date = null)
         $zdate = null;
         if ($date === null) {
             $zdate = new Date\Date;
-        } elseif (ctype_digit($date) && strlen($date) == 10) {
+        } elseif (ctype_digit($date)) {
             $zdate = new Date\Date($date, Date\Date::TIMESTAMP);
         } elseif ($date instanceof Date\Date) {
             $zdate = $date;

diff --git a/src/Writer/Entry.php b/src/Writer/Entry.php
@@ -197,7 +197,7 @@ public function setDateCreated($date = null)
         $zdate = null;
         if ($date === null) {
             $zdate = new Date\Date;
-        } elseif (ctype_digit($date) && strlen($date) == 10) {
+        } elseif (ctype_digit($date)) {
             $zdate = new Date\Date($date, Date\Date::TIMESTAMP);
         } elseif ($date instanceof Date\Date) {
             $zdate = $date;
@@ -217,7 +217,7 @@ public function setDateModified($date = null)
         $zdate = null;
         if ($date === null) {
             $zdate = new Date\Date;
-        } elseif (ctype_digit($date) && strlen($date) == 10) {
+        } elseif (ctype_digit($date)) {
             $zdate = new Date\Date($date, Date\Date::TIMESTAMP);
         } elseif ($date instanceof Date\Date) {
             $zdate = $date;

diff --git a/test/Writer/DeletedTest.php b/test/Writer/DeletedTest.php
@@ -76,7 +76,18 @@ public function testSetWhenUsesGivenUnixTimestamp()
         $myDate = new Date\Date('1234567890', Date\Date::TIMESTAMP);
         $this->assertTrue($myDate->equals($entry->getWhen()));
     }
-
+
+    /**
+     * @group ZF-12070
+     */
+    public function testSetWhenUsesGivenUnixTimestampWhenItIsLessThanTenDigits()
+    {
+        $entry = new Writer\Deleted;
+        $entry->setWhen(123456789);
+        $myDate = new Date\Date('123456789', Date\Date::TIMESTAMP);
+        $this->assertTrue($myDate->equals($entry->getWhen()));
+    }
+
     public function testSetWhenUsesZendDateObject()
     {
         $entry = new Writer\Deleted;

diff --git a/test/Writer/EntryTest.php b/test/Writer/EntryTest.php
@@ -266,6 +266,17 @@ public function testSetDateCreatedUsesGivenUnixTimestamp()
         $this->assertTrue($myDate->equals($entry->getDateCreated()));
     }
 
+    /**
+     * @group ZF-12070
+     */
+    public function testSetDateCreatedUsesGivenUnixTimestampWhenItIsLessThanTenDigits()
+    {
+        $entry = new Writer\Entry;
+        $entry->setDateCreated(123456789);
+        $myDate = new Date\Date('123456789', Date\Date::TIMESTAMP);
+        $this->assertTrue($myDate->equals($entry->getDateCreated()));
+    }
+
     public function testSetDateCreatedUsesZendDateObject()
     {
         $entry = new Writer\Entry;
@@ -290,6 +301,17 @@ public function testSetDateModifiedUsesGivenUnixTimestamp()
         $this->assertTrue($myDate->equals($entry->getDateModified()));
     }
 
+    /**
+     * @group ZF-12070
+     */
+    public function testSetDateModifiedUsesGivenUnixTimestampWhenItIsLessThanTenDigits()
+    {
+        $entry = new Writer\Entry;
+        $entry->setDateModified(123456789);
+        $myDate = new Date\Date('123456789', Date\Date::TIMESTAMP);
+        $this->assertTrue($myDate->equals($entry->getDateModified()));
+    }
+
     public function testSetDateModifiedUsesZendDateObject()
     {
         $entry = new Writer\Entry;