Ability to use JSON::toArray with non-entity objects.

GregaMohorko · Sep 29, 2018 · 18f40f1 · 18f40f1
1 parent 9009e70
commit 18f40f1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/src/BlueDB.php b/src/BlueDB.php
@@ -19,7 +19,7 @@
  * 
  * Bootstrap file for BlueDB library.
  * 
- * Version 1.2.3.1
+ * Version 1.2.4.0
  * 
  * @project BlueDB
  * @author Grega Mohorko <[email protected]>

diff --git a/src/Entity/FieldEntity.php b/src/Entity/FieldEntity.php
@@ -111,12 +111,16 @@ public static function toArrayList($entities,$fieldsToIgnore=null,$includeHidden
 	private static function toArrayListInternal($entities,$fieldsToIgnore,$includeHiddenFields,&$session)
 	{
 		$elements=[];
-		foreach($entities as $entityKey => $entity){
-			if(is_array($entity)){
-				$elements[$entityKey]=self::toArrayListInternal($entity, $fieldsToIgnore, $includeHiddenFields, $session);
+		foreach($entities as $key => $value){
+			if(is_array($value)){
+				$elements[$key]=self::toArrayListInternal($value, $fieldsToIgnore, $includeHiddenFields, $session);
 			}else{
-				/* @var $entity FieldEntity */
-				$elements[$entityKey]=$entity->toArrayInternal($fieldsToIgnore,$includeHiddenFields, $session);
+				if(is_a($value, FieldEntity::class)){
+					/* @var $value FieldEntity */
+					$elements[$key]=$value->toArrayInternal($fieldsToIgnore,$includeHiddenFields, $session);
+				}else{
+					$elements[$key]=$value;
+				}
 			}
 		}
 

diff --git a/src/Entity/SubEntity.php b/src/Entity/SubEntity.php
@@ -37,10 +37,7 @@ public function getID()
 	{
 		$baseStrongEntity=$this->getBaseStrongEntity();
 		if($baseStrongEntity===null){
-			echo "<pre>";
-			var_dump($this);
-			echo "</pre>";
-			throw new \Exception("WTF");
+			throw new \Exception("Trying to get ID of a sub entity without parent.");
 		}
 		return $baseStrongEntity->ID;
 	}