Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.

Commit d03901d

Browse files
authored
fix(WhoopsError): ensure the SCRIPT_NAME is set before attempting to use it
1 parent 581d58d commit d03901d

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

src/Middleware/WhoopsErrorResponseGenerator.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,18 @@ private function prepareWhoopsHandler(ServerRequestInterface $request, PrettyPag
9191
{
9292
$uri = $request->getAttribute('originalUri', false) ?: $request->getUri();
9393
$request = $request->getAttribute('originalRequest', false) ?: $request;
94+
95+
$serverParams = $request->getServerParams();
96+
$scriptName = '';
97+
98+
if (isset($serverParams['SCRIPT_NAME'])) {
99+
$scriptName = $serverParams['SCRIPT_NAME'];
100+
}
94101

95102
$handler->addDataTable('Expressive Application Request', [
96103
'HTTP Method' => $request->getMethod(),
97104
'URI' => (string) $uri,
98-
'Script' => $request->getServerParams()['SCRIPT_NAME'],
105+
'Script' => $scriptName,
99106
'Headers' => $request->getHeaders(),
100107
'Cookies' => $request->getCookieParams(),
101108
'Attributes' => $request->getAttributes(),

0 commit comments

Comments
 (0)