From c2eb6301c6eb76d8a7cd8a65b2cbb09b63e68478 Mon Sep 17 00:00:00 2001 From: Cyril de Wit Date: Tue, 22 Sep 2020 16:28:04 +0200 Subject: [PATCH 1/8] chore(composer): remove unnecessary keyword --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index d9ee0134..499705be 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,6 @@ "license": "MIT", "homepage": "https://github.com/cyrildewit/eloquent-viewable", "keywords": [ - "cyrildewit", "laravel", "eloquent", "views", From e84053625c924d9dcba911021440fb2989604e43 Mon Sep 17 00:00:00 2001 From: Cyril de Wit Date: Tue, 22 Sep 2020 16:29:08 +0200 Subject: [PATCH 2/8] chore(composer): bump versions up to support Laravel 8 --- composer.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 499705be..3aff8590 100644 --- a/composer.json +++ b/composer.json @@ -24,20 +24,20 @@ ], "require": { "php": "^7.2", - "illuminate/cache": "^6.0|^7.0", - "illuminate/contracts": "^6.0|^7.0", - "illuminate/cookie": "^6.0|^7.0", - "illuminate/database": "^6.0|^7.0", - "illuminate/http": "^6.0|^7.0", - "illuminate/support": "^6.0|^7.0", + "illuminate/cache": "^6.0|^7.0|^8.0", + "illuminate/contracts": "^6.0|^7.0|^8.0", + "illuminate/cookie": "^6.0|^7.0|^8.0", + "illuminate/database": "^6.0|^7.0|^8.0", + "illuminate/http": "^6.0|^7.0|^8.0", + "illuminate/support": "^6.0|^7.0|^8.0", "jaybizzle/crawler-detect": "^1.0", "nesbot/carbon": "^2.0" }, "require-dev": { - "illuminate/config": "^6.0|^7.0", + "illuminate/config": "^6.0|^7.0|^8.0", "mockery/mockery": "^1.2.4", - "orchestra/testbench": "^4.0|^5.0", - "phpunit/phpunit": "^8.4" + "orchestra/testbench": "^4.0|^5.0|^6.0", + "phpunit/phpunit": "^8.4|^9.0" }, "autoload": { "psr-4": { From 35902f19f6c82c07fe6e75cd17435c631f2dc97e Mon Sep 17 00:00:00 2001 From: Cyril de Wit Date: Tue, 22 Sep 2020 16:31:00 +0200 Subject: [PATCH 3/8] chore(github): add workflow to run tests on Laravel 8 --- .github/workflows/run-tests-L8.yml | 53 ++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 .github/workflows/run-tests-L8.yml diff --git a/.github/workflows/run-tests-L8.yml b/.github/workflows/run-tests-L8.yml new file mode 100644 index 00000000..930b1f15 --- /dev/null +++ b/.github/workflows/run-tests-L8.yml @@ -0,0 +1,53 @@ +name: run-tests-L8 + +on: [push] + +jobs: + tests: + + runs-on: ubuntu-latest + strategy: + fail-fast: true + matrix: + php: [7.3, 7.4] + laravel: [^8.0] + stability: [prefer-lowest, prefer-stable] + include: + - laravel: ^8.0 + testbench: ^6.0 + + name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - 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, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick + coverage: xdebug + + - name: Setup Memcached + uses: niden/actions-memcached@v7 + + - name: Install dependencies + run: | + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "fzaninotto/faker:^1.9.1" "laravel/legacy-factories:^1.0" --no-interaction --no-update + composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest + + - name: Execute tests + run: vendor/bin/phpunit --verbose + + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v1 + with: + token: ${{ secrets.CODECOV_TOKEN }} + file: ./tmp/clover.xml From d98db7139f9725d491ca939d3a6bce7c80ade581 Mon Sep 17 00:00:00 2001 From: Cyril de Wit Date: Tue, 22 Sep 2020 16:43:44 +0200 Subject: [PATCH 4/8] chore(readme): update version information --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 59c935e0..276e49f3 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ Support for Lumen is not maintained! | Version | Illuminate | Status | PHP Version | |---------|---------------|----------------|-------------| -| ^5.0 | 6.x.x - 7.x.x | Active support | >= 7.2.0 | +| ^5.0 | 6.x.x - 8.x.x | Active support | >= 7.2.0 | | ^4.0 | 5.5.x - 5.8.x | Only bug fixes | >= 7.1.0 | | ^3.0 | 5.5.x - 5.8.x | End of life | >= 7.1.0 | | ^2.0 | 5.5.x - 5.7.x | End of life | >= 7.0.0 | From 0d267873dd73ddd6a41c9402d5057a0163c586db Mon Sep 17 00:00:00 2001 From: Cyril de Wit Date: Tue, 22 Sep 2020 16:44:19 +0200 Subject: [PATCH 5/8] chore(github): remove faker --- .github/workflows/run-tests-L8.yml | 2 +- .github/workflows/run-tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests-L8.yml b/.github/workflows/run-tests-L8.yml index 930b1f15..093af81e 100644 --- a/.github/workflows/run-tests-L8.yml +++ b/.github/workflows/run-tests-L8.yml @@ -40,7 +40,7 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "fzaninotto/faker:^1.9.1" "laravel/legacy-factories:^1.0" --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "laravel/legacy-factories:^1.0" --no-interaction --no-update composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest - name: Execute tests diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index d8397a09..fe27c00f 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -42,7 +42,7 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "fzaninotto/faker:^1.9.1" --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest - name: Execute tests From 3aa59ddae3a5de8899added6a7632e1322e223d1 Mon Sep 17 00:00:00 2001 From: Cyril de Wit Date: Tue, 22 Sep 2020 16:54:49 +0200 Subject: [PATCH 6/8] chore(composer): set minimum of legacy factors to v1.0.5 because there were some issues in previous versions --- .github/workflows/run-tests-L8.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests-L8.yml b/.github/workflows/run-tests-L8.yml index 093af81e..1ebb1601 100644 --- a/.github/workflows/run-tests-L8.yml +++ b/.github/workflows/run-tests-L8.yml @@ -40,7 +40,7 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "laravel/legacy-factories:^1.0" --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "laravel/legacy-factories:^1.0.5" --no-interaction --no-update composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest - name: Execute tests From 4b946b6840be796ceea357948ad6b610bbbd12b9 Mon Sep 17 00:00:00 2001 From: Cyril de Wit Date: Tue, 22 Sep 2020 16:59:44 +0200 Subject: [PATCH 7/8] chore(changelog): add changes for v5.2.1 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93549a46..50509c7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## Unreleased +## [v5.2.1] (2020-09-22) + +### Changed + +- Add support for Laravel 8 + ## [v5.2.0] ### Fixed From 671c1f0b72518152744b1684f468e7052d1516e4 Mon Sep 17 00:00:00 2001 From: Cyril de Wit Date: Tue, 22 Sep 2020 17:05:10 +0200 Subject: [PATCH 8/8] Revert "chore(github): remove faker" This reverts commit 0d267873dd73ddd6a41c9402d5057a0163c586db. --- .github/workflows/run-tests-L8.yml | 2 +- .github/workflows/run-tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests-L8.yml b/.github/workflows/run-tests-L8.yml index 1ebb1601..2d1d456f 100644 --- a/.github/workflows/run-tests-L8.yml +++ b/.github/workflows/run-tests-L8.yml @@ -40,7 +40,7 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "laravel/legacy-factories:^1.0.5" --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "fzaninotto/faker:^1.9.1" "laravel/legacy-factories:^1.0.5" --no-interaction --no-update composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest - name: Execute tests diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index fe27c00f..d8397a09 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -42,7 +42,7 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "fzaninotto/faker:^1.9.1" --no-interaction --no-update composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest - name: Execute tests