Skip to content

Add support for patternProperties to attributes #1876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DerManoMann merged 1 commit into from
Dec 23, 2025
Merged

Add support for patternProperties to attributes #1876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Annotations/Schema.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,8 @@ class Schema extends AbstractAnnotation

/**
* http://json-schema.org/latest/json-schema-validation.html#rfc.section.6.19.
*
* @var array
*/
public $patternProperties = Generator::UNDEFINED;

Expand Down
2 changes: 2 additions & 0 deletions src/Attributes/AdditionalProperties.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ public function __construct(
?array $anyOf = null,
?array $oneOf = null,
AdditionalProperties|bool|null $additionalProperties = null,
?array $patternProperties = null,
// annotation
?array $x = null,
?array $attachables = null
Expand Down Expand Up @@ -101,6 +102,7 @@ public function __construct(
'allOf' => $allOf ?? Generator::UNDEFINED,
'anyOf' => $anyOf ?? Generator::UNDEFINED,
'oneOf' => $oneOf ?? Generator::UNDEFINED,
'patternProperties' => $patternProperties ?? Generator::UNDEFINED,
'x' => $x ?? Generator::UNDEFINED,
'attachables' => $attachables ?? Generator::UNDEFINED,
'value' => $this->combine($items, $discriminator, $externalDocs, $additionalProperties),
Expand Down
5 changes: 3 additions & 2 deletions src/Attributes/Items.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ public function __construct(
?array $anyOf = null,
?array $oneOf = null,
AdditionalProperties|bool|null $additionalProperties = null,
?array $patternProperties = null,
// annotation
?array $x = null,
?array $attachables = null
Expand Down Expand Up @@ -102,11 +103,11 @@ public function __construct(
'allOf' => $allOf ?? Generator::UNDEFINED,
'anyOf' => $anyOf ?? Generator::UNDEFINED,
'oneOf' => $oneOf ?? Generator::UNDEFINED,
'additionalProperties' => $additionalProperties ?? Generator::UNDEFINED,
'patternProperties' => $patternProperties ?? Generator::UNDEFINED,
// annotation
'x' => $x ?? Generator::UNDEFINED,
'attachables' => $attachables ?? Generator::UNDEFINED,
'value' => $this->combine($items, $discriminator, $externalDocs),
'value' => $this->combine($items, $discriminator, $externalDocs, $additionalProperties),
]);
}
}
5 changes: 3 additions & 2 deletions src/Attributes/JsonContent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ public function __construct(
?array $anyOf = null,
?array $oneOf = null,
AdditionalProperties|bool|null $additionalProperties = null,
?array $patternProperties = null,
?array $encoding = null,
?string $contentEncoding = null,
?string $contentMediaType = null,
Expand Down Expand Up @@ -130,14 +131,14 @@ public function __construct(
'allOf' => $allOf ?? Generator::UNDEFINED,
'anyOf' => $anyOf ?? Generator::UNDEFINED,
'oneOf' => $oneOf ?? Generator::UNDEFINED,
'additionalProperties' => $additionalProperties ?? Generator::UNDEFINED,
'patternProperties' => $patternProperties ?? Generator::UNDEFINED,
'encoding' => $encoding ?? Generator::UNDEFINED,
'contentEncoding' => $contentEncoding ?? Generator::UNDEFINED,
'contentMediaType' => $contentMediaType ?? Generator::UNDEFINED,
// annotation
'x' => $x ?? Generator::UNDEFINED,
'attachables' => $attachables ?? Generator::UNDEFINED,
'value' => $this->combine($items, $discriminator, $externalDocs),
'value' => $this->combine($items, $discriminator, $externalDocs, $additionalProperties),
]);
}
}
5 changes: 3 additions & 2 deletions src/Attributes/Property.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ public function __construct(
?array $anyOf = null,
?array $oneOf = null,
AdditionalProperties|bool|null $additionalProperties = null,
?array $patternProperties = null,
?Encoding $encoding = null,
// annotation
?array $x = null,
Expand Down Expand Up @@ -105,12 +106,12 @@ public function __construct(
'allOf' => $allOf ?? Generator::UNDEFINED,
'anyOf' => $anyOf ?? Generator::UNDEFINED,
'oneOf' => $oneOf ?? Generator::UNDEFINED,
'additionalProperties' => $additionalProperties ?? Generator::UNDEFINED,
'patternProperties' => $patternProperties ?? Generator::UNDEFINED,
'encoding' => $encoding ?? Generator::UNDEFINED,
// annotation
'x' => $x ?? Generator::UNDEFINED,
'attachables' => $attachables ?? Generator::UNDEFINED,
'value' => $this->combine($items, $discriminator, $externalDocs),
'value' => $this->combine($items, $discriminator, $externalDocs, $additionalProperties),
]);
}
}
5 changes: 3 additions & 2 deletions src/Attributes/Schema.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public function __construct(
?array $anyOf = null,
?array $oneOf = null,
AdditionalProperties|bool|null $additionalProperties = null,
?array $patternProperties = null,
mixed $const = Generator::UNDEFINED,
?string $contentEncoding = null,
?string $contentMediaType = null,
Expand Down Expand Up @@ -106,13 +107,13 @@ public function __construct(
'allOf' => $allOf ?? Generator::UNDEFINED,
'anyOf' => $anyOf ?? Generator::UNDEFINED,
'oneOf' => $oneOf ?? Generator::UNDEFINED,
'additionalProperties' => $additionalProperties ?? Generator::UNDEFINED,
'patternProperties' => $patternProperties ?? 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),
'value' => $this->combine($items, $discriminator, $externalDocs, $examples, $additionalProperties),
]);
}
}
5 changes: 3 additions & 2 deletions src/Attributes/XmlContent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ public function __construct(
?array $anyOf = null,
?array $oneOf = null,
AdditionalProperties|bool|null $additionalProperties = null,
?array $patternProperties = null,
?array $encoding = null,
?string $contentEncoding = null,
?string $contentMediaType = null,
Expand Down Expand Up @@ -109,14 +110,14 @@ public function __construct(
'allOf' => $allOf ?? Generator::UNDEFINED,
'anyOf' => $anyOf ?? Generator::UNDEFINED,
'oneOf' => $oneOf ?? Generator::UNDEFINED,
'additionalProperties' => $additionalProperties ?? Generator::UNDEFINED,
'patternProperties' => $patternProperties ?? Generator::UNDEFINED,
'encoding' => $encoding ?? Generator::UNDEFINED,
'contentEncoding' => $contentEncoding ?? Generator::UNDEFINED,
'contentMediaType' => $contentMediaType ?? Generator::UNDEFINED,
// annotation
'x' => $x ?? Generator::UNDEFINED,
'attachables' => $attachables ?? Generator::UNDEFINED,
'value' => $this->combine($items, $discriminator, $externalDocs),
'value' => $this->combine($items, $discriminator, $externalDocs, $additionalProperties),
]);
}
}
2 changes: 1 addition & 1 deletion tests/Annotations/AttributesSyncTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

class AttributesSyncTest extends OpenApiTestCase
{
public static $SCHEMA_EXCLUSIONS = ['const', 'multipleOf', 'not', 'additionalItems', 'contains', 'patternProperties', 'dependencies', 'propertyNames'];
public static $SCHEMA_EXCLUSIONS = ['const', 'multipleOf', 'not', 'additionalItems', 'contains', 'dependencies', 'propertyNames'];
public static $PATHITEM_EXCLUSIONS = ['get', 'put', 'post', 'delete', 'options', 'head', 'patch', 'trace'];
public static $PARAMETER_EXCLUSIONS = ['matrix', 'label', 'form', 'simple', 'deepObject'];

Expand Down