Commit7f8dbc1

committed

[HttpKernel] Better exception page when the invokable controller returns nothing

1 parent91c5b14 commit7f8dbc1Copy full SHA for 7f8dbc1

File tree

+23

-19

lines changed

+23

-19

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -67,9 +67,15 @@ private function parseControllerDefinition(callable $controller): ?array`
`67`	`67`	`if (\is_object($controller)) {`
`68`	`68`	`$r =new \ReflectionClass($controller);`
`69`	`69`
	`70`	`+try {`
	`71`	`+$line =$r->getMethod('__invoke');`
	`72`	`+ }catch (\ReflectionException$e) {`
	`73`	`+$line =$r->getEndLine();`
	`74`	`+ }`
	`75`	`+`
`70`	`76`	`return [`
`71`	`77`	`'file' =>$r->getFileName(),`
`72`		`-'line' =>$r->getEndLine(),`
	`78`	`+'line' =>$line,`
`73`	`79`	`];`
`74`	`80`	`}`
`75`	`81`

Lines changed: 10 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -154,18 +154,17 @@ private function handleRaw(Request $request, int $type = self::MASTER_REQUEST)`
`154`	`154`	`$event =newGetResponseForControllerResultEvent($this,$request,$type,$response);`
`155`	`155`	`$this->dispatcher->dispatch(KernelEvents::VIEW,$event);`
`156`	`156`
`157`		`-if ($event->hasResponse()) {`
`158`		`-$response =$event->getResponse();`
`159`		`- }else {`
`160`		`-$msg =sprintf('The controller must return a "Symfony\Component\HttpFoundation\Response" object but it returned %s.',$this->varToString($response));`
`161`		`-`
`162`		`-// the user may have forgotten to return something`
`163`		`-if (null ===$response) {`
`164`		`-$msg .=' Did you forget to add a return statement somewhere in your controller?';`
`165`		`- }`
`166`		`-`
`167`		`-thrownewControllerDoesNotReturnResponseException($msg,$controller,__FILE__,__LINE__ -17);`
	`157`	`+if (!$event->hasResponse()) {`
	`158`	`+$message =sprintf(`
	`159`	`+'The controller must return a "Symfony\Component\HttpFoundation\Response" object but it returned %s.%s',`
	`160`	`+$this->varToString($response),`
	`161`	`+' Did you forget to add a return statement somewhere in your controller?'`
	`162`	`+ );`
	`163`	`+`
	`164`	`+thrownewControllerDoesNotReturnResponseException($message,$controller,__FILE__,__LINE__ -14);`
`168`	`165`	`}`
	`166`	`+`
	`167`	`+$response =$event->getResponse();`
`169`	`168`	`}`
`170`	`169`
`171`	`170`	`return$this->filterResponse($response,$request,$type);`

Lines changed: 6 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -215,20 +215,19 @@ public function testHandleWhenTheControllerIsAStaticArray()`
`215`	`215`	`publicfunctiontestHandleWhenTheControllerDoesNotReturnAResponse()`
`216`	`216`	`{`
`217`	`217`	`$dispatcher =newEventDispatcher();`
`218`		`-$kernel =$this->getHttpKernel($dispatcher,function () {return'foo';});`
	`218`	`+$kernel =$this->getHttpKernel($dispatcher,function () {});`
`219`	`219`
`220`	`220`	`try {`
`221`	`221`	`$kernel->handle(newRequest());`
`222`	`222`
`223`	`223`	`$this->fail('The kernel should throw an exception.');`
`224`	`224`	`}catch (ControllerDoesNotReturnResponseException$e) {`
`225`		`-}`
	`225`	`+$first =$e->getTrace()[0];`
`226`	`226`
`227`		`-$first =$e->getTrace()[0];`
`228`		`-`
`229`		-// `file` index the array starting at 0, and __FILE__ starts at 1
`230`		`-$line =file($first['file'])[$first['line'] -2];`
`231`		`-$this->assertContains('// call controller',$line);`
	`227`	+// `file` index the array starting at 0, and __FILE__ starts at 1
	`228`	`+$line =file($first['file'])[$first['line'] -2];`
	`229`	`+$this->assertContains('// call controller',$line);`
	`230`	`+ }`
`232`	`231`	`}`
`233`	`232`
`234`	`233`	`publicfunctiontestHandleWhenTheControllerDoesNotReturnAResponseButAViewIsRegistered()`

Comments

(0)