Merge pull request #87 from mvdnbrk/laravel8

Laravel 8
blade-ui-kit · Sep 4, 2020 · b47ad40 · b47ad40
2 parents fdbf51b + 61e6e79
commit b47ad40
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -14,7 +14,10 @@ jobs:
       fail-fast: true
       matrix:
         php: [7.2, 7.3, 7.4]
-        laravel: [^7.0]
+        laravel: [^7.0, ^8.0]
+        exclude:
+          - php: 7.2
+            laravel: ^8.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }}
 

diff --git a/composer.json b/composer.json
@@ -22,15 +22,15 @@
     ],
     "require": {
         "php": "^7.2",
-        "illuminate/contracts": "^7.14",
-        "illuminate/filesystem": "^7.14",
-        "illuminate/support": "^7.14",
-        "illuminate/view": "^7.14"
+        "illuminate/contracts": "^7.14|^8.0",
+        "illuminate/filesystem": "^7.14|^8.0",
+        "illuminate/support": "^7.14|^8.0",
+        "illuminate/view": "^7.14|^8.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.16",
         "mockery/mockery": "^1.3",
-        "orchestra/testbench": "^5.0",
+        "orchestra/testbench": "^5.0|^6.0",
         "phpunit/phpunit": "^8.0|^9.0"
     },
     "autoload": {

diff --git a/tests/ComponentsTest.php b/tests/ComponentsTest.php
@@ -17,13 +17,20 @@ public function components_are_registered_with_their_subdirectories()
 
         $factory->registerComponents();
 
-        $this->assertSame([
+        $compiled = Blade::getClassComponentAliases();
+
+        $expected = [
             'icon-camera' => Svg::class,
             'icon-foo-camera' => Svg::class,
             'icon-solid.camera' => Svg::class,
             'icon-zondicon-flag' => Svg::class,
             'zondicon-flag' => Svg::class,
-        ], Blade::getClassComponentAliases());
+        ];
+
+        foreach ($expected as $alias => $component) {
+            $this->assertArrayHasKey($alias, $compiled);
+            $this->assertSame(Svg::class, $component);
+        }
     }
 
     /** @test */