Merge pull request #11 from AlexAzartsev/main

Add Laravel 9 Support

Author: aarondfrancis

.github/workflows/tests.yml

@@ -1,6 +1,12 @@
 name: Tests
 
-on: [ push, pull_request ]
+on:
+  push:
+    branches:
+      - main
+
+  pull_request:
+    types: [ opened, synchronize, reopened ]
 
 jobs:
   test:
@@ -9,8 +15,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ 7.2, 7.3, 7.4, 8.0 ]
-        laravel: [ 7.*, 8.* ]
+        php: [ 7.2, 7.3, 7.4, 8.0, 8.1 ]
+        laravel: [ 7.*, 8.*, 9.* ]
         dependency-version: [ prefer-lowest, prefer-stable ]
         include:
           - laravel: 7.*
@@ -23,11 +29,32 @@ jobs:
           - laravel: 8.*
             testbench: 6.*
 
+          - laravel: 9.*
+            testbench: 7.*
+
         exclude:
+          - laravel: 7.*
+            php: 8.1
+
+          - laravel: 8.*
+            php: 8.1
+            dependency-version: prefer-lowest
+
           # Laravel 8 requires PHP 7.3.
           - laravel: 8.*
             php: 7.2
 
+          # Laravel 9 requires PHP 8.
+          - laravel: 9.*
+            php: 7.2
+
+          - laravel: 9.*
+            php: 7.3
+
+          - laravel: 9.*
+            php: 7.4
+
+
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 
     steps:

composer.json

@@ -11,14 +11,14 @@
     ],
     "require": {
         "php": "^7.2|^8.0",
-        "illuminate/support": "^7.0|^8.0",
-        "illuminate/filesystem": "^7.0|^8.0",
-        "illuminate/console": "^7.0|^8.0"
+        "illuminate/support": "^7.0|^8.0|^9.0",
+        "illuminate/filesystem": "^7.0|^8.0|^9.0",
+        "illuminate/console": "^7.0|^8.0|^9.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^5.0|^6.0",
+        "orchestra/testbench": "^5.0|^6.0|^7.0",
         "mockery/mockery": "^1.3.3",
-        "phpunit/phpunit": "^8.4"
+        "phpunit/phpunit": "^8.4|^9.5"
     },
     "autoload": {
         "psr-4": {

src/Triggers/FileTrigger.php

@@ -39,6 +39,7 @@ public function triggerBuildWhenChanged($config = [])
                     preg_replace('/^' . preg_quote(base_path(), '/') . '/i', '', $file) => File::hash($file)
                 ];
             })
+            ->sortKeys()
             ->toArray();
     }
 

tests/Triggers/InputFilesTriggerTest.php

@@ -88,8 +88,8 @@ public function globs_get_excluded()
         $hashes = (new FileTrigger)->triggerBuildWhenChanged($config);
 
         $this->assertCount(3, $hashes);
-        $this->assertEquals('d06dee8236430e6964e23ac1277ca231', array_values($hashes)[0]);
-        $this->assertEquals('01fdb3785b52fc70114089f31b1e9eff', array_values($hashes)[1]);
-        $this->assertEquals('62f6d1bfc836a1536c4869fe8f78249b', array_values($hashes)[2]);
+        $this->assertEquals('62f6d1bfc836a1536c4869fe8f78249b', array_values($hashes)[0]);
+        $this->assertEquals('d06dee8236430e6964e23ac1277ca231', array_values($hashes)[1]);
+        $this->assertEquals('01fdb3785b52fc70114089f31b1e9eff', array_values($hashes)[2]);
     }
 }