Merge pull request #132 from cebe/schema-nullable

Adjust default value for Schema:: when no type is specified

Author: cebe

src/spec/Schema.php

@@ -124,6 +124,10 @@ protected function attributeDefaults(): array
             'allOf' => null,
             'oneOf' => null,
             'anyOf' => null,
+            // nullable is only relevant, when a type is specified
+            // return null as default when there is no type
+            // return false as default when there is a type
+            'nullable' => $this->hasProperty('type') ? false : null,
         ];
     }
 

tests/spec/SchemaTest.php

@@ -43,6 +43,29 @@ public function testRead()
         $this->assertFalse($schema->deprecated);
     }
 
+    public function testNullable()
+    {
+        /** @var $schema Schema */
+        $schema = Reader::readFromJson('{"type": "string"}', Schema::class);
+        $this->assertEquals(Type::STRING, $schema->type);
+        $this->assertFalse($schema->nullable);
+
+        /** @var $schema Schema */
+        $schema = Reader::readFromJson('{"type": "string", "nullable": false}', Schema::class);
+        $this->assertEquals(Type::STRING, $schema->type);
+        $this->assertFalse($schema->nullable);
+
+        /** @var $schema Schema */
+        $schema = Reader::readFromJson('{"type": "string", "nullable": true}', Schema::class);
+        $this->assertEquals(Type::STRING, $schema->type);
+        $this->assertTrue($schema->nullable);
+
+        // nullable is undefined if no type is given
+        $schema = Reader::readFromJson('{"oneOf": [{"type": "string"}, {"type": "integer"}]}', Schema::class);
+        $this->assertNull($schema->type);
+        $this->assertNull($schema->nullable);
+    }
+
     public function testReadObject()
     {
         /** @var $schema Schema */