Merge pull request #4958 from karenetheridge/v3.1-dev

v3.1 schema edits

Author: lornajane

src/schemas/validation/schema.yaml

@@ -193,7 +193,7 @@ $defs:
         additionalProperties:
           $ref: '#/$defs/path-item'
     patternProperties:
-      '^(schemas|responses|parameters|examples|requestBodies|headers|securitySchemes|links|callbacks|pathItems)$':
+      '^(?:schemas|responses|parameters|examples|requestBodies|headers|securitySchemes|links|callbacks|pathItems)$':
         $comment: Enumerating all of the property names in the regex above is necessary for unevaluatedProperties to work as expected
         propertyNames:
           pattern: '^[a-zA-Z0-9._-]+$'
@@ -341,8 +341,6 @@ $defs:
       properties:
         in:
           const: query
-      required:
-        - in
     then:
       properties:
         allowEmptyValue:
@@ -369,8 +367,6 @@ $defs:
               properties:
                 in:
                   const: path
-              required:
-                - in
             then:
               properties:
                 style:
@@ -389,8 +385,6 @@ $defs:
               properties:
                 in:
                   const: header
-              required:
-                - in
             then:
               properties:
                 style:
@@ -402,8 +396,6 @@ $defs:
               properties:
                 in:
                   const: query
-              required:
-                - in
             then:
               properties:
                 style:
@@ -422,8 +414,6 @@ $defs:
               properties:
                 in:
                   const: cookie
-              required:
-                - in
             then:
               properties:
                 style:
@@ -504,7 +494,6 @@ $defs:
         additionalProperties:
           $ref: '#/$defs/header-or-reference'
       style:
-        default: form
         enum:
           - form
           - spaceDelimited
@@ -513,8 +502,22 @@ $defs:
       explode:
         type: boolean
       allowReserved:
-        default: false
         type: boolean
+    dependentSchemas:
+      style:
+        properties:
+          allowReserved:
+            default: false
+      explode:
+        properties:
+          style:
+            default: form
+          allowReserved:
+            default: false
+      allowReserved:
+        properties:
+          style:
+            default: form
     allOf:
       - $ref: '#/$defs/specification-extensions'
       - $ref: '#/$defs/styles-for-form'
@@ -760,8 +763,6 @@ $defs:
           properties:
             type:
               const: apiKey
-          required:
-            - type
         then:
           properties:
             name:
@@ -780,8 +781,6 @@ $defs:
           properties:
             type:
               const: http
-          required:
-            - type
         then:
           properties:
             scheme:
@@ -810,8 +809,6 @@ $defs:
           properties:
             type:
               const: oauth2
-          required:
-            - type
         then:
           properties:
             flows:
@@ -824,8 +821,6 @@ $defs:
           properties:
             type:
               const: openIdConnect
-          required:
-            - type
         then:
           properties:
             openIdConnectUrl:

tests/schema/fail/example-examples.yaml

@@ -15,6 +15,3 @@ components:
       examples:
         a mammalian example:
           value: bear
-
-
-    

tests/schema/fail/invalid_schema_types.yaml

@@ -10,4 +10,3 @@ components:
     invalid_null: null
     invalid_number: 0
     invalid_array: []
-

tests/schema/pass/example-object-examples.yaml

@@ -29,7 +29,7 @@ components:
               summary: This is a text example
               externalValue: https://foo.bar/examples/address-example.txt
   parameters:
-    with-example:   
+    with-example:
       name: zipCode
       in: query
       schema:

tests/schema/pass/schema-object-deprecated-example-keyword.yaml

@@ -12,7 +12,6 @@ paths:
           # the example simple
           type: object
           # DEPRECATED: don't use example keyword inside Schema Object
-          example: {
-            "numbers": [1, 2],
-            "flag": null
-          }
+          example:
+            numbers: [1, 2]
+            flag: null

tests/schema/pass/valid_schema_types.yaml

@@ -11,4 +11,3 @@ components:
     nothing_boolean: false
     anything_object: {}
     nothing_object: { not: {} }
-

tests/schema/pass/webhook-example.yaml

@@ -32,4 +32,3 @@ components:
           type: string
         tag:
           type: string
-