Skip to content

Commit

Permalink
laravel 9
Browse files Browse the repository at this point in the history
  • Loading branch information
recca0120 committed Feb 8, 2022
1 parent eceaa89 commit 50417fb
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@
],
"require": {
"php": ">=5.5.9",
"illuminate/contracts": "^5.1|^6.0|^7.0|^8.0",
"illuminate/database": "^5.1|^6.0|^7.0|^8.0",
"illuminate/routing": "^5.1|^6.0|^7.0|^8.0",
"illuminate/session": "^5.1|^6.0|^7.0|^8.0",
"illuminate/support": "^5.1|^6.0|^7.0|^8.0",
"illuminate/view": "^5.1|^6.0|^7.0|^8.0",
"illuminate/contracts": "^5.1|^6.0|^7.0|^8.0|^9.0",
"illuminate/database": "^5.1|^6.0|^7.0|^8.0|^9.0",
"illuminate/routing": "^5.1|^6.0|^7.0|^8.0|^9.0",
"illuminate/session": "^5.1|^6.0|^7.0|^8.0|^9.0",
"illuminate/support": "^5.1|^6.0|^7.0|^8.0|^9.0",
"illuminate/view": "^5.1|^6.0|^7.0|^8.0|^9.0",
"recca0120/terminal": "^1.8",
"tracy/tracy": ">=2.4,<2.9"
},
"require-dev": {
"mockery/mockery": "^1.0",
"nesbot/carbon": "^1.20|^2.0",
"orchestra/testbench": "^2.0|^3.0|^4.18|^5.20|^6.23",
"orchestra/testbench": "^2.0|^3.0|^4.18|^5.20|^6.23|^7.0",
"phpunit/phpunit": "^4.8|^5.4|^6.1|^7.0|^8.0|^9.0"
},
"autoload": {
Expand Down
2 changes: 1 addition & 1 deletion src/DebuggerManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public static function init($config = [])
'scream' => true,
'showLocation' => true,
'strictMode' => true,
'currentTime' => $_SERVER['REQUEST_TIME_FLOAT'] ?: microtime(true),
'currentTime' => array_key_exists('REQUEST_TIME_FLOAT', $_SERVER) ? $_SERVER['REQUEST_TIME_FLOAT'] : microtime(true),
'editorMapping' => isset(Debugger::$editorMapping) === true ? Debugger::$editorMapping : [],
], $config);

Expand Down
2 changes: 1 addition & 1 deletion src/Exceptions/Handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public function render($request, Throwable $e)
$response = $this->exceptionHandler->render($request, $e);

if ($this->shouldRenderException($response) === true) {
$_SERVER = $request->server();
$_SERVER = (array) $request->server();
$response->setContent($this->debuggerManager->exceptionHandler($e));
}

Expand Down
2 changes: 1 addition & 1 deletion tests/Exceptions/HandlerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ public function testRender()
$response = m::spy(SymfonyResponse::class);
$exceptionHandler->expects('render')->with($request, $exception)->andReturns($response);

$response->expects('getContent')->andReturns(null);
$response->expects('getContent')->andReturns('');
$debuggerManager->expects('exceptionHandler')->with($exception)->andReturns($content = 'foo');
$response->expects('setContent')->with($content);

Expand Down

0 comments on commit 50417fb

Please sign in to comment.