Laravel 5.8 Compatibility

composer.json

@@ -27,14 +27,15 @@
         "phpseclib/phpseclib": "~2.0",
         "doctrine/dbal": "~2.5",
         "ramsey/uuid": "^3.5",
-        "laravel/framework": "5.7.*"
+        "laravel/framework": "5.8.*"
     },
     "require-dev": {
         "phpunit/phpunit": "~7.0",
         "symfony/dom-crawler": "~3.1",
-        "laravel/laravel": "5.7.*",
+        "laravel/laravel": "5.8.*",
         "mockery/mockery": "^0.9.9",
-        "fzaninotto/faker": "^1.8"
+        "fzaninotto/faker": "^1.8",
+        "laravel/helpers": "^1.0"
     },
     "autoload": {
         "psr-4": {

src/Providers/Tenants/HostnameProvider.php

@@ -19,11 +19,10 @@
 use Hyn\Tenancy\Environment;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Contracts\Support\DeferrableProvider;
 
-class HostnameProvider extends ServiceProvider
+class HostnameProvider extends ServiceProvider implements DeferrableProvider
 {
-    public $defer = true;
-
     public function provides()
     {
         return [

src/Traits/DispatchesEvents.php

@@ -26,6 +26,6 @@ trait DispatchesEvents
      */
     public function emitEvent(AbstractEvent $event, array $payload = [])
     {
-        return app(Dispatcher::class)->fire($event, $payload);
+        return app(Dispatcher::class)->dispatch($event, $payload);
     }
 }

tests/Test.php

@@ -89,7 +89,7 @@ public function createApplication()
         return $app;
     }
 
-    protected function setUp()
+    protected function setUp() : void
     {
         parent::setUp();
 
@@ -127,7 +127,7 @@ protected function pathIdentified(string $path)
         // ..
     }
 
-    protected function tearDown()
+    protected function tearDown() : void
     {
         Queue::createPayloadUsing(null);
         $this->cleanupTenancy();

tests/traits/InteractsWithTenancy.php

@@ -22,6 +22,7 @@
 use Hyn\Tenancy\Models\Hostname;
 use Hyn\Tenancy\Models\Website;
 use Hyn\Tenancy\Traits\DispatchesEvents;
+use Illuminate\Support\Arr;
 
 trait InteractsWithTenancy
 {
@@ -93,7 +94,7 @@ protected function handleTenantDestruction()
             }
         });
         Website::deleted(function (Website $website) {
-            array_forget($this->tenants, $website->uuid);
+            Arr::forget($this->tenants, $website->uuid);
         });
     }
 

tests/unit-tests/Providers/RouteProviderTest.php

@@ -90,7 +90,7 @@ protected function overrideGlobalRoute()
         $this->assertEquals('tenant', $route->getName());
     }
 
-    protected function tearDown()
+    protected function tearDown() : void
     {
         unlink(base_path('routes/tenants.php'));