Merge pull request #54 from wollanup/develop

fix sort
wollanup · Dec 4, 2017 · 64ba636 · 64ba636
2 parents 4e69821 + 70c9d2a
commit 64ba636
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/Service/Request/QueryModifier/Modifier/SortModifier.php b/src/Service/Request/QueryModifier/Modifier/SortModifier.php
@@ -40,7 +40,7 @@ public function setModifierFromRequest(ServerRequestInterface $request)
         }
 
         # Handle non JSON string, this is what we need !
-        if (null === json_decode($modifiers)) {
+        if (is_string($modifiers) && null === json_decode($modifiers)) {
             $sorters = explode(',', $modifiers);
             foreach ($sorters as $sorter) {
                 $direction = Criteria::ASC;

diff --git a/tests/Service/Request/QueryModifier/Modifier/SortModifierTest.php b/tests/Service/Request/QueryModifier/Modifier/SortModifierTest.php
@@ -82,6 +82,25 @@ public function testApplyMulti()
         $this->assertEquals('modifier_test.column2 ASC', $mc->getOrderByColumns()[1]);
     }
 
+    public function testSetModifierFromRequest()
+    {
+        $r = new Request(["sort" => ["property" => "name"], "foo" => "bar"]);
+        $m = new SortModifier($r);
+        $m->setModifierFromRequest($r);
+        $this->assertSame(["property" => "name"], $m->getModifier('name'));
+
+        $r = new Request(["sort" => "-name", "foo" => "bar"]);
+        $m = new SortModifier($r);
+        $m->setModifierFromRequest($r);
+        $this->assertSame(["property" => "name", "direction" => "DESC"], $m->getModifier('name'));
+
+        $r = new Request(["sort" => "-name,foo"]);
+        $m = new SortModifier($r);
+        $m->setModifierFromRequest($r);
+        $this->assertSame(["property" => "name", "direction" => "DESC"], $m->getModifier('name'));
+        $this->assertSame(["property" => "foo", "direction" => "ASC"], $m->getModifier('foo'));
+    }
+
     public function testApplyOnInexistentField()
     {
         $m  = new SortModifier(new Request(["sort" => json_encode(["property" => "notFound"])]));