Support Laravel 8 (#495)

* Update run-tests.yml * Update composer.json * Update run-tests.yml * Update run-tests.yml * Update run-tests.yml * Update run-tests.yml * Update run-tests.yml * Update run-tests.yml
fruitcake · Sep 7, 2020 · 4b19bfc · 4b19bfc
1 parent f12db78
commit 4b19bfc
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 51 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -1,3 +1,5 @@
+name: Unit Tests
+
 on:
   push:
     branches:
@@ -11,64 +13,43 @@ on:
 jobs:
   php-tests:
     runs-on: ubuntu-latest
+    timeout-minutes: 15
+    env:
+      COMPOSER_NO_INTERACTION: 1
 
     strategy:
       matrix:
         php: [7.4, 7.3, 7.2]
-        laravel: [7.*]
-        testbench: [5.*]
-        dependency-version: [prefer-lowest, prefer-stable]
+        laravel: [^8, ^7, ^6]
+        dependency-version: [prefer-stable]
+        exclude:
+          - laravel: ^8
+            php: 7.2
         include:
-          - laravel: 7.*
-            testbench: 5.*
-            php: 7.4
-            dependency-version: prefer-stable
-          - laravel: 6.*
-            testbench: 4.*
-            php: 7.3
-            dependency-version: prefer-stable
-          - laravel: 5.8.*
-            testbench: 3.8.*
-            php: 7.3
-            dependency-version: prefer-stable
-          - laravel: 5.7.*
-            testbench: 3.7.*
+          - laravel: ^7
             php: 7.2
-            dependency-version: prefer-stable
-          - laravel: 5.6.*
-            testbench: 3.6.*
-            php: 7.1
-            dependency-version: prefer-stable
-          - laravel: 8.*
-            testbench: 6.*
-            php: 7.4
-            dependency-version: prefer-stable
-        exclude:
-          - laravel: 5.7.*
-            php: 7.4
-          - laravel: 5.6.*
-            php: 7.4
-          - laravel: 5.5.*
-            php: 7.4
+            dependency-version: prefer-lowest
+          - laravel: ^8
+            php: 7.3
+            dependency-version: prefer-lowest
 
-    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php }}
         coverage: none
-        extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
-
+        tools: composer:v2
+        
     - name: Install dependencies
       run: |
-        composer remove phpro/grumphp --no-interaction --no-update --dev
-        composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "orchestra/testbench-dusk:${{ matrix.testbench }}" --no-interaction --no-update
-        composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
+        composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
+        composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress
 
     - name: Update Dusk Chromedriver
       run: vendor/bin/dusk-updater detect --auto-update

diff --git a/composer.json b/composer.json
@@ -14,21 +14,18 @@
         }
     ],
     "require": {
-        "php": ">=7.1",
-        "illuminate/support": "^5.6|^6.0|^7.0|^8.0",
-        "illuminate/contracts": "^5.6|^6.0|^7.0|^8.0",
-        "symfony/http-foundation": "^4.0|^5.0",
-        "symfony/http-kernel": "^4.0|^5.0",
+        "php": ">=7.2",
+        "illuminate/support": "^6|^7|^8",
+        "illuminate/contracts": "^6|^7|^8",
+        "symfony/http-foundation": "^4|^5",
+        "symfony/http-kernel": "^4.3.4|^5",
         "asm89/stack-cors": "^2.0.1"
     },
     "require-dev": {
-        "laravel/framework": "^5.5|^6.0|^7.0|^8.0",
-        "phpunit/phpunit": "^6.0|^7.0|^8.0",
-        "orchestra/testbench": "^3.5|^4.0|^5.0|^6.0",
+        "laravel/framework": "^6|^7|^8",
+        "phpunit/phpunit": "^6|^7|^8",
         "squizlabs/php_codesniffer": "^3.5",
-        "phpro/grumphp": "^0.16|^0.17",
-        "orchestra/testbench-dusk": "^5.1",
-        "orchestra/dusk-updater": "^1.2"
+        "orchestra/testbench-dusk": "^4|^5|^6"
     },
     "autoload": {
         "psr-4": {