array parser fix

valantic · Apr 28, 2024 · a173d1d · a173d1d
1 parent 3d927ae
commit a173d1d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/Model/Doc/Request/RequestDoc.php b/src/Model/Doc/Request/RequestDoc.php
@@ -17,6 +17,9 @@ class RequestDoc
     /** @var mixed[] */
     private array $requestBody = [];
 
+    /**
+     * @return ComponentSchemaDoc[]
+     */
     public function getComponentSchemaDocs(): array
     {
         return $this->componentSchemaDocs;

diff --git a/src/Service/DocBlockParser.php b/src/Service/DocBlockParser.php
@@ -40,6 +40,8 @@ public function parseDocBlock(string $docBlock, ?string $parameterName = null):
         $parsedDocBlock = $this->phpDocParser->parse($tokens);
 
         foreach ($parsedDocBlock->children as $docBlockItem) {
+            $docBlockParamName = $parameterName;
+
             if ($docBlockItem->value instanceof ParamTagValueNode) {
                 $docBlockParamName = ltrim($docBlockItem->value->parameterName, '$');
             }
@@ -48,17 +50,9 @@ public function parseDocBlock(string $docBlock, ?string $parameterName = null):
                 $docBlockParamName = ltrim($docBlockItem->value->variableName, '$');
             }
 
-            if (
-                (
-                    !isset($docBlockParamName)
-                    || $docBlockParamName === ''
-                )
-                && $parameterName !== null
-            ) {
-                $docBlockParamName = $parameterName;
+            if (isset($docBlockParamName) && $docBlockParamName !== '') {
+                $docBlockData[$docBlockParamName] = $docBlockItem;
             }
-
-            $docBlockData[$docBlockParamName] = $docBlockItem;
         }
 
         return $docBlockData;