Add Laravel 7.x support, drop 5.8 and below (#32)

Author: avvertix

.github/workflows/ci.yml

@@ -9,38 +9,51 @@ on:
 
 jobs:
   phpunit:
-    name: Test on laravel ${{ matrix.laravel }}
+    name: Tests PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: true
       matrix:
-        laravel: ["5.8", "6.0" , "6.*"]
-
-    container:
-      image: jackmdavis97/php:7.3
+        php: [7.2, 7.3, 7.4]
+        laravel: ["6.0" , "6.*", "7.0", "7.*"]
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
       with:
         fetch-depth: 1
-    - name: Set Laravel version
+    
+    - name: Cache dependencies
+      uses: actions/cache@v1
+      with:
+        path: ~/.composer/cache/files
+        key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php }}
+        extensions: dom, curl, libxml, mbstring, zip
+        coverage: none
+      
+    - name: Install dependencies
       run: |
         composer require "illuminate/auth:${{ matrix.laravel }}" --no-update
         composer require "illuminate/console:${{ matrix.laravel }}" --no-update
         composer require "illuminate/contracts:${{ matrix.laravel }}" --no-update
         composer require "illuminate/database:${{ matrix.laravel }}" --no-update
         composer require "illuminate/events:${{ matrix.laravel }}" --no-update
         composer require "illuminate/support:${{ matrix.laravel }}" --no-update
-        composer require "illuminate/view:${{ matrix.laravel }}" --no-update
-    - name: Composer update
-      run: composer update --no-interaction --no-progress --no-suggest --prefer-dist
+        composer require "illuminate/view:${{ matrix.laravel }}" --prefer-dist --no-interaction
+
     - name: Run Testsuite
       run: ./vendor/bin/phpunit
+      
   jsunit:
     name: Test Javascript
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
       with:
         fetch-depth: 1
     - name: Yarn install

.travis.yml

@@ -11,20 +11,13 @@ cache:
   - $HOME/.composer/cache
 
 php:
-  - 7.1
   - 7.2
+  - 7.3
+  - 7.4
 
 env:
-  - LARAVEL_VERSION=5.5.*
-  - LARAVEL_VERSION=5.6.*
-  - LARAVEL_VERSION=5.7.*
-  - LARAVEL_VERSION=5.8.*
   - LARAVEL_VERSION=6.*
-
-matrix:
-  exclude:
-    - php: 7.1
-      env: LARAVEL_VERSION=6.*
+  - LARAVEL_VERSION=7.*
 
 sudo: false
 

composer.json

@@ -5,20 +5,20 @@
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": ">=7.1",
-        "illuminate/auth": "5.5.*|5.6.*|5.7.*|5.8.*|6.*",
-        "illuminate/console": "5.5.*|5.6.*|5.7.*|5.8.*|6.*",
-        "illuminate/contracts": "5.5.*|5.6.*|5.7.*|5.8.*|6.*",
-        "illuminate/database": "5.5.*|5.6.*|5.7.*|5.8.*|6.*",
-        "illuminate/events": "5.5.*|5.6.*|5.7.*|5.8.*|6.*",
-        "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*|6.*",
-        "illuminate/view": "5.5.*|5.6.*|5.7.*|5.8.*|6.*"
+        "php": ">=7.2.5",
+        "illuminate/auth": "6.*|7.*",
+        "illuminate/console": "6.*|7.*",
+        "illuminate/contracts": "6.*|7.*",
+        "illuminate/database": "6.*|7.*",
+        "illuminate/events": "6.*|7.*",
+        "illuminate/support": "6.*|7.*",
+        "illuminate/view": "6.*|7.*"
     },
     "require-dev": {
-        "fzaninotto/faker": "~1.4",
-        "mockery/mockery": "^1.0",
-        "phpunit/phpunit": "^6.0|^7.0|^8.0",
-        "orchestra/testbench": "~3.5|~3.6|~3.7|~3.8|^4.0"
+        "fzaninotto/faker": "~1.9.1",
+        "mockery/mockery": "^1.3.1",
+        "phpunit/phpunit": "^8.5|^9.0",
+        "orchestra/testbench": "^4.0|^5.0"
     },
     "autoload": {
         "classmap": [
@@ -42,7 +42,7 @@
     },
     "extra": {
         "brach-alias": {
-            "dev-master": "0.7.x-dev"
+            "dev-master": "0.8.x-dev"
         },
         "laravel": {
             "providers": [

readme.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.com/OneOffTech/laravel-tus-upload.svg?branch=master)](https://travis-ci.com/OneOffTech/laravel-tus-upload)
+![CI](https://github.com/OneOffTech/laravel-tus-upload/workflows/CI/badge.svg)
 
 # Laravel [Tus](http://tus.io/) based Upload
 
@@ -20,7 +20,7 @@ This package contains a PHP component for controlling the Tus upload server and
 
 To get started, install Laravel Tus Upload via the [Composer](http://getcomposer.org/) package manager.
 
-> Requires PHP 7.1
+> Requires PHP 7.2
 
 ```bash
 composer require oneofftech/laravel-tus-upload

tests/Unit/TusUploadQueueControllerTest.php

@@ -2,6 +2,7 @@
 
 namespace Tests\Unit;
 
+use Carbon\Carbon;
 use Tests\AbstractTestCase;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
@@ -146,7 +147,8 @@ public function upload_queue_item_can_be_cancelled()
         $cancelled_upload = $upload->fresh();
 
         $this->assertTrue($cancelled_upload->cancelled);
-        $this->assertEquals(json_encode($cancelled_upload), $response->getContent());
+        $this->assertInstanceOf(Carbon::class, $cancelled_upload->cancelled_at);
+        $this->assertJson($response->getContent());
 
         Event::assertDispatched(TusUploadCancelled::class, function ($e) use ($cancelled_upload) {
             return $e->upload->id === $cancelled_upload->id;