Separated IJsonObject and IJsonMap interfaces

lord-executor · Jun 13, 2016 · 2136e23 · 2136e23
1 parent e8b9c9e
commit 2136e23
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/IJsonMap.php b/IJsonMap.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Lar\JsonApi;
+
+
+interface IJsonMap extends IJsonObject
+{
+	public function mapField($key, $extractorFn);
+	public function selectFields($names);
+}
diff --git a/IJsonObject.php b/IJsonObject.php
@@ -5,7 +5,5 @@
 
 interface IJsonObject
 {
-	public function mapField($key, $extractorFn);
-	public function selectFields($names);
 	public function toArray();
 }
diff --git a/JsonFieldCollection.php b/JsonFieldCollection.php
@@ -5,7 +5,7 @@
 use Exception;
 
 
-class JsonFieldCollection implements IJsonObject
+class JsonFieldCollection implements IJsonMap
 {
 	private $map = [];
 

diff --git a/JsonListCollection.php b/JsonListCollection.php
@@ -5,7 +5,7 @@
 use Exception;
 
 
-class JsonListCollection implements IJsonObject
+class JsonListCollection implements IJsonMap
 {
 	private $list;
 
@@ -18,7 +18,7 @@ public function mapField($key, $extractorFn)
 	{
 		foreach ($this->list as $value)
 		{
-			if ($value instanceof IJsonObject) {
+			if ($value instanceof IJsonMap) {
 				$value->mapField($key, $extractorFn);
 			}
 		}
@@ -30,7 +30,7 @@ public function selectFields($names)
 	{
 		foreach ($this->list as $value)
 		{
-			if ($value instanceof IJsonObject)
+			if ($value instanceof IJsonMap)
 			{
 				$value->selectFields($names);
 			}

diff --git a/jsonapi.php b/jsonapi.php
@@ -4,6 +4,7 @@
 require_once(__DIR__ . '/StaticField.php');
 require_once(__DIR__ . '/PageField.php');
 require_once(__DIR__ . '/IJsonObject.php');
+require_once(__DIR__ . '/IJsonMap.php');
 require_once(__DIR__ . '/JsonListCollection.php');
 require_once(__DIR__ . '/JsonFieldCollection.php');
 require_once(__DIR__ . '/JsonApiAuth.php');