feat: Struct::isArrayOf() now returns type of array's children

keboola · Sep 27, 2015 · 3db9e02 · 3db9e02
1 parent 54642e6
commit 3db9e02
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/Keboola/Json/Struct.php b/src/Keboola/Json/Struct.php
@@ -66,7 +66,7 @@ public function load(array $struct = [])
 				if (
 					!is_scalar($type)
 					|| (!$this->isValidType($type)
-					&& !($this->isArrayOf($type) && $this->isValidType(substr($type, 7))))
+					&& !($this->isValidType($this->isArrayOf($type))))
 				) {
 					if (!is_scalar($type)) {
 						$type = json_encode($type);
@@ -166,7 +166,7 @@ protected function upgradeToArrayCheck($oldType, $newType)
 	{
 		return $this->autoUpgradeToArray
 			&& (
-				($this->isArrayOf($oldType) && substr($oldType, 7) == $newType)
+				($this->isArrayOf($oldType) == $newType)
 				|| $newType == 'arrayOf' . $oldType
 			);
 	}
@@ -189,12 +189,11 @@ protected function upgradeToArray($oldType, $newType)
 
 	/**
 	 * @param string $type
-	 * @return bool
-	 * @todo return the type without arrayOf?
+	 * @return string type of array chuldren
 	 */
 	public function isArrayOf($type)
 	{
-		return substr($type, 0, 7) == 'arrayOf';
+		return substr($type, 0, 7) == 'arrayOf' ? substr($type, 7) : false;
 	}
 
 	/**