symfony
diff --git a/‎src/Symfony/Component/HttpKernel/Exception/ControllerDoesNotReturnResponseException.php
Lines changed: 7 additions & 1 deletion b/‎src/Symfony/Component/HttpKernel/Exception/ControllerDoesNotReturnResponseException.php
Lines changed: 7 additions & 1 deletion
diff --git a/‎src/Symfony/Component/HttpKernel/HttpKernel.php
Lines changed: 10 additions & 11 deletions b/‎src/Symfony/Component/HttpKernel/HttpKernel.php
Lines changed: 10 additions & 11 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
Lines changed: 6 additions & 7 deletions b/‎src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
Lines changed: 6 additions & 7 deletions
@@ -67,9 +67,15 @@ private function parseControllerDefinition(callable $controller): ?array
         if (\is_object($controller)) {
             $r = new \ReflectionClass($controller);
 
+            try {
+                $line = $r->getMethod('__invoke')->getEndLine();
+            } catch (\ReflectionException $e) {
+                $line = $r->getEndLine();
+            }
+
             return [
                 'file' => $r->getFileName(),
-                'line' => $r->getEndLine(),
+                'line' => $line,
             ];
         }
 
 
@@ -154,18 +154,17 @@ private function handleRaw(Request $request, int $type = self::MASTER_REQUEST)
             $event = new GetResponseForControllerResultEvent($this, $request, $type, $response);
             $this->dispatcher->dispatch(KernelEvents::VIEW, $event);
 
-            if ($event->hasResponse()) {
-                $response = $event->getResponse();
-            } else {
-                $msg = sprintf('The controller must return a "Symfony\Component\HttpFoundation\Response" object but it returned %s.', $this->varToString($response));
-
-                // the user may have forgotten to return something
-                if (null === $response) {
-                    $msg .= ' Did you forget to add a return statement somewhere in your controller?';
-                }
-
-                throw new ControllerDoesNotReturnResponseException($msg, $controller, __FILE__, __LINE__ - 17);
+            if (!$event->hasResponse()) {
+                $message = sprintf(
+                    'The controller must return a "Symfony\Component\HttpFoundation\Response" object but it returned %s.%s',
+                    $this->varToString($response),
+                    ' Did you forget to add a return statement somewhere in your controller?'
+                );
+
+                throw new ControllerDoesNotReturnResponseException($message, $controller, __FILE__, __LINE__ - 14);
             }
+
+            $response = $event->getResponse();
         }
 
         return $this->filterResponse($response, $request, $type);
 
@@ -215,20 +215,19 @@ public function testHandleWhenTheControllerIsAStaticArray()
     public function testHandleWhenTheControllerDoesNotReturnAResponse()
     {
         $dispatcher = new EventDispatcher();
-        $kernel = $this->getHttpKernel($dispatcher, function () { return 'foo'; });
+        $kernel = $this->getHttpKernel($dispatcher, function () {});
 
         try {
             $kernel->handle(new Request());
 
             $this->fail('The kernel should throw an exception.');
         } catch (ControllerDoesNotReturnResponseException $e) {
-        }
+            $first = $e->getTrace()[0];
 
-        $first = $e->getTrace()[0];
-
-        // `file` index the array starting at 0, and __FILE__ starts at 1
-        $line = file($first['file'])[$first['line'] - 2];
-        $this->assertContains('// call controller', $line);
+            // `file` index the array starting at 0, and __FILE__ starts at 1
+            $line = file($first['file'])[$first['line'] - 2];
+            $this->assertContains('// call controller', $line);
+        }
     }
 
     public function testHandleWhenTheControllerDoesNotReturnAResponseButAViewIsRegistered()