Skip to content

Commit 24cd128

Browse files
authored
Merge pull request #22 from AndreasElia/fix/non-primary-request
Fix non-first request class
2 parents 0fababd + 65150ea commit 24cd128

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

src/Commands/ExportPostmanCommand.php

+14-7
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,25 @@ public function handle(): void
7474
$reflectionMethod = $reflection->getMethod($routeData[1]);
7575
}
7676

77-
$firstParameter = $reflectionMethod->getParameters()[0] ?? false;
77+
$rulesParameter = null;
7878

79-
if ($firstParameter) {
80-
$requestClass = $firstParameter->getType()->getName();
81-
$requestClass = class_exists($requestClass) ? new $requestClass() : null;
79+
foreach ($reflectionMethod->getParameters() as $parameter) {
80+
if (! $parameterType = $parameter->getType()) {
81+
continue;
82+
}
8283

83-
if ($requestClass instanceof FormRequest) {
84-
$requestRules = $requestClass->rules();
84+
$requestClass = $parameterType->getName();
8585

86-
$requestRules = array_keys($requestRules);
86+
if (class_exists($requestClass)) {
87+
$rulesParameter = new $requestClass();
8788
}
8889
}
90+
91+
if ($rulesParameter && $rulesParameter instanceof FormRequest) {
92+
$requestRules = $rulesParameter->rules();
93+
94+
$requestRules = array_keys($requestRules);
95+
}
8996
}
9097

9198
$routeHeaders = $this->config['headers'];

0 commit comments

Comments
 (0)