Laravel 8 fix (#288)

* Updated registration of console service provider into the register method instead of the boot

* Style fixes

Author: Quentin Schmick

src/Providers/ConsoleServiceProvider.php

@@ -7,6 +7,7 @@
 use Illuminate\Support\ServiceProvider;
 use Studio\Totem\Events\Executed;
 use Studio\Totem\Events\Executing;
+use Studio\Totem\Totem;
 
 class ConsoleServiceProvider extends ServiceProvider
 {
@@ -17,9 +18,11 @@ class ConsoleServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->app->resolving(Schedule::class, function ($schedule) {
-            $this->schedule($schedule);
-        });
+        if (Totem::baseTableExists()) {
+            $this->app->resolving(Schedule::class, function ($schedule) {
+                $this->schedule($schedule);
+            });
+        }
     }
 
     /**

src/Providers/TotemServiceProvider.php

@@ -4,15 +4,13 @@
 
 use Cron\CronExpression;
 use Illuminate\Http\UploadedFile;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\ServiceProvider;
 use Studio\Totem\Console\Commands\ListSchedule;
 use Studio\Totem\Console\Commands\PublishAssets;
 use Studio\Totem\Contracts\TaskInterface;
 use Studio\Totem\Repositories\EloquentTaskRepository;
-use Studio\Totem\Totem;
 
 class TotemServiceProvider extends ServiceProvider
 {
@@ -23,14 +21,6 @@ class TotemServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        try {
-            if (Totem::baseTableExists()) {
-                $this->app->register(ConsoleServiceProvider::class);
-            }
-        } catch (\PDOException $ex) {
-            // This will trigger if DB cannot be connected to
-            Log::error($ex->getMessage());
-        }
         $this->registerResources();
         $this->defineAssetPublishing();
 
@@ -77,6 +67,7 @@ public function register()
         $this->app->register(TotemRouteServiceProvider::class);
         $this->app->register(TotemEventServiceProvider::class);
         $this->app->register(TotemFormServiceProvider::class);
+        $this->app->register(ConsoleServiceProvider::class);
     }
 
     /**

tests/Feature/AuthTest.php

@@ -32,7 +32,8 @@ public function auth_middleware_works()
         $middleware = new Authenticate;
 
         $response = $middleware->handle(
-            new class {
+            new class
+            {
             },
             function ($value) {
                 return 'response';
@@ -55,7 +56,8 @@ public function auth_middleware_responds_with_403_on_failure()
         $middleware = new Authenticate;
 
         $response = $middleware->handle(
-            new class {
+            new class
+            {
             },
             function ($value) {
                 return 'response';

tests/TestCase.php

@@ -74,7 +74,8 @@ protected function getPackageProviders($app)
      */
     protected function disableExceptionHandling()
     {
-        $this->app->instance(ExceptionHandler::class, new class() extends Handler {
+        $this->app->instance(ExceptionHandler::class, new class() extends Handler
+        {
             public function __construct()
             {
             }