From 3074597912db53aa0d494232a1b7066b02319b4c Mon Sep 17 00:00:00 2001
From: DerManoMann <mano@radebatz.net>
Date: Fri, 15 Mar 2024 13:39:07 +1300
Subject: [PATCH] Fix resolving general component refs

---
 src/Annotations/AbstractAnnotation.php  |  2 +-
 src/Annotations/RequestBody.php         | 15 +++++-
 tests/Fixtures/Scratch/RequestBody.php  | 70 +++++++++++++++++++++++++
 tests/Fixtures/Scratch/RequestBody.yaml | 35 +++++++++++++
 4 files changed, 120 insertions(+), 2 deletions(-)
 create mode 100644 tests/Fixtures/Scratch/RequestBody.php
 create mode 100644 tests/Fixtures/Scratch/RequestBody.yaml

diff --git a/src/Annotations/AbstractAnnotation.php b/src/Annotations/AbstractAnnotation.php
index f3e7154e0..c23dfdf32 100644
--- a/src/Annotations/AbstractAnnotation.php
+++ b/src/Annotations/AbstractAnnotation.php
@@ -652,7 +652,7 @@ public function getRoot(): string
      */
     public function isRoot(string $rootClass): bool
     {
-        return $this->getRoot() == $rootClass;
+        return get_class($this) == $rootClass || $this->getRoot() == $rootClass;
     }
 
     /**
diff --git a/src/Annotations/RequestBody.php b/src/Annotations/RequestBody.php
index 4844d1da2..cf954d5d6 100644
--- a/src/Annotations/RequestBody.php
+++ b/src/Annotations/RequestBody.php
@@ -29,7 +29,7 @@ class RequestBody extends AbstractAnnotation
     public $ref = Generator::UNDEFINED;
 
     /**
-     * Request body model name.
+     * The key into Components->requestBodies array.
      *
      * @var string
      */
@@ -95,4 +95,17 @@ class RequestBody extends AbstractAnnotation
         MediaType::class => ['content', 'mediaType'],
         Attachable::class => ['attachables'],
     ];
+
+    /**
+     * @inheritdoc
+     */
+    #[\ReturnTypeWillChange]
+    public function jsonSerialize()
+    {
+        $data = parent::jsonSerialize();
+
+        unset($data->request);
+
+        return $data;
+    }
 }
diff --git a/tests/Fixtures/Scratch/RequestBody.php b/tests/Fixtures/Scratch/RequestBody.php
new file mode 100644
index 000000000..95515ca1a
--- /dev/null
+++ b/tests/Fixtures/Scratch/RequestBody.php
@@ -0,0 +1,70 @@
+<?php declare(strict_types=1);
+
+/**
+ * @license Apache 2.0
+ */
+
+namespace OpenApi\Tests\Fixtures\Scratch;
+
+use OpenApi\Attributes as OAT;
+
+#[OAT\RequestBody()]
+class RequestBodyRef
+{
+}
+
+#[OAT\RequestBody(request: 'foo')]
+class RequestBodyRefFoo
+{
+}
+
+#[OAT\Info(title: 'RequestBody', version: '1.0')]
+class RequestBodyController
+{
+    #[OAT\Get(
+        path: '/endpoint',
+        requestBody: new OAT\RequestBody(
+            description: 'Information about a new pet in the system',
+            content: new OAT\MediaType(
+                mediaType: 'application/json'
+            ),
+        ),
+        responses: [
+            new OAT\Response(
+                response: 200,
+                description: 'All good'
+            ),
+        ]
+    )]
+    public function post()
+    {
+    }
+
+    #[OAT\Post(
+        path: '/endpoint/ref',
+        requestBody: new OAT\RequestBody(ref: RequestBodyRef::class),
+        responses: [
+            new OAT\Response(
+                response: 200,
+                description: 'All good'
+            ),
+        ]
+    )]
+    public function postRef()
+    {
+    }
+
+    #[OAT\Post(
+        path: '/endpoint/ref-foo',
+        requestBody: new OAT\RequestBody(ref: RequestBodyRefFoo::class),
+        responses: [
+            new OAT\Response(
+                response: 200,
+                description: 'All good'
+            ),
+        ]
+    )]
+    public function postRefFoo()
+    {
+    }
+}
diff --git a/tests/Fixtures/Scratch/RequestBody.yaml b/tests/Fixtures/Scratch/RequestBody.yaml
new file mode 100644
index 000000000..04151991f
--- /dev/null
+++ b/tests/Fixtures/Scratch/RequestBody.yaml
@@ -0,0 +1,35 @@
+openapi: 3.0.0
+info:
+  title: RequestBody
+  version: '1.0'
+paths:
+  /endpoint:
+    get:
+      operationId: 30597cf43b480393042f6b01a9d7980c
+      requestBody:
+        description: 'Information about a new pet in the system'
+        content:
+          application/json: {  }
+      responses:
+        '200':
+          description: 'All good'
+  /endpoint/ref:
+    post:
+      operationId: 4250dd87e4e3872a8f2e481532cbc245
+      requestBody:
+        $ref: '#/components/requestBodies/RequestBodyRef'
+      responses:
+        '200':
+          description: 'All good'
+  /endpoint/ref-foo:
+    post:
+      operationId: 344406e28927343e4e9e4f39bd6c385b
+      requestBody:
+        $ref: '#/components/requestBodies/foo'
+      responses:
+        '200':
+          description: 'All good'
+components:
+  requestBodies:
+    RequestBodyRef: {  }
+    foo: {  }