Merge pull request #3 from ovr/nullable-checks

Fix: Null checks must be done on nullable === false

Author: ovr

src/SwaggerWrapper.php

@@ -352,7 +352,10 @@ protected function validateScheme(Definition $scheme, JSONPath $jsonPath)
      */
     protected function validateProperty(Property $property, $value)
     {
-        if ($property->required && $value === null) {
+        // Supported inside Swagger 3+ for Property, now will be null as default
+        $nullable = true;
+
+        if ($nullable === false && $value === null) {
             throw new RuntimeException(
                 sprintf(
                     'Property %s is required and cannot be null',
@@ -365,14 +368,27 @@ protected function validateProperty(Property $property, $value)
             case 'array':
                 if ($property->required) {
                     if (gettype($value) != $property->type) {
-                        throw new RuntimeException(
-                            sprintf(
-                                'Type of the property %s must be %s instead of %s actual',
-                                $property->property,
-                                $property->type,
-                                gettype($value)
-                            )
-                        );
+                        if ($nullable) {
+                            if ($value !== null) {
+                                throw new RuntimeException(
+                                    sprintf(
+                                        'Type of the property %s must be %s|null (because nullable) instead of %s actual',
+                                        $property->property,
+                                        $property->type,
+                                        gettype($value)
+                                    )
+                                );
+                            }
+                        } else {
+                            throw new RuntimeException(
+                                sprintf(
+                                    'Type of the property %s must be %s instead of %s actual',
+                                    $property->property,
+                                    $property->type,
+                                    gettype($value)
+                                )
+                            );
+                        }
                     }
 
                     if ($property->minItems) {
@@ -407,18 +423,30 @@ protected function validateProperty(Property $property, $value)
             case 'boolean':
             case 'string':
             case 'integer':
-                if ($value !== null && gettype($value) != $property->type) {
-                    throw new RuntimeException(
-                        sprintf(
-                            'Type of the property %s must be %s instead of %s',
-                            $property->property,
-                            $property->type,
-                            gettype($value)
-                        )
-                    );
+                if (gettype($value) != $property->type) {
+                    if ($nullable) {
+                        if ($value !== null) {
+                            throw new RuntimeException(
+                                sprintf(
+                                    'Type of the property %s must be %s|null (because nullable) instead of %s',
+                                    $property->property,
+                                    $property->type,
+                                    gettype($value)
+                                )
+                            );
+                        }
+                    } else {
+                        throw new RuntimeException(
+                            sprintf(
+                                'Type of the property %s must be %s instead of %s',
+                                $property->property,
+                                $property->type,
+                                gettype($value)
+                            )
+                        );
+                    }
                 }
 
-
                 if ($value !== null) {
                     if (!$this->checkFormat($property, $value)) {
                         throw new RuntimeException(
@@ -479,15 +507,28 @@ protected function validateProperty(Property $property, $value)
                 }
                 break;
             case 'number':
-                if ($value !== null && gettype($value) != 'double') {
-                    throw new RuntimeException(
-                        sprintf(
-                            'Type of the property %s must be %s instead of %s',
-                            $property->property,
-                            $property->type,
-                            gettype($value)
-                        )
-                    );
+                if (gettype($value) != 'double') {
+                    if ($nullable) {
+                        if ($value !== null) {
+                            throw new RuntimeException(
+                                sprintf(
+                                    'Type of the property %s must be %s|null (because nullable) instead of %s',
+                                    $property->property,
+                                    $property->type,
+                                    gettype($value)
+                                )
+                            );
+                        }
+                    } else {
+                        throw new RuntimeException(
+                            sprintf(
+                                'Type of the property %s must be %s instead of %s',
+                                $property->property,
+                                $property->type,
+                                gettype($value)
+                            )
+                        );
+                    }
                 }
         }