diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to .github/CONTRIBUTING.md diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 7351b0c..7f7164a 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: true matrix: - php: [7.4, 7.3] + php: [8.0, 7.4, 7.3] laravel: [5.8.*, 6.*, 7.*, 8.*] dependency-version: [prefer-lowest, prefer-stable] include: @@ -26,16 +26,10 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v1 - - - name: Cache dependencies - uses: actions/cache@v1 - with: - path: ~/.composer/cache/files - key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} + uses: actions/checkout@v2 - name: Setup PHP - uses: shivammathur/setup-php@v1 + uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick @@ -44,7 +38,7 @@ 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 update --${{ matrix.dependency-version }} --prefer-dist --no-interaction - name: Execute tests run: vendor/bin/phpunit diff --git a/README.md b/README.md index fc108de..a6ac4f1 100644 --- a/README.md +++ b/README.md @@ -207,7 +207,7 @@ Please see [CHANGELOG](CHANGELOG.md) for more information on what has changed re ## Contributing -Please see [CONTRIBUTING](CONTRIBUTING.md) for details. +Please see [CONTRIBUTING](.github/CONTRIBUTING.md) for details. ## Security diff --git a/composer.json b/composer.json index 8fb84c2..e22ca26 100644 --- a/composer.json +++ b/composer.json @@ -19,14 +19,13 @@ ], "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "illuminate/database": "~5.8.0|^6.0|^7.0|^8.0", "illuminate/support": "~5.8.0|^6.0|^7.0|^8.0" }, "require-dev": { "phpunit/phpunit" : "^8.0|^9.0", - "orchestra/testbench": "~3.8.0|^4.0|^5.0|^6.0", - "friendsofphp/php-cs-fixer": "^2.16" + "orchestra/testbench": "~3.8.0|^4.0|^5.0|^6.0" }, "autoload": { "psr-4": {