migrate project to laravel 8

pull/32/head
azizi 4 years ago
parent a226646d7d
commit 6262ce691e

@ -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
@ -29,10 +29,10 @@ class Handler extends ExceptionHandler
/** /**
* Report or log an exception. * Report or log an exception.
* *
* @param \Exception $exception * @param \Throwable $exception
* @return void * @return void
*/ */
public function report(Exception $exception) public function report(Throwable $exception)
{ {
parent::report($exception); parent::report($exception);
} }
@ -41,10 +41,10 @@ class Handler extends ExceptionHandler
* Render an exception into an HTTP response. * Render an exception into an HTTP response.
* *
* @param \Illuminate\Http\Request $request * @param \Illuminate\Http\Request $request
* @param \Exception $exception * @param \Throwable $exception
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function render($request, Exception $exception) public function render($request, Throwable $exception)
{ {
return parent::render($request, $exception); return parent::render($request, $exception);
} }

@ -8,15 +8,15 @@
], ],
"license": "MIT", "license": "MIT",
"require": { "require": {
"php": "^7.2", "php": "^7.4",
"coraxster/flysystem-aws-s3-v3-minio": "^1.0", "coraxster/flysystem-aws-s3-v3-minio": "^1.0",
"fideloper/proxy": "^4.0", "fideloper/proxy": "^4.0",
"kalnoy/nestedset": "^5.0", "kalnoy/nestedset": "^5.0",
"laravel/framework": "^6.2", "laravel/framework": "^8.0",
"laravel/passport": "^7.3", "laravel/passport": "^10",
"laravel/tinker": "^1.0", "laravel/tinker": "^2.0",
"maatwebsite/excel": "^3.1", "maatwebsite/excel": "^3.1",
"spatie/laravel-medialibrary": "^7.0.0", "spatie/laravel-medialibrary": "^8.0.0",
"wm/blog": "dev-master", "wm/blog": "dev-master",
"wm/common": "dev-master", "wm/common": "dev-master",
"wm/core": "dev-master", "wm/core": "dev-master",
@ -24,16 +24,17 @@
"wm/portfolio": "dev-master", "wm/portfolio": "dev-master",
"wm/product": "dev-master", "wm/product": "dev-master",
"wm/service": "dev-master", "wm/service": "dev-master",
"wm/store": "dev-master",
"wm/warehouse": "dev-master",
"zircote/swagger-php": "^3.0" "zircote/swagger-php": "^3.0"
}, },
"provide": {
"ext-imagick": "*"
},
"require-dev": { "require-dev": {
"facade/ignition": "^1.4", "facade/ignition": "^2.3.6",
"fzaninotto/faker": "^1.4", "fzaninotto/faker": "^1.4",
"mockery/mockery": "^1.0", "mockery/mockery": "^1.0",
"nunomaduro/collision": "^3.0", "nunomaduro/collision": "^5.0",
"phpunit/phpunit": "^8.0" "phpunit/phpunit": "^9.0"
}, },
"config": { "config": {
"optimize-autoloader": true, "optimize-autoloader": true,
@ -102,14 +103,7 @@
{ {
"type": "path", "type": "path",
"url": "./modules/wm-service" "url": "./modules/wm-service"
},
{
"type": "path",
"url": "./modules/wm-store"
},
{
"type": "path",
"url": "./modules/wm-warehouse"
} }
] ]
} }

3444
composer.lock generated

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save