Merge pull request #5 from swaggest/properties-accessor

Properties accessor

Author: vearutop

src/Constraint/Properties.php

@@ -44,7 +44,7 @@ public function setAdditionalProperties(Schema $additionalProperties = null)
     }
 
 
-    /** @var Egg[] */
+    /** @var Egg[][] */
     private $nestedProperties = array();
 
     /** @var Schema[] */
@@ -57,7 +57,7 @@ protected function addNested(Schema $nested, $name)
         }
         $this->nestedPropertyNames[$name] = $name;
         foreach ($nested->properties->toArray() as $propertyName => $property) {
-            $this->nestedProperties[$propertyName] = new Egg($nested, $name, $property);
+            $this->nestedProperties[$propertyName][] = new Egg($nested, $name, $property);
         }
         return $this;
     }

src/MagicMap.php

@@ -56,37 +56,4 @@ public function jsonSerialize()
     {
         return (object)$this->__arrayOfData;
     }
-
-    private $__propertyToDataMap;
-    public function setPropertyToDataMap($map)
-    {
-        $this->__propertyToDataMap = $map;
-        return $this;
-    }
-
-    public function getPropertyToDataMap()
-    {
-        return $this->__propertyToDataMap;
-    }
-
-    private $__dataToPropertyMap;
-
-    /**
-     * @return mixed
-     */
-    public function getDataToPropertyMap()
-    {
-        return $this->__dataToPropertyMap;
-    }
-
-    /**
-     * @param mixed $_dataToPropertyMap
-     * @return MagicMap
-     */
-    public function setDataToPropertyMap($_dataToPropertyMap)
-    {
-        $this->__dataToPropertyMap = $_dataToPropertyMap;
-        return $this;
-    }
-
 }

src/Schema.php

@@ -281,16 +281,9 @@ private function process($data, $import = true, DataPreProcessor $preProcessor =
                 }
             }
 
-            $propertyMap = null;
             if ($this->properties !== null) {
                 /** @var Schema[] $properties */
                 $properties = &$this->properties->toArray(); // TODO check performance of pointer
-                if ($import) {
-                    $propertyMap = $this->properties->getDataToPropertyMap(); // TODO check performance of pointer
-                } else {
-                    $propertyMap = $this->properties->getPropertyToDataMap(); // TODO check performance of pointer
-                }
-
                 $nestedProperties = $this->properties->getNestedProperties();
             }
 
@@ -317,22 +310,20 @@ private function process($data, $import = true, DataPreProcessor $preProcessor =
                     }
                 }
 
+                $propertyFound = false;
                 if (isset($properties[$key])) {
-                    if (null !== $propertyMap) {
-
-
-                    }
-
+                    $propertyFound = true;
                     $found = true;
                     $value = $properties[$key]->process($value, $import, $preProcessor, $path . '->properties:' . $key);
                 }
 
-                /** @var Egg $nestedEgg */
-                $nestedEgg = null;
-                if (!$found && isset($nestedProperties[$key])) {
+                /** @var Egg[] $nestedEggs */
+                $nestedEggs = null;
+                if (isset($nestedProperties[$key])) {
                     $found = true;
-                    $nestedEgg = $nestedProperties[$key];
-                    $value = $nestedEgg->propertySchema->process($value, $import, $preProcessor, $path . '->nestedProperties:' . $key);
+                    $nestedEggs = $nestedProperties[$key];
+                    // todo iterate all nested props?
+                    $value = $nestedEggs[0]->propertySchema->process($value, $import, $preProcessor, $path . '->nestedProperties:' . $key);
                 }
 
                 if ($this->patternProperties !== null) {
@@ -358,8 +349,13 @@ private function process($data, $import = true, DataPreProcessor $preProcessor =
                     }
                 }
 
-                if ($nestedEgg && $import) {
-                    $result->setNestedProperty($key, $value, $nestedEgg);
+                if ($nestedEggs && $import) {
+                    foreach ($nestedEggs as $nestedEgg) {
+                        $result->setNestedProperty($key, $value, $nestedEgg);
+                    }
+                    if ($propertyFound) {
+                        $result->$key = $value;
+                    }
                 } else {
                     $result->$key = $value;
                 }
@@ -422,6 +418,26 @@ private function process($data, $import = true, DataPreProcessor $preProcessor =
         return $result;
     }
 
+    /**
+     * @param bool|Schema $additionalProperties
+     * @return Schema
+     */
+    public function setAdditionalProperties($additionalProperties)
+    {
+        $this->additionalProperties = $additionalProperties;
+        return $this;
+    }
+
+    /**
+     * @param Schema|Schema[] $items
+     * @return Schema
+     */
+    public function setItems($items)
+    {
+        $this->items = $items;
+        return $this;
+    }
+
 
     private function fail(InvalidValue $exception, $path)
     {

src/Structure/ClassStructure.php

@@ -30,6 +30,14 @@ public static function schema()
         return $schema;
     }
 
+    /**
+     * @return Properties|static
+     */
+    public static function properties()
+    {
+        return static::schema()->properties;
+    }
+
     /**
      * @param $data
      * @param DataPreProcessor $preProcessor

tests/src/Helper/UserInfo.php

@@ -9,6 +9,7 @@
 
 class UserInfo extends ClassStructure
 {
+    public $id;
     public $firstName;
     public $lastName;
     public $birthDay;
@@ -19,9 +20,12 @@ class UserInfo extends ClassStructure
      */
     public static function setUpProperties($properties, Schema $ownerSchema)
     {
+        $properties->id = User::properties()->id;
         $properties->firstName = Schema::string();
         $properties->lastName = Schema::string();
         $properties->birthDay = Schema::string();
         $properties->birthDay->format = Schema::FORMAT_DATE_TIME;
+
+        $ownerSchema->required[] = self::names()->id;
     }
 }

tests/src/PHPUnit/Example/ExampleTest.php

@@ -155,6 +155,9 @@ public function testNestedStructure()
         $this->assertSame($json, json_encode($exported, JSON_PRETTY_PRINT));
 
         $imported = User::import(json_decode($json));
+        $this->assertSame(1, $imported->id);
+
+        $this->assertSame(1, $imported->info->id);
         $this->assertSame('John', $imported->info->firstName);
         $this->assertSame('Doe', $imported->info->lastName);
     }