.

Examples/webhooks/OpenApiSpec.php

@@ -1,43 +1,34 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace OpenApi\Examples\Webhooks;
 
-use OpenApi\Attributes as OAT;
+use OpenApi\Annotations as OA;
 
-#[OAT\OpenApi(
-    info: new OAT\Info(version: '1.0.0', title: 'Webhook Example'),
-    webhooks: [
-        new OAT\Webhook(
-            webhook: 'newPet',
-            path: new OAT\PathItem(
-
-            )
-        )
-    ],
-)]
-/*
+/**
  * @OA\OpenApi(
  *     @OA\Info(
  *         version="1.0.0",
- *         title="Webhook Example",
+ *         title="Webhook Example"
  *     ),
- *     webhooks={
- *         "newPet": @OA\PathItem(
+ *     @OA\Webhook(
+ *         webhook="newPet",
+ *         @OA\PathItem(
  *             @OA\Post(
  *                 @OA\RequestBody(
  *                     description="Information about a new pet in the system",
- *                     @OA\MediaType(
- *                         mediaType="application/json",
- *                         @OA\Schema(ref="#/components/schemas/Pet")
+ *                         @OA\MediaType(
+ *                             mediaType="application/json",
+ *                             @OA\Schema(ref="#/components/schemas/Pet")
+ *                         ),
  *                     ),
- *                 ),
- *                 @OA\Response(
- *                     response=200,
- *                     description="Return a 200 status to indicate that the data was received successfully"
+ *                     @OA\Response(
+ *                         response=200,
+ *                         description="Return a 200 status to indicate that the data was received successfully"
+ *                     )
  *                 )
  *             )
  *         )
- *     }
+ *     )
  * )
  */
 class OpenApiSpec

Examples/webhooks/Pet.php

@@ -1,20 +1,32 @@
-<?php
-
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace OpenApi\Examples\Webhooks;
 
-use OpenApi\Attributes as OAT;
+use OpenApi\Annotations as OA;
 
-#[OAT\Schema(required: ['id', 'name'])]
+/**
+ * @OA\Schema(required={"id", "name"})
+ */
 final class Pet
 {
-    #[OAT\Property(format: 'int64')]
-    public int $id;
+    /**
+     * @OA\Property(format="int64")
+     *
+     * @var int
+     */
+    public $id;
 
-    #[OAT\Property]
-    public string $name;
+    /**
+     * @OA\Property
+     *
+     * @var string
+     */
+    public $name;
 
-    #[OAT\Property]
-    public string $tag;
+    /**
+     * @OA\Property
+     *
+     * @var string
+     */
+    public $tag;
 }

Examples/webhooks/webhooks.yaml

@@ -19,4 +19,14 @@ components:
       type: object
 webhooks:
   newPet:
-    path: {  }
+    post:
+      operationId: 072580cbd56e3fef2b4c81536d3fd1c6
+      requestBody:
+        description: 'Information about a new pet in the system'
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Pet'
+      responses:
+        '200':
+          description: 'Return a 200 status to indicate that the data was received successfully'

Examples/webhooks81/OpenApiSpec.php

@@ -0,0 +1,34 @@
+<?php declare(strict_types=1);
+
+namespace OpenApi\Examples\Webhooks81;
+
+use OpenApi\Attributes as OAT;
+
+#[OAT\OpenApi(
+    info: new OAT\Info(version: '1.0.0', title: 'Webhook Example'),
+    webhooks: [
+        new OAT\Webhook(
+            webhook: 'newPet',
+            path: new OAT\PathItem(
+                post: new OAT\Post(
+                    requestBody: new OAT\RequestBody(
+                        description: 'Information about a new pet in the system',
+                        content: new OAT\MediaType(
+                            mediaType: 'application/json',
+                            schema: new OAT\Schema(ref: Pet::class)
+                        )
+                    ),
+                    responses: [
+                        new OAT\Response(
+                            response: 200,
+                            description: 'Return a 200 status to indicate that the data was received successfully'
+                        ),
+                    ]
+                )
+            )
+        ),
+    ],
+)]
+class OpenApiSpec
+{
+}

Examples/webhooks81/Pet.php

@@ -0,0 +1,18 @@
+<?php declare(strict_types=1);
+
+namespace OpenApi\Examples\Webhooks81;
+
+use OpenApi\Attributes as OAT;
+
+#[OAT\Schema(required: ['id', 'name'])]
+final class Pet
+{
+    #[OAT\Property(format: 'int64')]
+    public int $id;
+
+    #[OAT\Property]
+    public string $name;
+
+    #[OAT\Property]
+    public string $tag;
+}

Examples/webhooks81/webhooks.yaml

@@ -0,0 +1,32 @@
+openapi: 3.1.0
+info:
+  title: 'Webhook Example'
+  version: 1.0.0
+components:
+  schemas:
+    Pet:
+      required:
+        - id
+        - name
+      properties:
+        id:
+          type: integer
+          format: int64
+        name:
+          type: string
+        tag:
+          type: string
+      type: object
+webhooks:
+  newPet:
+    post:
+      operationId: bbbe318bf00166ae6ba3552197e5f089
+      requestBody:
+        description: 'Information about a new pet in the system'
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Pet'
+      responses:
+        '200':
+          description: 'Return a 200 status to indicate that the data was received successfully'

src/Annotations/Attachable.php

@@ -46,7 +46,6 @@ class Attachable extends AbstractAnnotation
         Post::class,
         Property::class,
         Put::class,
-        Reference::class,
         RequestBody::class,
         Response::class,
         Schema::class,

src/Annotations/OpenApi.php

@@ -154,8 +154,6 @@ public function validate(array $stack = null, array $skip = null, string $ref =
         /* paths is optional in 3.1.0 */
         if ($this->openapi === self::VERSION_3_0_0 && Generator::isDefault($this->paths)) {
             $this->_context->logger->warning('Required @OA\PathItem() not found');
-
-            return false;
         }
 
         if ($this->openapi === self::VERSION_3_1_0

src/Annotations/Webhook.php

@@ -8,6 +8,9 @@
 
 use OpenApi\Generator;
 
+/**
+ * @Annotation
+ */
 class Webhook extends AbstractAnnotation
 {
     /**
@@ -26,15 +29,6 @@ class Webhook extends AbstractAnnotation
      */
     public $path = Generator::UNDEFINED;
 
-    /**
-     * The reference.
-     *
-     * Required unless `path` is set.
-     *
-     * @var Reference
-     */
-    public $reference = Generator::UNDEFINED;
-
     /**
      * @inheritdoc
      */
@@ -47,7 +41,6 @@ class Webhook extends AbstractAnnotation
      */
     public static $_nested = [
         PathItem::class => 'path',
-        Reference::class => 'reference',
         Attachable::class => ['attachables'],
     ];
 
@@ -57,4 +50,24 @@ class Webhook extends AbstractAnnotation
     public static $_types = [
         'webhook' => 'string',
     ];
+
+    /**
+     * @inheritdoc
+     */
+    #[\ReturnTypeWillChange]
+    public function jsonSerialize()
+    {
+        $data = parent::jsonSerialize();
+
+        if (isset($data->path)) {
+            foreach (get_object_vars($data->path) as $property => $value) {
+                if ('_' != $property[0] && !Generator::isDefault($value)) {
+                    $data->{$property} = $value;
+                }
+            }
+            unset($data->path);
+        }
+
+        return $data;
+    }
 }