Skip to content

Commit

Permalink
Upgrade to Laravel 7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Carlos Villavicencio committed Mar 23, 2020
1 parent a600437 commit abcc2c7
Show file tree
Hide file tree
Showing 5 changed files with 641 additions and 464 deletions.
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: php
php:
- 5.5
- 7.0
- 7.3
install:
- composer install
env:
Expand All @@ -15,5 +14,5 @@ env:
- TWILIO_AUTH_TOKEN=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- TWILIO_NUMBER=+15552737123
before_script:
- psql -c 'create database airtng;' -U postgres
- php artisan migrate
- touch database/database-test.sqlite
- php artisan migrate --database=testing --force
18 changes: 10 additions & 8 deletions app/Exceptions/Handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace App\Exceptions;

use Exception;
use Throwable;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
Expand All @@ -23,12 +23,12 @@ class Handler extends ExceptionHandler
/**
* Report or log an exception.
*
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
*
* @param \Exception $e
* @param \Throwable $exception
* @return void
*
* @throws \Exception
*/
public function report(Exception $e)
public function report(Throwable $e)
{
return parent::report($e);
}
Expand All @@ -37,10 +37,12 @@ public function report(Exception $e)
* Render an exception into an HTTP response.
*
* @param \Illuminate\Http\Request $request
* @param \Exception $e
* @return \Illuminate\Http\Response
* @param \Throwable $exception
* @return \Symfony\Component\HttpFoundation\Response
*
* @throws \Throwable
*/
public function render($request, Exception $e)
public function render($request, Throwable $e)
{
if ($e instanceof ModelNotFoundException) {
$e = new NotFoundHttpException($e->getMessage(), $e);
Expand Down
18 changes: 9 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
"license": "MIT",
"type": "project",
"require": {
"php": ">=7.2",
"fideloper/proxy": "^4.0",
"laravel/framework": "5.8.*",
"laravel/tinker": "^1.0",
"twilio/sdk": "^5.0",
"laravelcollective/html": "5.8.*"
"php": "^7.2.5",
"fideloper/proxy": "^4.2",
"laravel/framework": "^7.2",
"laravel/tinker": "^2.3",
"twilio/sdk": "^6.1.0",
"laravelcollective/html": "^6.1"
},
"require-dev": {
"fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*",
"phpunit/phpunit": "^7.5",
"fzaninotto/faker": "^1.9.1",
"mockery/mockery": "^1.3.1",
"phpunit/phpunit": "^8.5",
"phpspec/phpspec": "~6.1"
},
"extra": {
Expand Down
Loading

0 comments on commit abcc2c7

Please sign in to comment.