allow Dates to be numerically sorted.

Solves #7095 by converting automatically Datetime to seconds when SORT_NUMERIC is used.
cakephp · Jul 31, 2015 · abf342f · Oxicode · Aug 1, 2015 · abf342f
1 parent 0572b6c
commit abf342f
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/src/Collection/Iterator/SortIterator.php b/src/Collection/Iterator/SortIterator.php
@@ -67,6 +67,9 @@ public function __construct($items, $callback, $dir = SORT_DESC, $type = SORT_NU
         $callback = $this->_propertyExtractor($callback);
         $results = [];
         foreach ($items as $key => $value) {
+            if ($value instanceof \DateTime && $type === SORT_NUMERIC) {
+                $value = $value->format('U');
+            }
             $results[$key] = $callback($value);
         }
 

diff --git a/tests/TestCase/Collection/Iterator/SortIteratorTest.php b/tests/TestCase/Collection/Iterator/SortIteratorTest.php
@@ -16,6 +16,7 @@
 
 use ArrayObject;
 use Cake\Collection\Iterator\SortIterator;
+use Cake\I18n\Time;
 use Cake\TestSuite\TestCase;
 
 /**
@@ -191,4 +192,36 @@ public function testSortComplexDeepPath()
         ];
         $this->assertEquals($expected, $sorted->toList());
     }
+
+    /**
+     * Tests sorting datetime
+     *
+     * @return void
+     */
+    public function testSortDateTime()
+    {
+        $items = new ArrayObject([
+            new Time('2014-07-21'),
+            new Time('2015-06-30'),
+            new Time('2013-08-12')
+        ]);
+        $identity = function ($a) {
+            return $a;
+        };
+        $sorted = new SortIterator($items, $identity);
+        $expected = [
+            new Time('2015-06-30'),
+            new Time('2014-07-21'),
+            new Time('2013-08-12')
+        ];
+        $this->assertEquals($expected, $sorted->toList());
+
+        $sorted = new SortIterator($items, $identity, SORT_ASC);
+        $expected = [
+            new Time('2013-08-12'),
+            new Time('2014-07-21'),
+            new Time('2015-06-30')
+        ];
+        $this->assertEquals($expected, $sorted->toList());
+    }
 }