Fix additionalProperties check (#64)

swaggest · Dec 16, 2018 · 93347a5 · 93347a5
1 parent 2d79489
commit 93347a5
Show file tree

Hide file tree

Showing 11 changed files with 428 additions and 104 deletions.
diff --git a/composer.json b/composer.json
@@ -4,6 +4,7 @@
   "type": "library",
   "require": {
     "php": ">=5.4",
+    "ext-json": "*",
     "phplang/scope-exit": "^1.0",
     "swaggest/json-diff": "^3.4.2"
   },

diff --git a/phpstan.neon b/phpstan.neon
@@ -3,3 +3,5 @@ parameters:
 		- '#PHPDoc tag @param references unknown parameter \$schema#'
 		- '#Access to an undefined property static\(Swaggest\\JsonSchema\\JsonSchema\)\|Swaggest\\JsonSchema\\Constraint\\Properties::#'
 		- '#Accessing property \$skipValidation on possibly null value of type Swaggest\\JsonSchema\\Context\|null#'
+		- '#Accessing property \$__propertyToData on possibly null value of type Swaggest\\JsonSchema\\Constraint\\Properties\|null#'
+		- '#Accessing property \$__dataToProperty on possibly null value of type Swaggest\\JsonSchema\\Constraint\\Properties\|null#'
diff --git a/src/Constraint/Properties.php b/src/Constraint/Properties.php
@@ -11,7 +11,6 @@
 
 /**
  * @method SchemaContract __get($key)
- * @method Schema[] toArray()
  */
 class Properties extends ObjectItem implements Constraint
 {
@@ -23,18 +22,84 @@ class Properties extends ObjectItem implements Constraint
     /** @var Schema */
     protected $__schema;
 
+    /**
+     * @var Schema[]
+     */
+    private $__mappedProperties;
+
+    /**
+     * @var array
+     */
+    private $__dataKeyMaps = array();
+
+    /**
+     * Data to property mapping, example ["$ref" => "ref"]
+     * @var array
+     */
+    public $__dataToProperty = array();
+
     /**
      * Property to data mapping, example ["ref" => "$ref"]
      * @var array
      */
-    public $__defaultMapping = array();
+    public $__propertyToData = array();
+
+    /**
+     * Returns a map of properties by default data name
+     * @return Schema[]
+     */
+    public function &toArray()
+    {
+        if (!isset($this->__propertyToData[Schema::DEFAULT_MAPPING])) {
+            return $this->__arrayOfData;
+        }
+        if (null === $this->__mappedProperties) {
+            $properties = array();
+            foreach ($this->__arrayOfData as $propertyName => $property) {
+                if (isset($this->__propertyToData[Schema::DEFAULT_MAPPING][$propertyName])) {
+                    $propertyName = $this->__propertyToData[Schema::DEFAULT_MAPPING][$propertyName];
+                }
+                $properties[$propertyName] = $property;
+            }
+            $this->__mappedProperties = $properties;
+        }
+        return $this->__mappedProperties;
+    }
+
+    /**
+     * @param string $mapping
+     * @return string[] a map of propertyName to dataName
+     */
+    public function getDataKeyMap($mapping = Schema::DEFAULT_MAPPING)
+    {
+        if (!isset($this->__dataKeyMaps[$mapping])) {
+            $map = array();
+            foreach ($this->__arrayOfData as $propertyName => $property) {
+                if (isset($this->__propertyToData[$mapping][$propertyName])) {
+                    $map[$propertyName] = $this->__propertyToData[$mapping][$propertyName];
+                } else {
+                    $map[$propertyName] = $propertyName;
+                }
+            }
+            $this->__dataKeyMaps[$mapping] = $map;
+        }
+
+        return $this->__dataKeyMaps[$mapping];
+    }
 
     public function lock()
     {
         $this->__isReadOnly = true;
         return $this;
     }
 
+    public function addPropertyMapping($dataName, $propertyName, $mapping = Schema::DEFAULT_MAPPING)
+    {
+        $this->__dataToProperty[$mapping][$dataName] = $propertyName;
+        $this->__propertyToData[$mapping][$propertyName] = $dataName;
+    }
+
+
     /**
      * @param string $name
      * @param mixed $column
@@ -101,7 +166,8 @@ public function isEmpty()
 
     public function jsonSerialize()
     {
-        $result = $this->__arrayOfData;
+        $result = $this->toArray();
+
         if ($this->__nestedObjects) {
             foreach ($this->__nestedObjects as $object) {
                 foreach ($object->toArray() as $key => $value) {
@@ -110,18 +176,6 @@ public function jsonSerialize()
             }
         }
 
-        if (isset($this->__defaultMapping)) {
-            $mappedResult = new \stdClass();
-            foreach ($result as $key => $value) {
-                if (isset($this->__defaultMapping[$key])) {
-                    $mappedResult->{$this->__defaultMapping[$key]} = $value;
-                } else {
-                    $mappedResult->$key = $value;
-                }
-            }
-            return $mappedResult;
-        }
-
         return (object)$result;
     }