Fix

Author: shalvah

src/RectorRule.php

@@ -261,7 +261,7 @@ public function getArgs($tag, $tagContent, $phpDocInfo)
     {
         $tagContent = trim($tagContent);
 
-        $removeEmptyKeys = function ($class, ...$extraData) use ($tagContent) {
+        $parseAndRemoveEmptyKeys = function ($class, ...$extraData) use ($tagContent) {
             $parsed = (new $class($tagContent, ...$extraData))->parse();
             $arguments = [];
             foreach ($parsed as $key => $value) {
@@ -275,19 +275,19 @@ public function getArgs($tag, $tagContent, $phpDocInfo)
 
         return match(strtolower($tag)) {
             'header' => explode(' ', $tagContent),
-            'urlparam' => $removeEmptyKeys(UrlParamTagParser::class),
-            'queryparam' => $removeEmptyKeys(QueryParamTagParser::class),
-            'bodyparam' => $removeEmptyKeys(BodyParamTagParser::class),
-            'responsefield' => $removeEmptyKeys(ResponseFieldTagParser::class),
+            'urlparam' => $parseAndRemoveEmptyKeys(UrlParamTagParser::class),
+            'queryparam' => $parseAndRemoveEmptyKeys(QueryParamTagParser::class),
+            'bodyparam' => $parseAndRemoveEmptyKeys(BodyParamTagParser::class),
+            'responsefield' => $parseAndRemoveEmptyKeys(ResponseFieldTagParser::class),
 
-            'response' => $removeEmptyKeys(ResponseTagParser::class),
-            'responsefile' => $removeEmptyKeys(ResponseFileTagParser::class),
-            'apiresource' => $removeEmptyKeys(ApiResourceTagParser::class, $phpDocInfo->getPhpDocNode()->getTags()),
-            'apiresourcecollection' => $removeEmptyKeys(ApiResourceTagParser::class, $phpDocInfo->getPhpDocNode()->getTags(), true),
-            'transformer' => $removeEmptyKeys(TransformerTagParser::class, $phpDocInfo->getPhpDocNode()->getTags()),
-            'transformercollection' => $removeEmptyKeys(TransformerTagParser::class, $phpDocInfo->getPhpDocNode()->getTags(), true),
+            'response' => $parseAndRemoveEmptyKeys(ResponseTagParser::class),
+            'responsefile' => $parseAndRemoveEmptyKeys(ResponseFileTagParser::class),
+            'apiresource' => $parseAndRemoveEmptyKeys(ApiResourceTagParser::class, $phpDocInfo->getPhpDocNode()->getTags()),
+            'apiresourcecollection' => $parseAndRemoveEmptyKeys(ApiResourceTagParser::class, $phpDocInfo->getPhpDocNode()->getTags(), true),
+            'transformer' => $parseAndRemoveEmptyKeys(TransformerTagParser::class, $phpDocInfo->getPhpDocNode()->getTags()),
+            'transformercollection' => $parseAndRemoveEmptyKeys(TransformerTagParser::class, $phpDocInfo->getPhpDocNode()->getTags(), true),
 
-            'subgroup' => $removeEmptyKeys(SubgroupTagParser::class, $phpDocInfo->getPhpDocNode()->getTags()),
+            'subgroup' => $parseAndRemoveEmptyKeys(SubgroupTagParser::class, $phpDocInfo->getPhpDocNode()->getTags()),
         };
     }
 }

src/TagParsers/TransformerTagParser.php

@@ -30,11 +30,18 @@ public function parse()
 
         $data = [
             $transformerClass,
-            $model
         ];
 
+        if (!empty($model)) {
+            $data[] = $model;
+        }
+
         if (!empty($statusCode)) {
-            $data[] = (int) $statusCode;
+            if ($model) {
+                $data[] = (int)$statusCode;
+            } else {
+                $data['status'] = (int)$statusCode;
+            }
         }
 
         if ($this->isCollection) {
@@ -74,11 +81,6 @@ private function getClassToBeTransformed(): array
             $states = $fields['states'] ? explode(',', $fields['states']) : [];
             $relations = $fields['with'] ? explode(',', $fields['with']) : [];
             $resourceKey = $fields['resourceKey'] ?? null;
-        } else {
-            $parameter = Arr::first($transformerMethod->getParameters());
-            if ($parameter->hasType() && !$parameter->getType()->isBuiltin() && class_exists($parameter->getType()->getName())) {
-                $type = $parameter->getType()->getName();
-            }
         }
 
         return [$type, $states, $relations, $resourceKey];

src/TagParsers/UrlParamTagParser.php

@@ -21,10 +21,10 @@ public function parse()
         // @urlParam user_id The ID of the user.
 
         // We match on all the possible types for URL parameters. It's a limited range, so no biggie.
-        preg_match('/(\w+?)\s+((int|integer|string|float|double|number)\s+)?(required\s+)?([\s\S]*)/', $tagContent, $content);
+        preg_match('/(\w+?)\s+((int|integer|string|float|double|number)\s+)?(required\s+)?([\s\S]*)/', $this->tagContent, $content);
         if (empty($content)) {
             // This means only name was supplied
-            $name = $tagContent;
+            $name = $this->tagContent;
             $required = false;
             $description = '';
             $type = null;