Skip to content

[FrameworkBundle] Don't force AbstractController::handleForm() to return a Response #41184

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

[FrameworkBundle] Don't force AbstractController::handleForm() to return a Response #41184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,10 +299,10 @@ protected function stream(string $view, array $parameters = [], StreamedResponse
*
* For both callables, instead of "mixed", you can use your form's data class as a type-hint for argument #2.
*
* @param callable(FormInterface, mixed, Request): Response $onSuccess
* @param callable(FormInterface, mixed, Request): Response $render
* @param callable(FormInterface, mixed, Request): mixed $onSuccess
* @param callable(FormInterface, mixed, Request): mixed $render
*/
public function handleForm(FormInterface $form, Request $request, callable $onSuccess, callable $render): Response
public function handleForm(FormInterface $form, Request $request, callable $onSuccess, callable $render)
{
$form->handleRequest($request);

Expand All @@ -314,13 +314,13 @@ public function handleForm(FormInterface $form, Request $request, callable $onSu
} else {
$response = $render($form, $data, $request);

if ($submitted && 200 === $response->getStatusCode()) {
if ($response instanceof Response && $submitted && 200 === $response->getStatusCode()) {
$response->setStatusCode(Response::HTTP_UNPROCESSABLE_ENTITY);
}
}

if (!$response instanceof Response) {
throw new \TypeError(sprintf('The "%s" callable passed to "%s::handleForm()" must return a Response, "%s" returned.', $isValid ? '$onSuccess' : '$render', get_debug_type($this), get_debug_type($response)));
if (null === $response) {
throw new \TypeError(sprintf('The "%s" callable passed to "%s::handleForm()" should return a value, did you forget to return a Response?', $isValid ? '$onSuccess' : '$render', get_debug_type($this)));
}

return $response;
Expand Down
6 changes: 3 additions & 3 deletions src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,13 +499,13 @@ public function testHandleFormTypeError()
$controller = $this->createController();

$this->expectException(\TypeError::class);
$this->expectExceptionMessage('The "$onSuccess" callable passed to "Symfony\Bundle\FrameworkBundle\Tests\Controller\TestAbstractController::handleForm()" must return a Response, "string" returned.');
$this->expectExceptionMessage('The "$onSuccess" callable passed to "Symfony\Bundle\FrameworkBundle\Tests\Controller\TestAbstractController::handleForm()" should return a value, did you forget to return a Response?');

$response = $controller->handleForm(
$form,
Request::create('https://example.com'),
function () { return 'abc'; },
function () { return 'abc'; }
function () {},
function () {}
);
}

Expand Down