Migrate to laravel 7

.gitignore

@@ -1,5 +1,4 @@
 /docker-compose-collection
-/bin
 /node_modules
 /public/hot
 /public/storage
@@ -22,7 +21,6 @@ yarn.lock
 package-lock.json
 yarn.lock
 .php_cs.cache
-storage/
 storage/*.key
 /docker-compose-collection/
 /resources/themes/velocity/*

app/Exceptions/Handler.php

@@ -2,7 +2,7 @@
 
 namespace App\Exceptions;
 
-use Exception;
+use Throwable;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
 class Handler extends ExceptionHandler
@@ -29,10 +29,10 @@ class Handler extends ExceptionHandler
     /**
      * Report or log an exception.
      *
-     * @param  \Exception  $exception
+     * @param  \Throwable  $exception
      * @return void
      */
-    public function report(Exception $exception)
+    public function report(Throwable $exception)
     {
         parent::report($exception);
     }
@@ -41,10 +41,10 @@ class Handler extends ExceptionHandler
      * Render an exception into an HTTP response.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $exception
+     * @param  \Throwable  $exception
      * @return \Illuminate\Http\Response
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {
         return parent::render($request, $exception);
     }

composer.json

@@ -9,7 +9,7 @@
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": "^7.2.0",
+        "php": "^7.2.5",
         "ext-curl": "*",
         "ext-intl": "*",
         "ext-mbstring": "*",
@@ -18,23 +18,22 @@
         "ext-pdo_mysql": "*",
         "ext-tokenizer": "*",
         "astrotomic/laravel-translatable": "^11.0.0",
-        "barryvdh/laravel-dompdf": "0.8.5",
+        "barryvdh/laravel-dompdf": "0.8.6",
         "doctrine/dbal": "2.9.2",
-        "fideloper/proxy": "^4.0",
+        "fideloper/proxy": "^4.2",
         "flynsarmy/db-blade-compiler": "^5.5",
-        "guzzlehttp/guzzle": "~6.0",
+        "guzzlehttp/guzzle": "~6.3",
         "intervention/image": "^2.4",
         "intervention/imagecache": "^2.3",
-        "kalnoy/nestedset": "5.0.0",
+        "kalnoy/nestedset": "5.0.1",
         "konekt/concord": "^1.2",
-        "laravel/framework": "^6.0",
+        "laravel/framework": "^7.0",
-        "laravel/helpers": "^1.1",
+        "laravel/tinker": "^2.0",
-        "laravel/tinker": "^1.0",
+        "maatwebsite/excel": "3.1.19",
-        "maatwebsite/excel": "3.1.18",
         "prettus/l5-repository": "^2.6",
         "tymon/jwt-auth": "^1.0.0",
         "barryvdh/laravel-debugbar": "^3.1",
-        "fzaninotto/faker": "^1.4"
+        "fzaninotto/faker": "^1.9.1"
     },
 
     "require-dev": {
@@ -46,9 +45,9 @@
         "codeception/module-webdriver": "^1.0",
         "filp/whoops": "^2.0",
         "fzaninotto/faker": "^1.4",
-        "mockery/mockery": "^1.0",
+        "mockery/mockery": "^1.3.1",
-        "nunomaduro/collision": "^2.0",
+        "nunomaduro/collision": "^4.1",
-        "phpunit/phpunit": "^7.0"
+        "phpunit/phpunit": "^8.5"
     },
 
     "replace": {

config/session.php

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

packages/Webkul/Attribute/src/Database/Factories/AttributeOptionFactory.php

@@ -30,7 +30,7 @@ $factory->define(AttributeOption::class, function (Faker $faker, array $attribut
     ];
 });
 
-$factory->defineAs(AttributeOption::class, 'swatch_color', function (Faker $faker, array $attributes) {
+$factory->define(AttributeOption::class, function (Faker $faker, array $attributes) {
     return [
         'admin_name'   => $faker->word,
         'sort_order'   => $faker->randomDigit,
@@ -43,7 +43,7 @@ $factory->defineAs(AttributeOption::class, 'swatch_color', function (Faker $fake
     ];
 });
 
-$factory->defineAs(AttributeOption::class, 'swatch_image', function (Faker $faker, array $attributes) {
+$factory->define(AttributeOption::class, function (Faker $faker, array $attributes) {
     return [
         'admin_name'   => $faker->word,
         'sort_order'   => $faker->randomDigit,
@@ -56,7 +56,7 @@ $factory->defineAs(AttributeOption::class, 'swatch_image', function (Faker $fake
     ];
 });
 
-$factory->defineAs(AttributeOption::class, 'swatch_dropdown', function (Faker $faker, array $attributes) {
+$factory->define(AttributeOption::class, function (Faker $faker, array $attributes) {
     return [
         'admin_name'   => $faker->word,
         'sort_order'   => $faker->randomDigit,
@@ -69,7 +69,7 @@ $factory->defineAs(AttributeOption::class, 'swatch_dropdown', function (Faker $f
     ];
 });
 
-$factory->defineAs(AttributeOption::class, 'swatch_text', function (Faker $faker, array $attributes) {
+$factory->define(AttributeOption::class, function (Faker $faker, array $attributes) {
     return [
         'admin_name'   => $faker->word,
         'sort_order'   => $faker->randomDigit,

packages/Webkul/Core/src/Exceptions/Handler.php

@@ -2,7 +2,7 @@
 
 namespace Webkul\Core\Exceptions;
 
-use Exception;
+use Throwable;
 use Illuminate\Auth\AuthenticationException;
 use Doctrine\DBAL\Driver\PDOException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
@@ -22,10 +22,10 @@ class Handler extends AppExceptionHandler
      * Render an exception into an HTTP response.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception   $exception
+     * @param  \Throwable   $exception
      * @return \Illuminate\Http\Response
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {
         $path = $this->isAdminUri() ? 'admin' : 'shop';