Updates as per Laravel 7 upgrade guide

composer.json

@@ -12,7 +12,7 @@
         "composer/composer": "^1.7",
         "facade/ignition-contracts": "^1.0",
         "guzzlehttp/guzzle": "^6.3",
-        "laravel/framework": "5.6.* || 5.7.* || 5.8.* || ^6.0",
+        "laravel/framework": "5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0",
         "laravel/helpers": "^1.1",
         "league/commonmark": "^1.3",
         "league/csv": "^9.0",
@@ -32,7 +32,7 @@
         "fzaninotto/faker": "~1.4",
         "google/cloud-translate": "^1.6",
         "mockery/mockery": "~1.0",
-        "nunomaduro/collision": "^3.0",
+        "nunomaduro/collision": "3.0 || ^4.1",
         "orchestra/testbench": "3.8 || 4.0"
     },
     "config": {
@@ -68,4 +68,4 @@
             "Foo\\Bar\\": "tests/fixtures/Addon"
         }
     }
-}
+}

src/Exceptions/Handler.php

@@ -2,16 +2,16 @@
 
 namespace Statamic\Exceptions;
 
-use Exception;
+use Throwable;
 use Statamic\Statamic;
 use Illuminate\Support\Facades\View;
 use App\Exceptions\Handler as ExceptionHandler;
-use Symfony\Component\Debug\Exception\FlattenException;
+use Symfony\Component\ErrorHandler\Exception\FlattenException;
 use Illuminate\Auth\Access\AuthorizationException as IlluminateAuthException;
 
 class Handler extends ExceptionHandler
 {
-    public function render($request, Exception $e)
+    public function render($request, Throwable $e)
     {
         if ($e instanceof NotFoundHttpException && Statamic::isApiRoute()) {
             return response()->json(['message' => $e->getMessage() ?: 'Not found.'], 404);
@@ -27,11 +27,11 @@ public function render($request, Exception $e)
     /**
      * Render an exception to a string using Symfony.
      *
-     * @param  \Exception  $e
+     * @param  Throwable  $e
      * @param  bool  $debug
      * @return string
      */
-    protected function renderExceptionWithSymfony(Exception $e, $debug)
+    protected function renderExceptionWithSymfony(Throwable $e, $debug)
     {
         return (new SymfonyExceptionHandler($debug))->getHtml(
             FlattenException::create($e)

src/Http/Resources/API/AssetResource.php

@@ -2,9 +2,9 @@
 
 namespace Statamic\Http\Resources\API;
 
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 
-class AssetResource extends Resource
+class AssetResource extends JsonResource
 {
     /**
      * Transform the resource into an array.

src/Http/Resources/API/EntryResource.php

@@ -2,9 +2,9 @@
 
 namespace Statamic\Http\Resources\API;
 
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 
-class EntryResource extends Resource
+class EntryResource extends JsonResource
 {
     /**
      * Transform the resource into an array.

src/Http/Resources/API/GlobalSetResource.php

@@ -2,10 +2,10 @@
 
 namespace Statamic\Http\Resources\API;
 
-use Illuminate\Http\Resources\Json\Resource;
 use Statamic\Statamic;
+use Illuminate\Http\Resources\Json\JsonResource;
 
-class GlobalSetResource extends Resource
+class GlobalSetResource extends JsonResource
 {
     /**
      * Transform the resource into an array.

src/Http/Resources/API/TermResource.php

@@ -2,9 +2,9 @@
 
 namespace Statamic\Http\Resources\API;
 
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 
-class TermResource extends Resource
+class TermResource extends JsonResource
 {
     /**
      * Transform the resource into an array.

src/Http/Resources/API/UserResource.php

@@ -2,10 +2,10 @@
 
 namespace Statamic\Http\Resources\API;
 
-use Illuminate\Http\Resources\Json\Resource;
 use Statamic\Statamic;
+use Illuminate\Http\Resources\Json\JsonResource;
 
-class UserResource extends Resource
+class UserResource extends JsonResource
 {
     /**
      * Transform the resource into an array.

src/Providers/ExtensionServiceProvider.php

@@ -6,19 +6,14 @@
 use Statamic\Actions;
 use Statamic\Fieldtypes;
 use Statamic\Query\Scopes;
+use Statamic\Extend\Manifest;
 use Statamic\Modifiers\Modifier;
-use Statamic\Extensions\FileStore;
-use Statamic\Modifiers\CoreModifiers;
 use Illuminate\Filesystem\Filesystem;
-use Illuminate\Support\Facades\Cache;
+use Statamic\Modifiers\CoreModifiers;
 use Illuminate\Support\ServiceProvider;
-use Statamic\Extend\Manifest;
-use Illuminate\Console\DetectsApplicationNamespace;
 
 class ExtensionServiceProvider extends ServiceProvider
 {
-    use DetectsApplicationNamespace;
-
     /**
      * Aliases for modifiers bundled with Statamic.
      *