Skip to content

Commit

Permalink
Merge pull request #38 from specialtactics/v2
Browse files Browse the repository at this point in the history
V2 - Laravel 7 updates to base template
  • Loading branch information
specialtactics authored May 12, 2020
2 parents 2b5158f + ece6578 commit 087916e
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 18 deletions.
2 changes: 2 additions & 0 deletions app/Exceptions/ApiExceptionHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
/**
* This class extends the Dingo API Exception Handler, and can be used to modify it's functionality, if required
*
* Unless you have a specific-use case and understand what you are doing, it's best not to modify this.
*
* Class ApiHandler
*/
class ApiExceptionHandler extends RestfulApiExceptionHandler
Expand Down
15 changes: 10 additions & 5 deletions app/Exceptions/Handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,14 @@

namespace App\Exceptions;

use Exception;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Throwable;

/**
* This is your application's exception handler
*
* Class Handler
*/
class Handler extends ExceptionHandler
{
/**
Expand All @@ -29,10 +34,10 @@ class Handler extends ExceptionHandler
/**
* Report or log an exception.
*
* @param \Exception $exception
* @param Throwable $exception
* @return void
*/
public function report(Exception $exception)
public function report(Throwable $exception)
{
parent::report($exception);
}
Expand All @@ -41,10 +46,10 @@ public function report(Exception $exception)
* Render an exception into an HTTP response.
*
* @param \Illuminate\Http\Request $request
* @param \Exception $exception
* @param Throwable $exception
* @return \Illuminate\Http\Response
*/
public function render($request, Exception $exception)
public function render($request, Throwable $exception)
{
return parent::render($request, $exception);
}
Expand Down
24 changes: 12 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@
}
],
"require": {
"php": "^7.2",
"fideloper/proxy": "^4.0",
"laravel/framework": "^6",
"laravel/tinker": "^1.0",
"specialtactics/l5-api": "^1.1"
"php": "^7.2.5",
"fideloper/proxy": "^4.2",
"laravel/framework": "^7.0",
"laravel/tinker": "^2.4",
"specialtactics/l5-api": "^2.0"
},
"require-dev": {
"barryvdh/laravel-ide-helper": "^2.4",
"beyondcode/laravel-dump-server": "^1.0",
"facade/ignition": "^1.4",
"fzaninotto/faker": "^1.4",
"laravel/telescope": "^2",
"barryvdh/laravel-ide-helper": "^2.7",
"beyondcode/laravel-dump-server": "^1.4",
"facade/ignition": "^2.0",
"fzaninotto/faker": "^1.9",
"laravel/telescope": "^3.3",
"mockery/mockery": "^1.0",
"nunomaduro/collision": "^3.0",
"phpunit/phpunit": "^8.3"
"nunomaduro/collision": "^4.2",
"phpunit/phpunit": "^8.5"
},
"config": {
"optimize-autoloader": true,
Expand Down
2 changes: 1 addition & 1 deletion config/telescope.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
|
| Change to 'dark' for dark mode
*/
'ui-mode' => env('TELESCOPE_UI_MODE', 'light'),
'ui-mode' => env('TELESCOPE_UI_MODE', 'light'),

/*
|--------------------------------------------------------------------------
Expand Down

0 comments on commit 087916e

Please sign in to comment.