Merge pull request #1 from enobrev/fix-patternProperties_as_properties

Converts schema of patternProperties using the convertProperties method
BenMorel · Dec 10, 2020 · d94d7f2 · d94d7f2
2 parents c38bad1 + 9eef1e7
commit d94d7f2
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 0 deletions.
diff --git a/src/Converter/SchemaConverter.php b/src/Converter/SchemaConverter.php
@@ -86,6 +86,10 @@ private static function convertSchema(object $schema, Options $options) : object
 
         if (isset($schema->{'x-patternProperties'}) && is_object($schema->{'x-patternProperties'}) && $options->supportPatternProperties) {
             $schema = self::convertPatternProperties($schema, $options->patternPropertiesHandler);
+
+            if (isset($schema->patternProperties) && is_object($schema->patternProperties)) {
+                $schema->patternProperties = self::convertProperties($schema->patternProperties, $options);
+            }
         }
 
         foreach ($notSupported as $prop) {

diff --git a/tests/PatternPropertiesTest.php b/tests/PatternPropertiesTest.php
@@ -522,4 +522,39 @@ public function testAdditionalPropertiesNotModifiedIfSetToTrue() : void
 
         self::assertEquals($expected, $result);
     }
+
+    public function testHandlingPatternPropertiesWithNullableTypes() : void
+    {
+        $schema = json_decode(<<<'JSON'
+            {
+                "type": "object",
+                "x-patternProperties": {
+                    "^[a-z]*$": {
+                        "type": "string",
+                        "nullable": true
+                    }
+                }
+            }
+JSON
+        );
+
+        $expected = json_decode(<<<'JSON'
+            {
+                "$schema": "http://json-schema.org/draft-04/schema#",
+                "type": "object",
+                "patternProperties": {
+                    "^[a-z]*$": {
+                        "type": ["string", "null"]
+                    }
+                }
+            }
+JSON
+        );
+
+        $result = Convert::openapiSchemaToJsonSchema($schema, [
+            'supportPatternProperties' => true
+        ]);
+
+        self::assertEquals($expected, $result);
+    }
 }