Merge pull request #14 from laravel-shift/l10-compatibility

Laravel 10.x Compatibility

.github/workflows/tests.yml

@@ -16,9 +16,11 @@ jobs:
       fail-fast: false
       matrix:
         php: [ 7.2, 7.3, 7.4, 8.0, 8.1 ]
-        laravel: [ 7.*, 8.*, 9.* ]
+        laravel: [ 7.*, 8.*, 9.* , 10.*]
         dependency-version: [ prefer-lowest, prefer-stable ]
         include:
+          - laravel: 10.*
+            testbench: 8.*
           - laravel: 7.*
             testbench: 5.*
 
@@ -33,6 +35,14 @@ jobs:
             testbench: 7.*
 
         exclude:
+          - laravel: 10.*
+            php: 7.2
+          - laravel: 10.*
+            php: 7.3
+          - laravel: 10.*
+            php: 7.4
+          - laravel: 10.*
+            php: 8.0
           - laravel: 7.*
             php: 8.1
 

composer.json

@@ -11,12 +11,12 @@
     ],
     "require": {
         "php": "^7.2|^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"
+        "illuminate/support": "^7.0|^8.0|^9.0|^10.0",
+        "illuminate/filesystem": "^7.0|^8.0|^9.0|^10.0",
+        "illuminate/console": "^7.0|^8.0|^9.0|^10.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^5.0|^6.0|^7.0",
+        "orchestra/testbench": "^5.0|^6.0|^7.0|^8.0",
         "mockery/mockery": "^1.3.3",
         "phpunit/phpunit": "^8.4|^9.5"
     },

tests/BaseTest.php

@@ -25,7 +25,11 @@ protected function setUp(): void
         // By default base_path points to the TestBench directory,
         // but we need it to reference our app. Adding this link
         // will make it transparent.
-        exec('ln -sf ' . __DIR__ . ' ' . base_path());
+        if (!File::exists(base_path() . '/tests/Support')) {
+            // Support for older versions of testbench that don't have a tests directory.
+            File::ensureDirectoryExists(base_path() . '/tests');
+            exec('ln -sf ' . __DIR__ . '/Support ' . base_path() . '/tests/Support');
+        }
     }
 
     protected function tearDown(): void