Add Laravel 8 support (#7)

Author: dmason30

.github/workflows/run-tests.yml

@@ -10,11 +10,11 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest]
         php: [7.4]
-        laravel: [7.*]
+        laravel: [8.*]
         dependency-version: [prefer-lowest, prefer-stable]
         include:
-          - laravel: 7.*
-            testbench: 5.*
+          - laravel: 8.*
+            testbench: 6.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 

composer.json

@@ -13,24 +13,24 @@
         {
             "name": "Daniel Mason",
             "email": "fidum.dev@gmail.com",
-            "homepage": "https://danielmason.co.uk",
+            "homepage": "https://fidum.uk",
             "role": "Developer"
         }
     ],
     "require": {
         "php": "^7.4",
-        "fidum/laravel-dashboard-chart-tile": "^3.0",
-        "illuminate/console": "^7.0",
-        "illuminate/support": "^7.0",
+        "fidum/laravel-dashboard-chart-tile": "^4.0",
+        "illuminate/console": "^8.0",
+        "illuminate/support": "^8.0",
         "laravel/vapor-cli": "^1.0",
-        "spatie/laravel-dashboard": "^1.1"
+        "spatie/laravel-dashboard": "^2.0"
     },
     "require-dev": {
-        "nunomaduro/laravel-mojito": "^0.2.4",
-        "orchestra/testbench": "^5.0",
-        "phpunit/phpunit": "^9.0",
-        "psalm/plugin-laravel": "^1.2",
-        "vimeo/psalm": "^3.11"
+        "nunomaduro/laravel-mojito": "^0.2.5",
+        "orchestra/testbench": "^6.0",
+        "phpunit/phpunit": "^9.3",
+        "psalm/plugin-laravel": "dev-master",
+        "vimeo/psalm": "^3.15"
     },
     "autoload": {
         "psr-4": {

tests/Unit/Components/VaporCacheMetricsComponentTest.php

@@ -29,7 +29,7 @@ public function testRenderNoResults()
             ->set('tileName', 'My Cache Changed')
             ->call('render');
 
-        $html = $result->payload['dom'];
+        $html = $result->lastRenderedDom;
 
         $result->assertSee('My Cache Changed')
             ->assertViewHas('refreshIntervalInSeconds', 60);
@@ -57,7 +57,7 @@ public function testRenderSingleNode()
             ->set('tileName', 'My Cache Defaults')
             ->call('render');
 
-        $html = $result->payload['dom'];
+        $html = $result->lastRenderedDom;
 
         $result->assertSee('My Cache Defaults')
             ->assertViewHas('refreshIntervalInSeconds', VaporMetricsClient::DEFAULT_REFRESH_SECONDS);
@@ -88,7 +88,7 @@ public function testRenderMultipleNodes()
         $result->assertSee('My Cache Defaults')
             ->assertViewHas('refreshIntervalInSeconds', VaporMetricsClient::DEFAULT_REFRESH_SECONDS);
 
-        $assert = new ViewAssertion($result->payload['dom']);
+        $assert = new ViewAssertion($result->lastRenderedDom);
 
         $assert->contains('Node 1')
             ->contains('43% <span class="text-dimmed text-xs">Average CPU Utilization</span>')

tests/Unit/Components/VaporDatabaseMetricsComponentTest.php

@@ -29,7 +29,7 @@ public function testRenderNoResults()
             ->set('tileName', 'My DB Changed')
             ->call('render');
 
-        $html = $result->payload['dom'];
+        $html = $result->lastRenderedDom;
 
         $result->assertSee('My DB Changed')
             ->assertViewHas('refreshIntervalInSeconds', 60);
@@ -54,7 +54,7 @@ public function testRenderSingleNode()
             ->set('tileName', 'My DB Defaults')
             ->call('render');
 
-        $html = $result->payload['dom'];
+        $html = $result->lastRenderedDom;
 
         $result->assertSee('My DB Defaults')
             ->assertViewHas('refreshIntervalInSeconds', VaporMetricsClient::DEFAULT_REFRESH_SECONDS);

tests/Unit/Components/VaporEnvironmentMetricsComponentTest.php

@@ -29,7 +29,7 @@ public function testRenderNoResults()
             ->set('tileName', 'My Env Changed')
             ->call('render');
 
-        $html = $result->payload['dom'];
+        $html = $result->lastRenderedDom;
 
         $result->assertSee('My Env Changed')
             ->assertViewHas('refreshIntervalInSeconds', 60);
@@ -62,7 +62,7 @@ public function testRenderSingleNode()
             ->set('tileName', 'My Env Defaults')
             ->call('render');
 
-        $html = $result->payload['dom'];
+        $html = $result->lastRenderedDom;
 
         $result->assertSee('My Env Defaults')
             ->assertViewHas('refreshIntervalInSeconds', VaporMetricsClient::DEFAULT_REFRESH_SECONDS);