Map property type for promoted properties (#1074)

zircote · Jan 19, 2022 · 27422d1 · 27422d1
1 parent 36f0b62
commit 27422d1
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 10 deletions.
diff --git a/src/Processors/AugmentProperties.php b/src/Processors/AugmentProperties.php
@@ -73,6 +73,8 @@ public function __invoke(Analysis $analysis)
 
             if (Generator::isDefault($property->type)) {
                 $this->augmentType($analysis, $property, $context, $refs, $varMatches);
+            } else {
+                Util::mapNativeType($property, $property->type);
             }
 
             if (Generator::isDefault($property->description) && isset($varMatches['description'])) {
@@ -156,9 +158,6 @@ protected function augmentType(Analysis $analysis, Property $property, Context $
                 $refKey = $this->toRefKey($context, $type);
                 if (Generator::isDefault($property->ref) && array_key_exists($refKey, $refs)) {
                     $this->applyRef($property, $refs[$refKey]);
-
-                    // cannot get more specific
-                    return;
                 } else {
                     if ($typeSchema = $analysis->getSchemaForSource($context->type)) {
                         if (Generator::isDefault($property->format)) {

diff --git a/tests/Analysers/TokenScannerTest.php b/tests/Analysers/TokenScannerTest.php
@@ -31,7 +31,7 @@ public function scanCases()
                         'traits' => ['OpenApi\\Tests\\Fixtures\\Apis\\DocBlocks\\NameTrait'],
                         'enums' => [],
                         'methods' => [],
-                        'properties' => ['id', 'brand', 'colour'],
+                        'properties' => ['quantity', 'brand', 'colour', 'id'],
                     ],
                     'OpenApi\\Tests\\Fixtures\\Apis\\DocBlocks\\ProductController' => [
                         'uses' => ['OA' => 'OpenApi\\Annotations'],

diff --git a/tests/Fixtures/Apis/Attributes/basic.php b/tests/Fixtures/Apis/Attributes/basic.php
@@ -50,6 +50,8 @@ class Product implements ProductInterface
     public $id;
 
     public function __construct(
+        #[OAT\Property()]
+        public int $quantity,
         #[OAT\Property()]
         public string $brand,
         #[OAT\Property()]

diff --git a/tests/Fixtures/Apis/DocBlocks/basic.php b/tests/Fixtures/Apis/DocBlocks/basic.php
@@ -59,19 +59,22 @@ class Product implements ProductInterface
 {
     use NameTrait;
 
+    /** @OA\Property() */
+    public int $quantity;
+
+    /** @OA\Property() */
+    public string $brand;
+
+    /** @OA\Property() */
+    public Colour $colour;
+
     /**
      * The id.
      *
      * @OA\Property(format="int64", example=1)
      */
     public $id;
 
-
-    /** @OA\Property() */
-    public string $brand;
-
-    /** @OA\Property() */
-    public Colour $colour;
 }
 
 class ProductController

diff --git a/tests/Fixtures/Apis/Mixed/basic.php b/tests/Fixtures/Apis/Mixed/basic.php
@@ -57,6 +57,9 @@ class Product implements ProductInterface
      */
     public $id;
 
+    #[OAT\Property()]
+    public int $quantity;
+
     #[OAT\Property()]
     public string $brand;
 

diff --git a/tests/Fixtures/Apis/basic.yaml b/tests/Fixtures/Apis/basic.yaml
@@ -94,6 +94,8 @@ components:
           $ref: '#/components/schemas/NameTrait'
         -
           properties:
+            quantity:
+              type: integer
             brand:
               type: string
             colour: