From e67dfd938cacd1662e3eb6eeb9462b952569a48c Mon Sep 17 00:00:00 2001
From: rien-vroom-cquential
 <124083137+rien-vroom-cquential@users.noreply.github.com>
Date: Thu, 26 Oct 2023 21:47:06 +0200
Subject: [PATCH] Allow recursive nesting of AdditionalProperties in Attributes
 (#1490)

---
 docs/reference/attributes.md                  |  2 ++
 src/Attributes/AdditionalProperties.php       |  3 +-
 .../Scratch/NestedAdditionalProperties.php    | 30 +++++++++++++++++++
 .../Scratch/NestedAdditionalProperties.yaml   | 18 +++++++++++
 4 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 tests/Fixtures/Scratch/NestedAdditionalProperties.php
 create mode 100644 tests/Fixtures/Scratch/NestedAdditionalProperties.yaml

diff --git a/docs/reference/attributes.md b/docs/reference/attributes.md
index c4ebcf0c2..292679b09 100644
--- a/docs/reference/attributes.md
+++ b/docs/reference/attributes.md
@@ -152,6 +152,8 @@ schema defined by this property's value.</p></dd>
   <dt><strong>oneOf</strong> : <span style="font-family: monospace;">array&lt;Schema|\OpenApi\Annotations\Schema&gt;</span></dt>
   <dd><p>An instance validates successfully against this property if it validates successfully against exactly one schema<br />
 defined by this property's value.</p></dd>
+  <dt><strong>additionalProperties</strong> : <span style="font-family: monospace;">OpenApi\Attributes\AdditionalProperties|bool|null</span></dt>
+  <dd><p>http://json-schema.org/latest/json-schema-validation.html#anchor64.</p></dd>
   <dt><strong>x</strong> : <span style="font-family: monospace;">array&lt;string,mixed&gt;|null</span></dt>
   <dd><p>While the OpenAPI Specification tries to accommodate most use cases, additional data can be added to extend the specification at certain points.<br />
 For further details see https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#specificationExtensions<br />
diff --git a/src/Attributes/AdditionalProperties.php b/src/Attributes/AdditionalProperties.php
index 6147238c2..ca0ab3f8d 100644
--- a/src/Attributes/AdditionalProperties.php
+++ b/src/Attributes/AdditionalProperties.php
@@ -61,6 +61,7 @@ public function __construct(
         ?array $allOf = null,
         ?array $anyOf = null,
         ?array $oneOf = null,
+        AdditionalProperties|bool|null $additionalProperties = null,
         // annotation
         ?array $x = null,
         ?array $attachables = null
@@ -100,7 +101,7 @@ public function __construct(
             'oneOf' => $oneOf ?? Generator::UNDEFINED,
             'x' => $x ?? Generator::UNDEFINED,
             'attachables' => $attachables ?? Generator::UNDEFINED,
-            'value' => $this->combine($items, $discriminator, $externalDocs, $attachables),
+            'value' => $this->combine($items, $discriminator, $externalDocs, $additionalProperties, $attachables),
         ]);
     }
 }
diff --git a/tests/Fixtures/Scratch/NestedAdditionalProperties.php b/tests/Fixtures/Scratch/NestedAdditionalProperties.php
new file mode 100644
index 000000000..01eb62b1e
--- /dev/null
+++ b/tests/Fixtures/Scratch/NestedAdditionalProperties.php
@@ -0,0 +1,30 @@
+<?php declare(strict_types=1);
+
+/**
+ * @license Apache 2.0
+ */
+
+namespace OpenApi\Tests\Fixtures\Scratch;
+
+use OpenApi\Attributes as OAT;
+
+#[OAT\Info(
+    title: 'Nested Additional Properties',
+    version: '1.0'
+)]
+#[OAT\Get(
+    path: '/api/endpoint',
+    description: 'An endpoint',
+    responses: [new OAT\Response(response: 200, description: 'OK')]
+)]
+#[OAT\Schema(
+    additionalProperties: new OAT\AdditionalProperties(
+        additionalProperties: new OAT\AdditionalProperties(
+            type: 'string',
+        )
+    ),
+    type: 'object'
+)]
+class NestedAdditionalAttributes
+{
+}
diff --git a/tests/Fixtures/Scratch/NestedAdditionalProperties.yaml b/tests/Fixtures/Scratch/NestedAdditionalProperties.yaml
new file mode 100644
index 000000000..27752f0d8
--- /dev/null
+++ b/tests/Fixtures/Scratch/NestedAdditionalProperties.yaml
@@ -0,0 +1,18 @@
+openapi: 3.0.0
+info:
+  title: 'Nested Additional Properties'
+  version: '1.0'
+paths:
+  /api/endpoint:
+    get:
+      description: 'An endpoint'
+      responses:
+        '200':
+          description: OK
+components:
+  schemas:
+    NestedAdditionalAttributes:
+      type: object
+      additionalProperties:
+        additionalProperties:
+          type: string