Updating buildFromArray()

Garethp · Jul 22, 2015 · 75d71dc · 75d71dc
1 parent 3edd1e7
commit 75d71dc
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/API/Type.php b/src/API/Type.php
@@ -85,11 +85,19 @@ public function castToExchange($value, $type)
 
     public static function buildFromArray($array)
     {
+        if (!is_array($array)) {
+            return $array;
+        }
+
         if (!self::arrayIsAssoc($array)) {
+            foreach ($array as $key => $value) {
+                $array[$key] = self::buildFromArray($value);
+            }
+
             return $array;
         }
 
-        $object = new self();
+        $object = new static();
         foreach ($array as $key => $value) {
             if (is_array($value)) {
                 $value = self::buildFromArray($value);