Add scratch test around property inheritance (#1353)

tests/Fixtures/Scratch/AbstractBaseClass.php

@@ -0,0 +1,15 @@
+<?php declare(strict_types=1);
+
+/**
+ * @license Apache 2.0
+ */
+
+namespace OpenApi\Tests\Fixtures\Scratch;
+
+use OpenApi\Annotations as OA;
+
+abstract class AbstractBaseClass
+{
+    /** @OA\Property(property="basefilter") */
+    public string $filters;
+}

tests/Fixtures/Scratch/MergeTraits.yaml

@@ -18,10 +18,6 @@ components:
       required:
         - street
       properties:
-        id:
-          type: integer
-          format: int64
-          readOnly: true
         created_at:
           type: string
           format: date-time
@@ -30,6 +26,10 @@ components:
           type: string
           format: date-time
           readOnly: true
+        id:
+          type: integer
+          format: int64
+          readOnly: true
         street:
           type: string
       type: object

tests/Fixtures/Scratch/MergeTraitsExtended.php

@@ -4,12 +4,11 @@
  * @license Apache 2.0
  */
 
-namespace App\Models;
+namespace OpenApi\Tests\Fixtures\Scratch;
 
-use App\Models\Product as ProductModel;
 use OpenApi\Annotations as OA;
 
-trait HasId
+trait HasIdExtended
 {
     /**
      * @OA\Property(
@@ -20,7 +19,7 @@ trait HasId
     public int $id;
 }
 
-trait HasTimestamps
+trait HasTimestampsExtended
 {
     /**
      * @OA\Property(
@@ -41,7 +40,7 @@ trait HasTimestamps
     public \DateTime $updated_at;
 }
 
-trait HasSoftDelete
+trait HasSoftDeleteExtended
 {
     /**
      * @OA\Property(
@@ -60,10 +59,10 @@ trait HasSoftDelete
  *
  * @see BaseModel
  */
-abstract class Model
+abstract class ModelExtended
 {
-    use HasId;
-    use HasTimestamps;
+    use HasIdExtended;
+    use HasTimestampsExtended;
 }
 
 /**
@@ -80,9 +79,9 @@ abstract class Model
  *
  * @see ProductModel
  */
-class Product extends Model
+class Product extends ModelExtended
 {
-    use HasSoftDelete;
+    use HasSoftDeleteExtended;
 
     /** @OA\Property */
     public string $number;
@@ -102,6 +101,6 @@ class Product extends Model
  *     )
  * )
  */
-class Endpoint
+class EndpointExtended
 {
 }

tests/Fixtures/Scratch/MergeTraitsExtended.yaml

@@ -14,7 +14,7 @@ paths:
                 $ref: '#/components/schemas/Product'
 components:
   schemas:
-    Model:
+    ModelExtended:
       description: 'This model can be ignored, it is just used for inheritance.'
       properties:
         id:
@@ -40,7 +40,7 @@ components:
         name: Product
       allOf:
         -
-          $ref: '#/components/schemas/Model'
+          $ref: '#/components/schemas/ModelExtended'
         -
           properties:
             deleted_at:

tests/Fixtures/Scratch/PropertyInheritance.php

@@ -0,0 +1,33 @@
+<?php declare(strict_types=1);
+
+/**
+ * @license Apache 2.0
+ */
+
+namespace OpenApi\Tests\Fixtures\Scratch;
+
+use OpenApi\Annotations as OA;
+
+/**
+ * @OA\Schema
+ */
+class PropertyInheritance extends AbstractBaseClass
+{
+    /** @OA\Property(property="inheritedfilter") */
+    public string $filters;
+}
+
+/**
+ * @OA\Info(title="API", version="1.0")
+ * @OA\Get(
+ *     path="/api/endpoint",
+ *     @OA\Response(
+ *         response=200,
+ *         description="successful operation",
+ *         @OA\JsonContent(ref="#/components/schemas/PropertyInheritance")
+ *     )
+ * )
+ */
+class PropertyInheritanceEndpoint
+{
+}

tests/Fixtures/Scratch/PropertyInheritance.yaml

@@ -0,0 +1,21 @@
+openapi: 3.0.0
+info:
+  title: API
+  version: '1.0'
+paths:
+  /api/endpoint:
+    get:
+      responses:
+        '200':
+          description: 'successful operation'
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/PropertyInheritance'
+components:
+  schemas:
+    PropertyInheritance:
+      properties:
+        inheritedfilter:
+          type: string
+      type: object

tests/ScratchTest.php

@@ -15,6 +15,11 @@ public function scratchTests(): iterable
     {
         foreach (glob($this->fixture('Scratch/*.php')) as $fixture) {
             $name = pathinfo($fixture, PATHINFO_FILENAME);
+
+            if (0 === strpos($name, 'Abstract')) {
+                continue;
+            }
+
             yield $name => [
                 OpenApi::VERSION_3_0_0,
                 $this->fixture("Scratch/$name.php"),