Skip to content
This repository was archived by the owner on Nov 16, 2022. It is now read-only.

Commit 160d59b

Browse files
authored
Merge pull request #24 from ibrunotome/v7.x
chore: upgrade to Laravel v7.x
2 parents c01811d + 66cac55 commit 160d59b

File tree

13 files changed

+3080
-3778
lines changed

13 files changed

+3080
-3778
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ This is a starter kit for your next API using Laravel, implemented with more tha
3131
- Device authorization
3232
- Etag
3333
- Horizon
34-
- Laravel [6.x](https://github.com/ibrunotome/laravel-api-templates/tree/v6.x), [5.8](https://github.com/ibrunotome/laravel-api-templates/tree/v5.8)
34+
- Laravel [7.x](https://github.com/ibrunotome/laravel-api-templates/tree/v7.x), [6.x](https://github.com/ibrunotome/laravel-api-templates/tree/v6.x), [5.8](https://github.com/ibrunotome/laravel-api-templates/tree/v5.8)
3535
- Login
3636
- Login history
3737
- Multiple localizations, preconfigured with en_US and pt_BR

default-structure/app/Exceptions/Handler.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace App\Exceptions;
44

55
use App\Http\ResponseTrait;
6-
use Exception;
76
use Illuminate\Auth\Access\AuthorizationException;
87
use Illuminate\Auth\AuthenticationException;
98
use Illuminate\Database\Eloquent\ModelNotFoundException;
@@ -14,6 +13,7 @@
1413
use Illuminate\Http\Response;
1514
use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
1615
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
16+
use Throwable;
1717

1818
class Handler extends ExceptionHandler
1919
{
@@ -23,10 +23,11 @@ class Handler extends ExceptionHandler
2323
* Render an exception into an HTTP response.
2424
*
2525
* @param \Illuminate\Http\Request $request
26-
* @param \Exception $exception
26+
* @param \Throwable $exception
2727
* @return \Illuminate\Http\Response|\Symfony\Component\HttpFoundation\Response
28+
* @throws \Exception
2829
*/
29-
public function render($request, Exception $exception)
30+
public function render($request, Throwable $exception)
3031
{
3132
$exceptionInstance = get_class($exception);
3233

default-structure/composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@
2222
"fntneves/laravel-transactional-events": "^1.8",
2323
"ibrunotome/google2fa-laravel": "^1.0",
2424
"jenssegers/agent": "^2.6",
25-
"laravel/framework": "^6.18.35",
26-
"laravel/horizon": "^3.2",
25+
"laravel/framework": "^7.24",
26+
"laravel/horizon": "^4.0",
2727
"laravel/slack-notification-channel": "^2.0",
2828
"laravel/tinker": "^2.0",
29+
"laravel/ui": "^2.2",
2930
"league/flysystem-aws-s3-v3": "^1.0",
3031
"owen-it/laravel-auditing": "^10.0",
3132
"spatie/laravel-permission": "^3.0",
@@ -35,13 +36,12 @@
3536
},
3637
"require-dev": {
3738
"barryvdh/laravel-ide-helper": "^2.7",
38-
"facade/ignition": "^1.4",
39+
"facade/ignition": "^2.0",
3940
"fzaninotto/faker": "^1.9.1",
4041
"mockery/mockery": "^1.0",
41-
"nunomaduro/collision": "^3.0",
42-
"nunomaduro/larastan": "^0.3.16",
42+
"nunomaduro/collision": "^4.1",
4343
"nunomaduro/phpinsights": "^1.0",
44-
"phpunit/phpunit": "^8.0"
44+
"phpunit/phpunit": "^9.0"
4545
},
4646
"autoload": {
4747
"classmap": [

0 commit comments

Comments
 (0)