Merge pull request #8 from chadicus/develop

allow date string for modifiedSince paramter
chadicus · Jul 30, 2015 · e66facb · e66facb
2 parents 072c13a + 3487085
commit e66facb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/Entities/Character.php b/src/Entities/Character.php
@@ -254,7 +254,7 @@ public static function findAll(Client $client, array $criteria = [])
     {
         $filters = [
             'name' => [['string']],
-            'modifiedSince' => [['uint']],
+            'modifiedSince' => [['date']],
             'comics' => [['ofScalars', [['uint']]], ['implode', ',']],
             'series' => [['ofScalars', [['uint']]], ['implode', ',']],
             'events' => [['ofScalars', [['uint']]], ['implode', ',']],
@@ -266,7 +266,7 @@ public static function findAll(Client $client, array $criteria = [])
 
         $modifiedSince = Arrays::get($filteredCriteria, 'modifiedSince');
         if ($modifiedSince !== null) {
-            $filteredCriteria['modifiedSince'] = date('c', $modifiedSince);
+            $filteredCriteria['modifiedSince'] = $modifiedSince->format('c');
         }
 
         return new Collection(

diff --git a/tests/Entities/CharacterTest.php b/tests/Entities/CharacterTest.php
@@ -152,9 +152,10 @@ public function findAll()
      */
     public function findAllParametersSetProperly()
     {
+        $now = new \DateTime();
         $criteria = [
             'name' => 'a name',
-            'modifiedSince' => \time(),
+            'modifiedSince' => $now->format('r'),
             'comics' => [1,2,3],
             'series' => [2,4,6],
             'events' => [1,3,5],
@@ -169,7 +170,7 @@ public function findAllParametersSetProperly()
 
         $expectedParameters = [
             'name' => 'a name',
-            'modifiedSince' => date('c', $criteria['modifiedSince']),
+            'modifiedSince' => $now->format('c'),
             'comics' => '1,2,3',
             'series' => '2,4,6',
             'events' => '1,3,5',