Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/obissick/maxinero
Browse files Browse the repository at this point in the history
  • Loading branch information
obissick committed Dec 1, 2023
2 parents 577e633 + a4e216d commit 00c0081
Show file tree
Hide file tree
Showing 11 changed files with 2,934 additions and 763 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/laravel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ jobs:
- uses: actions/checkout@v1
- name: Copy .env
run: php -r "file_exists('.env') || copy('.env.example', '.env');"
- name: update packages
run: composer update
- name: Install Dependencies
run: composer install -q --no-ansi --no-interaction --no-scripts --no-suggest --no-progress --prefer-dist
- name: Generate key
Expand Down
7 changes: 4 additions & 3 deletions app/Exceptions/Handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

namespace App\Exceptions;

use Exception;
use Throwable;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use PhpParser\ErrorHandler\Throwing;

class Handler extends ExceptionHandler
{
Expand Down Expand Up @@ -32,7 +33,7 @@ class Handler extends ExceptionHandler
* @param \Exception $exception
* @return void
*/
public function report(Exception $exception)
public function report(Throwable $exception)
{
parent::report($exception);
}
Expand All @@ -44,7 +45,7 @@ public function report(Exception $exception)
* @param \Exception $exception
* @return \Illuminate\Http\Response
*/
public function render($request, Exception $exception)
public function render($request, Throwable $exception)
{
return parent::render($request, $exception);
}
Expand Down
18 changes: 10 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,22 @@
"license": "MIT",
"type": "project",
"require": {
"php": "^7.1.3",
"php": "^7.2|^8.0",
"coreui/coreui": "3.2.0",
"fideloper/proxy": "^4.0",
"guzzlehttp/guzzle": "~6.0",
"laravel/cashier": "^9.3",
"laravel/framework": "5.8.*",
"laravel/telescope": "^2.1",
"laravel/tinker": "^1.0"
"guzzlehttp/guzzle": "^7.0.1",
"laravel/framework": "^8.0",
"laravel/helpers": "^1.4",
"laravel/telescope": "^4.0",
"laravel/tinker": "^3.0",
"laravel/ui": "^3.0"
},
"require-dev": {
"filp/whoops": "^2.0",
"fzaninotto/faker": "^1.4",
"mockery/mockery": "^1.0",
"nunomaduro/collision": "^2.0",
"phpunit/phpunit": "^7.0"
"nunomaduro/collision": "^5.0",
"phpunit/phpunit": "^9.0"
},
"autoload": {
"classmap": [
Expand Down
Loading

0 comments on commit 00c0081

Please sign in to comment.