Merge pull request #10 from imliam/laravel-7-support

Laravel 7 Support
imliam · Mar 5, 2020 · 001d3c1 · 001d3c1
2 parents 8a30f45 + b78f674
commit 001d3c1
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 52 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,12 +8,11 @@ jobs:
       max-parallel: 15
       fail-fast: false
       matrix:
-        php-versions: ['7.1', '7.2', '7.3']
+        php-versions: ['7.2', '7.3', '7.4']
         composer-flags: ['--prefer-lowest', '--prefer-stable']
         env:
-            - LARAVEL_VERSION='5.7.*' TESTBENCH_VERSION='3.8.*'
-            - LARAVEL_VERSION='5.8.*' TESTBENCH_VERSION='3.8.*'
             - LARAVEL_VERSION='^6.0'  TESTBENCH_VERSION='^4.0'
+            - LARAVEL_VERSION='^7.0'  TESTBENCH_VERSION='^5.0'
     name: Test on PHP ${{ matrix.php-versions }}, Laravel ${{ matrix.laravel-versions }} and ${{ matrix.composer-flags }}
     steps:
     - name: Checkout

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -2,8 +2,7 @@
 
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/imliam/laravel-blade-helper.svg)](https://packagist.org/packages/imliam/laravel-blade-helper)
 [![Build Status](https://img.shields.io/travis/imliam/laravel-blade-helper.svg)](https://travis-ci.org/imliam/laravel-blade-helper)
-![Code Quality](https://img.shields.io/scrutinizer/g/imliam/laravel-blade-helper.svg)
-![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/imliam/laravel-blade-helper.svg)
+[![CI Status](https://github.com/imliam/laravel-blade-helper/workflows/Run%20Tests/badge.svg)](https://github.com/imliam/laravel-blade-helper/actions)
 [![Total Downloads](https://img.shields.io/packagist/dt/imliam/laravel-blade-helper.svg)](https://packagist.org/packages/imliam/laravel-blade-helper)
 [![License](https://img.shields.io/github/license/imliam/laravel-blade-helper.svg)](LICENSE.md)
 

diff --git a/composer.json b/composer.json
@@ -16,13 +16,13 @@
         "role": "Developer"
     }],
     "require": {
-        "php": "^7.1",
-        "illuminate/support": "^5.5|^6.0"
+        "php": "^7.2",
+        "illuminate/support": "^6.0|^7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0|^8.0",
+        "phpunit/phpunit": "^7.0|^8.0|^9.0",
         "larapack/dd": "^1.0",
-        "orchestra/testbench": "^3.6|^4.0",
+        "orchestra/testbench": "^4.0|^5.0",
         "mockery/mockery": "^1.0"
     },
     "autoload": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -20,7 +20,6 @@
         </whitelist>
     </filter>
     <logging>
-        <log type="tap" target="build/report.tap"/>
         <log type="junit" target="build/report.junit.xml"/>
         <log type="coverage-html" target="build/coverage"/>
         <log type="coverage-text" target="build/coverage.txt"/>

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -2,8 +2,8 @@
 
 namespace ImLiam\BladeHelper\Tests;
 
-use Orchestra\Testbench\TestCase as BaseTestCase;
 use ImLiam\BladeHelper\BladeHelperServiceProvider;
+use Orchestra\Testbench\TestCase as BaseTestCase;
 
 abstract class TestCase extends BaseTestCase
 {

diff --git a/tests/Unit/BladeHelperTest.php b/tests/Unit/BladeHelperTest.php
@@ -2,10 +2,10 @@
 
 namespace ImLiam\BladeHelper\Tests\Unit;
 
-use Mockery as m;
+use Illuminate\View\Compilers\BladeCompiler;
 use ImLiam\BladeHelper\BladeHelper;
 use ImLiam\BladeHelper\Tests\TestCase;
-use Illuminate\View\Compilers\BladeCompiler;
+use Mockery as m;
 
 class BladeHelperTest extends TestCase
 {