Merge pull request #79 from StayOneDegree/array-to-object-recursion

Helper::convertAssocArrayToObject(): Fix recursion for nested arrays, add tests

Author: sorinsarca

src/Helper.php

@@ -147,8 +147,8 @@ public static function isIndexedArray(array $array): bool
 
     /**
      * Converts assoc-arrays to objects (recursive)
-     * @param $schema
-     * @return mixed
+     * @param scalar|\stdClass|array $schema
+     * @return scalar|\stdClass|array
      */
     public static function convertAssocArrayToObject($schema)
     {
@@ -161,7 +161,7 @@ public static function convertAssocArrayToObject($schema)
         $data = [];
 
         foreach ($schema as $key => $value) {
-            $data[$key] = is_array($value) || is_object($value) ? self::convertAssocArrayToObject($schema) : $value;
+            $data[$key] = is_array($value) || is_object($value) ? self::convertAssocArrayToObject($value) : $value;
         }
 
         return $keepArray ? $data : (object) $data;
@@ -348,4 +348,4 @@ public static function toJSON($data)
 
         return (object) $map;
     }
-}
+}

tests/HelperTest.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Opis\JsonSchema\Test;
+
+use Opis\JsonSchema\Helper;
+use PHPUnit\Framework\TestCase;
+
+class HelperTest extends TestCase
+{
+    public function testConvertAssocArrayToObject()
+    {
+        $object = Helper::convertAssocArrayToObject(['a' => ['b' => ['c' => 'd']]]);
+        $this->assertSame('d', $object->a->b->c);
+    }
+
+    public function testConvertAssocArrayWithObjectToObject()
+    {
+        $object = Helper::convertAssocArrayToObject(['a' => (object) ['b' => ['c' => 'd']]]);
+        $this->assertSame('d', $object->a->b->c);
+    }
+
+    public function testConvertAssocArrayWithIndexedArrayToObject()
+    {
+        $object = Helper::convertAssocArrayToObject(['a' => ['b', ['c' => 'd']]]);
+        $this->assertSame('b', $object->a[0]);
+        $this->assertSame('d', $object->a[1]->c);
+    }
+
+      public function testConvertAssocArrayToObjectWithScalar()
+    {
+        $this->assertNull(Helper::convertAssocArrayToObject(null));
+        $this->assertSame(2, Helper::convertAssocArrayToObject(2));
+        $this->assertSame('foo', Helper::convertAssocArrayToObject('foo'));
+        $this->assertSame(true, Helper::convertAssocArrayToObject(true));
+    }
+}