Added support OPENAPI version 3.1

Author: bixuehujin

src/TypeParser.php

@@ -29,6 +29,7 @@ class TypeParser
     const MODE_JSON_SCHEMA = 1;
     const MODE_OPEN_API = 2;
     const MODE_REF_SCHEMA = 4;
+    const MODE_OPEN_API_31 = 8;
 
     protected $mode = 0;
     protected $builtinTypes = [];
@@ -148,9 +149,7 @@ protected function parseInputField($definition)
             'in' => $fetcher,
             'schema' => $schema,
         ];
-        if ($required) {
-            $result['required'] = $required;
-        }
+        $result['required'] = $required;
         return $result;
     }
 
@@ -234,9 +233,14 @@ protected function parseEnum(string $definition)
         }
     }
 
+    protected function isVersion31()
+    {
+        return $this->mode & self::MODE_OPEN_API_31;
+    }
+
     protected function makeNullableSchema(array $schema, $nullable)
     {
-        if ($this->mode & self::MODE_OPEN_API) {
+        if (($this->mode & self::MODE_OPEN_API) && ! $this->isVersion31()) {
             // OpenAPI specficition does not support this, just ingore the nullable setting.
             return $schema;
         }
@@ -246,7 +250,7 @@ protected function makeNullableSchema(array $schema, $nullable)
         }
 
         return [
-            'anyOf' => [
+            'oneOf' => [
                 ['type' => 'null'],
                 $schema,
             ],
@@ -266,6 +270,8 @@ protected function parseScalar($definition)
 
         if (($this->mode & self::MODE_JSON_SCHEMA) && $nullable) {
             $schema['type'] = [$schema['type'], 'null'];
+        } elseif (($this->mode & self::MODE_OPEN_API) && $this->isVersion31() && $nullable) {
+            $schema['type'] = [$schema['type'], 'null'];
         } elseif (($this->mode & self::MODE_OPEN_API) && $nullable) {
             $schema['nullable'] = $nullable;
         }

tests/TypeTest.php

@@ -378,7 +378,7 @@ public function typeToArrayCases()
 
                         ],
                         'related2' => [
-                            'anyOf' => [
+                            'oneOf' => [
                                 [
                                     'type' => 'null',
                                 ],
@@ -586,11 +586,13 @@ public function typeToArrayCases()
     public function testTypeToArray($type, $expect1, $expect2)
     {
         $parser = new TypeParser(TypeParser::MODE_JSON_SCHEMA);
-        var_dump($parser->parse($type));
         $this->assertEquals($expect1, $parser->parse($type));
 
         $parser = new TypeParser(TypeParser::MODE_OPEN_API);
         $this->assertEquals($expect2 ?? $expect1, $parser->parse($type));
+
+        $parser = new TypeParser(TypeParser::MODE_OPEN_API | TypeParser::MODE_OPEN_API_31);
+        $this->assertEquals($expect1, $parser->parse($type));
     }
 
     public function typeToArrayWithRefCases()
@@ -797,7 +799,7 @@ public function dataCases()
                     'type' => 'object',
                     'properties' => [
                         'foo' => [
-                            'anyOf' => [
+                            'oneOf' => [
                                 ['type' => 'null'],
                             ],
                         ],