Merge pull request #32 from UseMuffin/query-jsonserialize

Make Query instance JSON serializable.

Author: ADmad

src/Query.php

@@ -8,10 +8,11 @@
 use Cake\Datasource\QueryTrait;
 use Cake\Utility\Hash;
 use IteratorAggregate;
+use JsonSerializable;
 use Muffin\Webservice\Model\Endpoint;
 use Muffin\Webservice\Webservice\WebserviceInterface;
 
-class Query implements QueryInterface, IteratorAggregate
+class Query implements IteratorAggregate, JsonSerializable, QueryInterface
 {
 
     use QueryTrait;
@@ -520,4 +521,16 @@ public function __debugInfo()
             'webservice' => $this->webservice()
         ];
     }
+
+    /**
+     * Executes the query and converts the result set into JSON.
+     *
+     * Part of JsonSerializable interface.
+     *
+     * @return \Cake\Datasource\ResultSetInterface The data to convert to JSON.
+     */
+    public function jsonSerialize()
+    {
+        return $this->all();
+    }
 }

tests/TestCase/QueryTest.php

@@ -212,6 +212,17 @@ public function testDebugInfo()
         ], $this->query->__debugInfo());
     }
 
+    public function testJsonSerialize()
+    {
+        $expected = [
+            ['id' => 1, 'title' => 'Hello World'],
+            ['id' => 2, 'title' => 'New ORM'],
+            ['id' => 3, 'title' => 'Webservices']
+        ];
+
+        $this->assertEquals(json_encode($expected), json_encode($this->query));
+    }
+
     /**
      * @inheritDoc
      */