Adds OAS 3.0 support, fixes #3

src/BaseSchema.php

@@ -24,6 +24,10 @@ abstract class BaseSchema implements \IteratorAggregate, \Countable, \JsonSerial
      */
     protected static $additional_properties = [];
 
+    /**
+     * @param array $data
+     * @throws \Exception
+     */
     public function __construct($data = [])
     {
         $this->parseData($data);
@@ -110,8 +114,11 @@ private function validateProperty($property_name, $value)
             if (empty(static::$properties[$property_name])) {
                 return true;
             }
-            foreach (static::$properties[$property_name] as $allowed_class) {
-                $fq_class = self::getFQCN($allowed_class);
+            foreach (static::$properties[$property_name] as $allowed_type) {
+                if (gettype($value) === $allowed_type) {
+                    return true;
+                }
+                $fq_class = self::getFQCN($allowed_type);
                 if ($value instanceof $fq_class) {
                     return true;
                 }
@@ -124,8 +131,11 @@ private function validateProperty($property_name, $value)
             if (empty(static::$additional_properties)) {
                 return true;
             }
-            foreach (static::$additional_properties as $allowed_class) {
-                $fq_class = self::getFQCN($allowed_class);
+            foreach (static::$additional_properties as $allowed_type) {
+                if (gettype($value) === $allowed_type) {
+                    return true;
+                }
+                $fq_class = self::getFQCN($allowed_type);
                 if ($value instanceof $fq_class) {
                     return true;
                 }
@@ -145,8 +155,11 @@ private function validateProperty($property_name, $value)
                 if (!isset($types[0])) {
                     return true;
                 }
-                foreach ($types as $allowed_class) {
-                    $fq_class = self::getFQCN($allowed_class);
+                foreach ($types as $allowed_type) {
+                    if (gettype($value) === $allowed_type) {
+                        return true;
+                    }
+                    $fq_class = self::getFQCN($allowed_type);
                     if ($value instanceof $fq_class) {
                         return true;
                     }
@@ -160,6 +173,7 @@ private function validateProperty($property_name, $value)
      * Parse a schema object into the correct objects
      *
      * @param $data
+     * @throws \Exception
      */
     private function parseData($data)
     {
@@ -193,6 +207,7 @@ private function parseData($data)
      * @param $types_to_try
      * @param $object
      * @return BaseSchema
+     * @throws \Exception
      */
     private static function tryToCast($types_to_try, $object)
     {
@@ -225,6 +240,7 @@ protected static function getFQCN($relative_class)
     /**
      * @param array $data
      * @return static
+     * @throws \Exception
      */
     public static function create($data = [])
     {

src/Definitions/AnysOrExpressions.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Calcinai\Strut\Definitions;
+
+use Calcinai\Strut\BaseSchema;
+
+class AnysOrExpressions extends BaseSchema
+{
+    /**
+     * Array to store schema data and default values
+     * @var array
+     */
+    protected $data = [];
+
+    /**
+     * Any enums that exist on this object
+     * @var array
+     */
+    protected static $enums = [];
+
+    /**
+     * Properties and types
+     * @var array
+     */
+    protected static $properties = [];
+
+    /**
+     * Allowed additional properties
+     * @var array
+     */
+    protected static $additional_properties = ['mixed', 'Definitions\\Expression'];
+
+    /**
+     * Array to store any allowed pattern properties
+     * @var array
+     */
+    protected static $pattern_properties = [];
+
+}

src/Definitions/Callback.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace Calcinai\Strut\Definitions;
+
+use Calcinai\Strut\BaseSchema;
+/**
+ * A map of possible out-of band callbacks related to the parent operation. Each value in the map is a Path Item Object that describes a set of requests that may be initiated by the API provider and the expected responses. The key value used to identify the callback object is an expression, evaluated at runtime, that identifies a URL to use for the callback operation.
+ */
+
+class Callback extends BaseSchema
+{
+    /**
+     * Array to store schema data and default values
+     * @var array
+     */
+    protected $data = [];
+
+    /**
+     * Any enums that exist on this object
+     * @var array
+     */
+    protected static $enums = [];
+
+    /**
+     * Properties and types
+     * @var array
+     */
+    protected static $properties = [];
+
+    /**
+     * Allowed additional properties
+     * @var array
+     */
+    protected static $additional_properties = false;
+
+    /**
+     * Array to store any allowed pattern properties
+     * @var array
+     */
+    protected static $pattern_properties = ['^' => ['Definitions\\PathItem'], '^x-' => ['null', 'integer', 'boolean', 'string', 'object', 'array']];
+
+}

src/Definitions/CallbacksOrReferences.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Calcinai\Strut\Definitions;
+
+use Calcinai\Strut\BaseSchema;
+
+class CallbacksOrReferences extends BaseSchema
+{
+    /**
+     * Array to store schema data and default values
+     * @var array
+     */
+    protected $data = [];
+
+    /**
+     * Any enums that exist on this object
+     * @var array
+     */
+    protected static $enums = [];
+
+    /**
+     * Properties and types
+     * @var array
+     */
+    protected static $properties = [];
+
+    /**
+     * Allowed additional properties
+     * @var array
+     */
+    protected static $additional_properties = ['Definitions\\Callback', 'Definitions\\Reference'];
+
+    /**
+     * Array to store any allowed pattern properties
+     * @var array
+     */
+    protected static $pattern_properties = [];
+
+}