Updated models to contain parsed enums

calcinai · Nov 29, 2016 · 4eb54ad · 4eb54ad
1 parent bb17cd8
commit 4eb54ad
Show file tree

Hide file tree

Showing 39 changed files with 759 additions and 510 deletions.
diff --git a/src/BaseSchema.php b/src/BaseSchema.php
@@ -10,6 +10,8 @@ abstract class BaseSchema implements \JsonSerializable
 {
     protected $data;
 
+    protected static $enums = [];
+
     protected static $properties = [];
 
     protected static $pattern_properties = [];
@@ -53,17 +55,32 @@ public function set($property_name, $value)
     public function add($property_name, $value)
     {
         $this->validateProperty($property_name, $value);
-        $this->data[$property_name][] = $value;
+        $this->data[$property_name][] =& $value;
         return $this;
     }
 
+    /**
+     * Property getter
+     *
+     * @param $property_name
+     * @return $this
+     */
+    public function get($property_name)
+    {
+        return $this->data[$property_name];
+    }
+
     /**
      * @param $property_name
      * @param $value
      * @return bool
      */
     private function validateProperty($property_name, $value)
     {
+        //First check enums
+        if (isset(static::$enums[$property_name]) && !in_array($value, static::$enums[$property_name])) {
+            throw new \InvalidArgumentException(sprintf('Value for %s is not specified in the enum', $property_name));
+        }
         //Test regular properties
         if (isset(static::$properties[$property_name])) {
             //There's no way to constrain it at this point
@@ -154,7 +171,11 @@ private function parseData($data)
                 }
             }
             //At this point we've done our best to cast, just leave as-is.
-            $this->data[$property_name] = $property;
+            if (is_scalar($property)) {
+                $this->set($property_name, $property);
+            } else {
+                $this->data[$property_name] = $property;
+            }
         }
     }
 

diff --git a/src/Definitions/ApiKeySecurity.php b/src/Definitions/ApiKeySecurity.php
@@ -12,6 +12,12 @@ class ApiKeySecurity extends BaseSchema
      */
     protected $data = ['type' => 'apiKey'];
 
+    /**
+     * Any enums that exist on this object
+     * @var array
+     */
+    protected static $enums = ['type' => ['apiKey'], 'in' => ['header', 'query']];
+
     /**
      * Properties and types
      * @var array
@@ -36,7 +42,7 @@ class ApiKeySecurity extends BaseSchema
      */
     public function setType($type)
     {
-        $this->data['type'] = $type;
+        $this->set('type', $type);
         return $this;
     }
 
@@ -45,7 +51,7 @@ public function setType($type)
      */
     public function getType()
     {
-        return $this->data['type'];
+        return $this->get('type');
     }
 
     /**
@@ -54,7 +60,7 @@ public function getType()
      */
     public function setName($name)
     {
-        $this->data['name'] = $name;
+        $this->set('name', $name);
         return $this;
     }
 
@@ -63,7 +69,7 @@ public function setName($name)
      */
     public function getName()
     {
-        return $this->data['name'];
+        return $this->get('name');
     }
 
     /**
@@ -72,7 +78,7 @@ public function getName()
      */
     public function setIn($in)
     {
-        $this->data['in'] = $in;
+        $this->set('in', $in);
         return $this;
     }
 
@@ -81,7 +87,7 @@ public function setIn($in)
      */
     public function getIn()
     {
-        return $this->data['in'];
+        return $this->get('in');
     }
 
     /**
@@ -90,7 +96,7 @@ public function getIn()
      */
     public function setDescription($description)
     {
-        $this->data['description'] = $description;
+        $this->set('description', $description);
         return $this;
     }
 
@@ -99,7 +105,7 @@ public function setDescription($description)
      */
     public function getDescription()
     {
-        return $this->data['description'];
+        return $this->get('description');
     }
 
 }
diff --git a/src/Definitions/BasicAuthenticationSecurity.php b/src/Definitions/BasicAuthenticationSecurity.php
@@ -12,6 +12,12 @@ class BasicAuthenticationSecurity extends BaseSchema
      */
     protected $data = ['type' => 'basic'];
 
+    /**
+     * Any enums that exist on this object
+     * @var array
+     */
+    protected static $enums = ['type' => ['basic']];
+
     /**
      * Properties and types
      * @var array
@@ -36,7 +42,7 @@ class BasicAuthenticationSecurity extends BaseSchema
      */
     public function setType($type)
     {
-        $this->data['type'] = $type;
+        $this->set('type', $type);
         return $this;
     }
 
@@ -45,7 +51,7 @@ public function setType($type)
      */
     public function getType()
     {
-        return $this->data['type'];
+        return $this->get('type');
     }
 
     /**
@@ -54,7 +60,7 @@ public function getType()
      */
     public function setDescription($description)
     {
-        $this->data['description'] = $description;
+        $this->set('description', $description);
         return $this;
     }
 
@@ -63,7 +69,7 @@ public function setDescription($description)
      */
     public function getDescription()
     {
-        return $this->data['description'];
+        return $this->get('description');
     }
 
 }
diff --git a/src/Definitions/BodyParameter.php b/src/Definitions/BodyParameter.php
@@ -12,6 +12,12 @@ class BodyParameter extends BaseSchema
      */
     protected $data = ['in' => 'body'];
 
+    /**
+     * Any enums that exist on this object
+     * @var array
+     */
+    protected static $enums = ['in' => ['body']];
+
     /**
      * Properties and types
      * @var array
@@ -37,7 +43,7 @@ class BodyParameter extends BaseSchema
      */
     public function setDescription($description)
     {
-        $this->data['description'] = $description;
+        $this->set('description', $description);
         return $this;
     }
 
@@ -47,7 +53,7 @@ public function setDescription($description)
      */
     public function getDescription()
     {
-        return $this->data['description'];
+        return $this->get('description');
     }
 
     /**
@@ -57,7 +63,7 @@ public function getDescription()
      */
     public function setName($name)
     {
-        $this->data['name'] = $name;
+        $this->set('name', $name);
         return $this;
     }
 
@@ -67,7 +73,7 @@ public function setName($name)
      */
     public function getName()
     {
-        return $this->data['name'];
+        return $this->get('name');
     }
 
     /**
@@ -77,7 +83,7 @@ public function getName()
      */
     public function setIn($in)
     {
-        $this->data['in'] = $in;
+        $this->set('in', $in);
         return $this;
     }
 
@@ -87,7 +93,7 @@ public function setIn($in)
      */
     public function getIn()
     {
-        return $this->data['in'];
+        return $this->get('in');
     }
 
     /**
@@ -97,7 +103,7 @@ public function getIn()
      */
     public function setRequired($required)
     {
-        $this->data['required'] = $required;
+        $this->set('required', $required);
         return $this;
     }
 
@@ -107,7 +113,7 @@ public function setRequired($required)
      */
     public function getRequired()
     {
-        return $this->data['required'];
+        return $this->get('required');
     }
 
     /**
@@ -117,7 +123,7 @@ public function getRequired()
      */
     public function setSchema(Schema $schema)
     {
-        $this->data['schema'] = $schema;
+        $this->set('schema', $schema);
         return $this;
     }
 
@@ -127,7 +133,7 @@ public function setSchema(Schema $schema)
      */
     public function getSchema()
     {
-        return $this->data['schema'];
+        return $this->get('schema');
     }
 
 }
diff --git a/src/Definitions/Contact.php b/src/Definitions/Contact.php
@@ -15,6 +15,12 @@ class Contact extends BaseSchema
      */
     protected $data = [];
 
+    /**
+     * Any enums that exist on this object
+     * @var array
+     */
+    protected static $enums = [];
+
     /**
      * Properties and types
      * @var array
@@ -40,7 +46,7 @@ class Contact extends BaseSchema
      */
     public function setName($name)
     {
-        $this->data['name'] = $name;
+        $this->set('name', $name);
         return $this;
     }
 
@@ -50,7 +56,7 @@ public function setName($name)
      */
     public function getName()
     {
-        return $this->data['name'];
+        return $this->get('name');
     }
 
     /**
@@ -60,7 +66,7 @@ public function getName()
      */
     public function setUrl($url)
     {
-        $this->data['url'] = $url;
+        $this->set('url', $url);
         return $this;
     }
 
@@ -70,7 +76,7 @@ public function setUrl($url)
      */
     public function getUrl()
     {
-        return $this->data['url'];
+        return $this->get('url');
     }
 
     /**
@@ -80,7 +86,7 @@ public function getUrl()
      */
     public function setEmail($email)
     {
-        $this->data['email'] = $email;
+        $this->set('email', $email);
         return $this;
     }
 
@@ -90,7 +96,7 @@ public function setEmail($email)
      */
     public function getEmail()
     {
-        return $this->data['email'];
+        return $this->get('email');
     }
 
 }
diff --git a/src/Definitions/Definitions.php b/src/Definitions/Definitions.php
@@ -15,6 +15,12 @@ class Definitions extends BaseSchema
      */
     protected $data = [];
 
+    /**
+     * Any enums that exist on this object
+     * @var array
+     */
+    protected static $enums = [];
+
     /**
      * Properties and types
      * @var array

diff --git a/src/Definitions/Examples.php b/src/Definitions/Examples.php
@@ -12,6 +12,12 @@ class Examples extends BaseSchema
      */
     protected $data = [];
 
+    /**
+     * Any enums that exist on this object
+     * @var array
+     */
+    protected static $enums = [];
+
     /**
      * Properties and types
      * @var array