Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed the case when non-request class had rules method which resulted in error when extracting validation rules #324

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ public function extract(Route $route)

/** @var Request $request */
$request = (new $requestClassName);

if (! method_exists($request, 'setMethod')) {
return [];
}

$request->setMethod($route->methods()[0]);

return $request->rules();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,31 @@ public function foo(ModelWithCustomRouteKeyName $model)
}
}

it('correctly handles not request class with rules method', function () {
$openApiDocument = generateForRoute(function () {
return RouteFacade::get('api/test/{model}', [Foo_RequestRulesTest_Controller::class, 'foo']);
});

expect($openApiDocument['paths']['/test/{model}']['get']['parameters'][0])
->toHaveKey('schema.type', 'integer')
->toHaveKey('description', 'The model ID');
});
class ModelWithRulesMethod extends \Illuminate\Database\Eloquent\Model
{
protected $table = 'users';

public function rules()
{
return [];
}
}
class Foo_RequestRulesTest_Controller
{
public function foo(ModelWithRulesMethod $model)
{
}
}

it('handles custom key from route to determine model route key type', function () {
$openApiDocument = generateForRoute(function () {
return RouteFacade::get('api/test/{user:name}', [CustomKey_RequestEssentialsExtensionTest_Controller::class, 'foo']);
Expand Down
Loading