Merge pull request #6 from swaggest/faster-maps

#4 object to array and back

Author: vearutop

src/Schema.php

@@ -96,6 +96,7 @@ class Schema extends MagicMap
     public $oneOf;
 
     public $objectItemClass;
+    private $useObjectAsArray = false;
 
     public function import($data, DataPreProcessor $preProcessor = null)
     {
@@ -112,6 +113,10 @@ private function process($data, $import = true, DataPreProcessor $preProcessor =
         if (!$import && $data instanceof ObjectItem) {
             $data = $data->jsonSerialize();
         }
+        if (!$import && is_array($data) && $this->useObjectAsArray) {
+            $data = (object)$data;
+        }
+
         if (null !== $preProcessor) {
             $data = $preProcessor->process($data, $this, $import);
         }
@@ -254,8 +259,6 @@ private function process($data, $import = true, DataPreProcessor $preProcessor =
                     }
                 }
             }
-
-
         }
 
         if ($data instanceof \stdClass) {
@@ -267,16 +270,21 @@ private function process($data, $import = true, DataPreProcessor $preProcessor =
                 }
             }
 
-            if ($import && !$result instanceof ObjectItem) {
-                $result = $this->makeObjectItem();
 
-                if ($result instanceof ClassStructure) {
-                    if ($result->__validateOnSet) {
-                        $result->__validateOnSet = false;
-                        /** @noinspection PhpUnusedLocalVariableInspection */
-                        $validateOnSetHandler = new ScopeExit(function () use ($result) {
-                            $result->__validateOnSet = true;
-                        });
+            if ($import) {
+                if ($this->useObjectAsArray) {
+                    $result = array();
+                } elseif (!$result instanceof ObjectItem) {
+                    $result = $this->makeObjectItem();
+
+                    if ($result instanceof ClassStructure) {
+                        if ($result->__validateOnSet) {
+                            $result->__validateOnSet = false;
+                            /** @noinspection PhpUnusedLocalVariableInspection */
+                            $validateOnSetHandler = new ScopeExit(function () use ($result) {
+                                $result->__validateOnSet = true;
+                            });
+                        }
                     }
                 }
             }
@@ -344,7 +352,7 @@ private function process($data, $import = true, DataPreProcessor $preProcessor =
                     }
 
                     $value = $this->additionalProperties->process($value, $import, $preProcessor, $path . '->additionalProperties');
-                    if ($import) {
+                    if ($import && !$this->useObjectAsArray) {
                         $result->addAdditionalPropertyName($key);
                     }
                 }
@@ -357,7 +365,11 @@ private function process($data, $import = true, DataPreProcessor $preProcessor =
                         $result->$key = $value;
                     }
                 } else {
-                    $result->$key = $value;
+                    if ($this->useObjectAsArray && $import) {
+                        $result[$key] = $value;
+                    } else {
+                        $result->$key = $value;
+                    }
                 }
 
             }
@@ -418,6 +430,16 @@ private function process($data, $import = true, DataPreProcessor $preProcessor =
         return $result;
     }
 
+    /**
+     * @param boolean $useObjectAsArray
+     * @return Schema
+     */
+    public function setUseObjectAsArray($useObjectAsArray)
+    {
+        $this->useObjectAsArray = $useObjectAsArray;
+        return $this;
+    }
+
     /**
      * @param bool|Schema $additionalProperties
      * @return Schema

tests/src/PHPUnit/Schema/ObjectStructure.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Swaggest\JsonSchema\Tests\PHPUnit\Schema;
+
+
+use Swaggest\JsonSchema\Schema;
+
+class ObjectStructure extends \PHPUnit_Framework_TestCase
+{
+
+    public function testObjectAsArray()
+    {
+        $schema = new Schema();
+        $schema->setUseObjectAsArray(true);
+
+        $data = json_decode('{"one":1,"two":2,"three":3}');
+
+        $imported = $schema->import($data);
+        $this->assertSame(array("one" => 1, "two" => 2, "three" => 3), $imported);
+        $exported = $schema->export($imported);
+        $this->assertTrue($exported instanceof \stdClass, '\stdClass expected on export');
+        $this->assertSame(array("one" => 1, "two" => 2, "three" => 3), (array)$exported);
+    }
+
+}