Add contentEncoding and contentMediaType to Schema (#1831)

Author: DerManoMann

src/Annotations/Schema.php

@@ -428,6 +428,22 @@ class Schema extends AbstractAnnotation
      */
     public $const = Generator::UNDEFINED;
 
+    /**
+     * https://spec.openapis.org/oas/v3.1.0.html#considerations-for-file-uploads
+     * https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-validation-00#rfc.section.8.3.
+     *
+     * @var string
+     */
+    public $contentEncoding = Generator::UNDEFINED;
+
+    /**
+     * https://spec.openapis.org/oas/v3.1.0.html#considerations-for-file-uploads
+     * https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-validation-00#rfc.section.8.4.
+     *
+     * @var string
+     */
+    public $contentMediaType = Generator::UNDEFINED;
+
     /**
      * @inheritdoc
      */
@@ -451,6 +467,8 @@ class Schema extends AbstractAnnotation
         'allOf' => '[' . Schema::class . ']',
         'oneOf' => '[' . Schema::class . ']',
         'anyOf' => '[' . Schema::class . ']',
+        'contentEncoding' => 'string',
+        'contentMediaType' => 'string',
     ];
 
     /**

src/Attributes/JsonContent.php

@@ -87,6 +87,8 @@ public function __construct(
         ?array $anyOf = null,
         ?array $oneOf = null,
         AdditionalProperties|bool|null $additionalProperties = null,
+        ?string $contentEncoding = null,
+        ?string $contentMediaType = null,
         // annotation
         ?array $x = null,
         ?array $attachables = null
@@ -127,6 +129,8 @@ public function __construct(
             'anyOf' => $anyOf ?? Generator::UNDEFINED,
             'oneOf' => $oneOf ?? Generator::UNDEFINED,
             'additionalProperties' => $additionalProperties ?? Generator::UNDEFINED,
+            'contentEncoding' => $contentEncoding ?? Generator::UNDEFINED,
+            'contentMediaType' => $contentMediaType ?? Generator::UNDEFINED,
             // annotation
             'x' => $x ?? Generator::UNDEFINED,
             'attachables' => $attachables ?? Generator::UNDEFINED,

src/Attributes/Schema.php

@@ -67,6 +67,8 @@ public function __construct(
         ?array $oneOf = null,
         AdditionalProperties|bool|null $additionalProperties = null,
         mixed $const = Generator::UNDEFINED,
+        ?string $contentEncoding = null,
+        ?string $contentMediaType = null,
         // annotation
         ?array $x = null,
         ?array $attachables = null
@@ -106,6 +108,8 @@ public function __construct(
             'oneOf' => $oneOf ?? Generator::UNDEFINED,
             'additionalProperties' => $additionalProperties ?? Generator::UNDEFINED,
             'const' => $const,
+            'contentEncoding' => $contentEncoding ?? Generator::UNDEFINED,
+            'contentMediaType' => $contentMediaType ?? Generator::UNDEFINED,
             'x' => $x ?? Generator::UNDEFINED,
             'attachables' => $attachables ?? Generator::UNDEFINED,
             'value' => $this->combine($items, $discriminator, $externalDocs, $examples),

src/Attributes/XmlContent.php

@@ -66,6 +66,8 @@ public function __construct(
         ?array $anyOf = null,
         ?array $oneOf = null,
         AdditionalProperties|bool|null $additionalProperties = null,
+        ?string $contentEncoding = null,
+        ?string $contentMediaType = null,
         // annotation
         ?array $x = null,
         ?array $attachables = null
@@ -106,6 +108,8 @@ public function __construct(
             'anyOf' => $anyOf ?? Generator::UNDEFINED,
             'oneOf' => $oneOf ?? Generator::UNDEFINED,
             'additionalProperties' => $additionalProperties ?? Generator::UNDEFINED,
+            'contentEncoding' => $contentEncoding ?? Generator::UNDEFINED,
+            'contentMediaType' => $contentMediaType ?? Generator::UNDEFINED,
             // annotation
             'x' => $x ?? Generator::UNDEFINED,
             'attachables' => $attachables ?? Generator::UNDEFINED,

tests/Annotations/AttributesSyncTest.php

@@ -63,22 +63,23 @@ public function testParameterCompleteness(string $annotation): void
                 unset($typeMismatch['required']);
             }
             if (!$found) {
-                // exclusions...
+                // Schema inheritance exclusions...
                 if ($attributeRC->isSubclassOf(OA\Operation::class) && in_array($propertyName, ['method'])) {
                     continue;
                 }
                 if ($attributeRC->isSubclassOf(OA\Attachable::class) && in_array($propertyName, ['x'])) {
                     continue;
                 }
-                if ($attributeRC->isSubclassOf(OA\AdditionalProperties::class) && in_array($propertyName, ['additionalProperties', 'examples'])) {
+                if ($attributeRC->isSubclassOf(OA\AdditionalProperties::class) && in_array($propertyName, ['additionalProperties', 'examples', 'contentEncoding', 'contentMediaType'])) {
                     continue;
                 }
-                if ($attributeRC->isSubclassOf(OA\Items::class) && in_array($propertyName, ['examples'])) {
+                if ($attributeRC->isSubclassOf(OA\Items::class) && in_array($propertyName, ['examples', 'contentEncoding', 'contentMediaType'])) {
                     continue;
                 }
-                if ($attributeRC->isSubclassOf(OA\Property::class) && in_array($propertyName, ['examples'])) {
+                if ($attributeRC->isSubclassOf(OA\Property::class) && in_array($propertyName, ['examples', 'contentEncoding', 'contentMediaType'])) {
                     continue;
                 }
+
                 if (in_array($propertyName, static::$SCHEMA_EXCLUSIONS)) {
                     continue;
                 }