jaro/meranie
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

laravel 7 migation

Browse Source
This commit is contained in:
Jaroslav Drzik
2022-10-27 13:10:19 +02:00
parent dbd0f3b68e
commit 9fada95e8a
4 changed files with 1997 additions and 2098 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Exceptions/Handler.php
View File

@@ -2,7 +2,7 @@
namespace App\Exceptions; namespace App\Exceptions;
use Exception; use Throwable;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
class Handler extends ExceptionHandler class Handler extends ExceptionHandler
@@ -34,7 +34,7 @@ class Handler extends ExceptionHandler
* *
* @throws \Exception * @throws \Exception
*/ */
public function report(Exception $exception) public function report(Throwable $exception)
{ {
parent::report($exception); parent::report($exception);
} }
@@ -48,7 +48,7 @@ class Handler extends ExceptionHandler
* *
* @throws \Exception * @throws \Exception
*/ */
public function render($request, Exception $exception) public function render($request, Throwable $exception)
{ {
return parent::render($request, $exception); return parent::render($request, $exception);
} }

33
composer.json
View File

@@ -8,21 +8,24 @@
], ],
"license": "MIT", "license": "MIT",
"require": { "require": {
"php": "^7.2.5|^8.0", "php": "^7.2.5|^8.1",
"fideloper/proxy": "^4.4", "fideloper/proxy": "^4.2",
"intervention/image": "^2.6", "fruitcake/laravel-cors": "^2.0",
"laravel/framework": "^6.20", "guzzlehttp/guzzle": "^6.3",
"laravel/tinker": "^2.5", "laravel/framework": "^7.22.2",
"laravel/ui": "1.*", "laravel/sanctum": "^2.6",
"tray-labs/laravel-influxdb": "^1.0" "laravel/tinker": "^2.0",
"laravel/ui": "^2.4",
"tray-labs/laravel-influxdb": "^1.0",
"intervention/image": "dev-master"
}, },
"require-dev": { "require-dev": {
"barryvdh/laravel-debugbar": "^3.5", "barryvdh/laravel-debugbar": "^3.5",
"facade/ignition": "^1.16.4", "facade/ignition": "^2.0",
"fakerphp/faker": "^1.9.1", "fzaninotto/faker": "^1.9.1",
"mockery/mockery": "^1.0", "mockery/mockery": "^1.3.1",
"nunomaduro/collision": "^3.0", "nunomaduro/collision": "^4.1",
"phpunit/phpunit": "^8.5.8|^9.3.3" "phpunit/phpunit": "^8.5"
}, },
"config": { "config": {
"optimize-autoloader": true, "optimize-autoloader": true,
@@ -53,13 +56,13 @@
"scripts": { "scripts": {
"post-autoload-dump": [ "post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover --ansi" "@php7 artisan package:discover --ansi"
], ],
"post-root-package-install": [ "post-root-package-install": [
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" "@php7 -r \"file_exists('.env') || copy('.env.example', '.env');\""
], ],
"post-create-project-cmd": [ "post-create-project-cmd": [
"@php artisan key:generate --ansi" "@php7 artisan key:generate --ansi"
] ]
} }
} }

4058
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

2
config/session.php
View File

@@ -166,7 +166,7 @@ return [
| |
*/ */
'secure' => env('SESSION_SECURE_COOKIE', false), 'secure' => env('SESSION_SECURE_COOKIE', null),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------