symfony
diff --git a/‎src/Symfony/Component/HttpKernel/HttpKernel.php
Lines changed: 63 additions & 1 deletion b/‎src/Symfony/Component/HttpKernel/HttpKernel.php
Lines changed: 63 additions & 1 deletion
@@ -162,7 +162,29 @@ private function handleRaw(Request $request, int $type = self::MASTER_REQUEST)
                 if (null === $response) {
                     $msg .= ' Did you forget to add a return statement somewhere in your controller?';
                 }
-                throw new \LogicException($msg);
+
+                $e = new \LogicException($msg);
+
+                if (!$controllerDefinition = $this->parseControllerDefinition($controller)) {
+                    throw $e;
+                }
+
+                $r = new \ReflectionProperty(\Exception::class, 'trace');
+                $r->setAccessible(true);
+                $r->setValue($e, array_merge(array(
+                    array(
+                        'line' => $e->getLine(),
+                        'file' => $e->getFile(),
+                    ),
+                ), $e->getTrace()));
+                $r = new \ReflectionProperty(\Exception::class, 'file');
+                $r->setAccessible(true);
+                $r->setValue($e, $controllerDefinition['file']);
+                $r = new \ReflectionProperty(\Exception::class, 'line');
+                $r->setAccessible(true);
+                $r->setValue($e, $controllerDefinition['line']);
+
+                throw $e;
             }
         }
 
@@ -281,4 +303,44 @@ private function varToString($var): string
 
         return (string) $var;
     }
+
+    private function parseControllerDefinition(callable $controller): ?array
+    {
+        if (is_string($controller) && false !== strpos($controller, '::')) {
+            $controller = explode('::', $controller);
+        }
+
+        if (is_array($controller)) {
+            try {
+                $r = new \ReflectionMethod($controller[0], $controller[1]);
+
+                return array(
+                    'file' => $r->getFileName(),
+                    'line' => $r->getStartLine(),
+                );
+            } catch (\ReflectionException $e) {
+                return null;
+            }
+        }
+
+        if ($controller instanceof \Closure) {
+            $r = new \ReflectionFunction($controller);
+
+            return array(
+                'file' => $r->getFileName(),
+                'line' => $r->getStartLine(),
+            );
+        }
+
+        if (is_object($controller)) {
+            $r = new \ReflectionClass($controller);
+
+            return array(
+                'file' => $r->getFileName(),
+                'line' => $r->getStartLine(),
+            );
+        }
+
+        return null;
+    }
 }