composer: add Laravel ^6.10 dependency

Author: nerg4l

.github/workflows/test.yml

@@ -15,16 +15,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ 7.4, 7.3 ]
-        laravel: [ 8.*, 7.* ]
+        php: [ 7.3, 7.4 ]
+        laravel: [ '^6.10', '^7.0', '^7.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 }}
+    name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 
     steps:
       - name: Update apt
@@ -37,7 +32,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.composer/cache/files
-          key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+          key: laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -51,8 +46,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
-          composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
+          composer require "illuminate/support:${{ matrix.laravel }}" "illuminate/http:${{ matrix.laravel }}" --no-interaction --no-update
+          composer update --${{ matrix.dependency-version }}  --prefer-dist --no-interaction --no-suggest
 
       - name: Execute tests
-        run: vendor/bin/phpunit
+        run: vendor/bin/phpunit --verbose

composer.json

@@ -15,12 +15,12 @@
     ],
     "require": {
         "php": "^7.3",
-        "illuminate/support": "^7.0 || ^8.0",
-        "illuminate/http": "^7.0 || ^8.0"
+        "illuminate/support": "^6.10 || ^7.0 || ^8.0",
+        "illuminate/http": "^6.10 || ^7.0 || ^8.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^5.0 || ^6.0",
-        "phpunit/phpunit": "^9.1",
+        "orchestra/testbench": "^4.0 || ^5.0 || ^6.0",
+        "phpunit/phpunit": "^9.3",
         "mockery/mockery": "^1.3"
     },
     "autoload": {

phpunit.xml.dist

@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         verbose="true">
     <coverage>
         <include>
             <directory suffix=".php">src/</directory>
         </include>
+        <report>
+            <clover outputFile="build/logs/clover.xml"/>
+        </report>
     </coverage>
     <testsuites>
         <testsuite name="Laravel Upload Handler Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
     <logging>
-      <log type="tap" target="build/report.tap"/>
-      <log type="junit" target="build/report.junit.xml"/>
-      <log type="coverage-text" target="build/coverage.txt"/>
-      <log type="coverage-clover" target="build/logs/clover.xml"/>
+        <junit outputFile="build/report.junit.xml"/>
+        <text outputFile="build/coverage.txt"/>
     </logging>
 </phpunit>