Implement JsonSerializable explicitly

vrana · Jan 22, 2013 · a3cec36 · a3cec36
1 parent bd5db46
commit a3cec36
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/NotORM.php b/NotORM.php
@@ -7,6 +7,12 @@
 * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 
+if (!interface_exists('JsonSerializable')) {
+	interface JsonSerializable {
+		function jsonSerialize();
+	}
+}
+
 include_once dirname(__FILE__) . "/NotORM/Structure.php";
 include_once dirname(__FILE__) . "/NotORM/Cache.php";
 include_once dirname(__FILE__) . "/NotORM/Literal.php";

diff --git a/NotORM/Result.php b/NotORM/Result.php
@@ -2,7 +2,7 @@
 
 /** Filtered table representation
 */
-class NotORM_Result extends NotORM_Abstract implements Iterator, ArrayAccess, Countable {
+class NotORM_Result extends NotORM_Abstract implements Iterator, ArrayAccess, Countable, JsonSerializable {
 	protected $single;
 	protected $select = array(), $conditions = array(), $where = array(), $parameters = array(), $order = array(), $limit = null, $offset = null, $group = "", $having = "", $lock = null;
 	protected $union = array(), $unionOrder = array(), $unionLimit = null, $unionOffset = null;
@@ -752,7 +752,7 @@ function offsetUnset($key) {
 		unset($this->data[$key]);
 	}
 
-	// JsonSerializable implementation (not explicit as it is available only since PHP 5.4)
+	// JsonSerializable implementation
 
 	function jsonSerialize() {
 		$this->execute();

diff --git a/NotORM/Row.php b/NotORM/Row.php
@@ -2,7 +2,7 @@
 
 /** Single row representation
 */
-class NotORM_Row extends NotORM_Abstract implements IteratorAggregate, ArrayAccess, Countable {
+class NotORM_Row extends NotORM_Abstract implements IteratorAggregate, ArrayAccess, Countable, JsonSerializable {
 	private $modified = array();
 	protected $row, $result;
 
@@ -177,7 +177,7 @@ function offsetUnset($key) {
 		unset($this->modified[$key]);
 	}
 
-	// JsonSerializable implementation (not explicit as it is available only since PHP 5.4)
+	// JsonSerializable implementation
 
 	function jsonSerialize() {
 		return $this->row;