From 1172947aab64e42704d36bb2a37d77b330edc878 Mon Sep 17 00:00:00 2001 From: Tom Witkowski Date: Tue, 3 Mar 2020 12:13:38 +0100 Subject: [PATCH 01/10] normalize composer.json --- .github/workflows/composer-normalize.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/composer-normalize.yml diff --git a/.github/workflows/composer-normalize.yml b/.github/workflows/composer-normalize.yml new file mode 100644 index 0000000..560c42b --- /dev/null +++ b/.github/workflows/composer-normalize.yml @@ -0,0 +1,22 @@ +name: normalize composer.json + +on: + push: + paths: + - 'composer.json' + +jobs: + normalize: + runs-on: ubuntu-latest + steps: + - name: Git checkout + uses: actions/checkout@v2 + + - name: normalize composer.json + run: | + composer global require ergebnis/composer-normalize + composer normalize + + - uses: stefanzweifel/git-auto-commit-action@v4.0.0 + with: + commit_message: normalize composer.json From c2295501842cff7afe5d0322da47f16958184433 Mon Sep 17 00:00:00 2001 From: Tom Witkowski Date: Tue, 3 Mar 2020 12:13:53 +0100 Subject: [PATCH 02/10] add Laravel 7 support --- .github/workflows/run-tests.yml | 9 +++++++-- composer.json | 12 +++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index ed57201..777d838 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -10,8 +10,13 @@ jobs: matrix: os: [ubuntu-latest] php: [7.4] - laravel: [6.*] + laravel: [7.*, 6.*] dependency-version: [prefer-lowest, prefer-stable] + include: + - laravel: 7.* + testbench: 5.* + - laravel: 6.* + testbench: 4.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} @@ -34,7 +39,7 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update + 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 - name: phpunit diff --git a/composer.json b/composer.json index bfc149a..7520794 100644 --- a/composer.json +++ b/composer.json @@ -20,15 +20,15 @@ "require": { "php": "^7.4", "astrotomic/laravel-guzzle": "^2.0", - "illuminate/cache": "^6.0", - "illuminate/support": "^6.0" + "illuminate/cache": "^6.0 || ^7.0", + "illuminate/support": "^6.0 || ^7.0" }, "require-dev": { "codedungeon/phpunit-result-printer": "^0.26.2", - "elbgoods/ci-test-tools": "^1.5.1", + "elbgoods/ci-test-tools": "^1.7.0", "nunomaduro/collision": "^3.0", - "orchestra/testbench": "^4.0", - "phpunit/phpunit": "^8.0" + "orchestra/testbench": "^4.0 || ^5.0", + "phpunit/phpunit": "^8.0 || ^9.0" }, "autoload": { "psr-4": { @@ -43,6 +43,8 @@ "config": { "sort-packages": true }, + "minimum-stability": "dev", + "prefer-stable": true, "extra": { "laravel": { "providers": [ From c544d563768886043ebc344be48bc48c38329b00 Mon Sep 17 00:00:00 2001 From: Gummibeer Date: Tue, 3 Mar 2020 11:16:03 +0000 Subject: [PATCH 03/10] normalize composer.json --- composer.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 7520794..820c29d 100644 --- a/composer.json +++ b/composer.json @@ -30,6 +30,16 @@ "orchestra/testbench": "^4.0 || ^5.0", "phpunit/phpunit": "^8.0 || ^9.0" }, + "config": { + "sort-packages": true + }, + "extra": { + "laravel": { + "providers": [ + "Elbgoods\\TrashmailRule\\TrashmailRuleServiceProvider" + ] + } + }, "autoload": { "psr-4": { "Elbgoods\\TrashmailRule\\": "src" @@ -40,16 +50,6 @@ "Elbgoods\\TrashmailRule\\Tests\\": "tests" } }, - "config": { - "sort-packages": true - }, "minimum-stability": "dev", - "prefer-stable": true, - "extra": { - "laravel": { - "providers": [ - "Elbgoods\\TrashmailRule\\TrashmailRuleServiceProvider" - ] - } - } + "prefer-stable": true } From d7772a5242ab7ff12903190889849b8245a10247 Mon Sep 17 00:00:00 2001 From: Tom Witkowski Date: Tue, 3 Mar 2020 12:23:36 +0100 Subject: [PATCH 04/10] bump laravel guzzle --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7520794..9d66e38 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ ], "require": { "php": "^7.4", - "astrotomic/laravel-guzzle": "^2.0", + "astrotomic/laravel-guzzle": "^2.1", "illuminate/cache": "^6.0 || ^7.0", "illuminate/support": "^6.0 || ^7.0" }, From 2405a2266dfb381e91767538a9e0e64d6fdee3ab Mon Sep 17 00:00:00 2001 From: Tom Witkowski Date: Tue, 3 Mar 2020 12:32:18 +0100 Subject: [PATCH 05/10] put ci-test-tools in different vendor --- .gitignore | 1 + composer.json | 12 ++++++++++-- vendor-bin/elbgoods/composer.json | 5 +++++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 vendor-bin/elbgoods/composer.json diff --git a/.gitignore b/.gitignore index 2178feb..fbd55c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /vendor/ +/vendor-bin/**/vendor /composer.lock /phpunit.xml \ No newline at end of file diff --git a/composer.json b/composer.json index 0bd0ded..970867c 100644 --- a/composer.json +++ b/composer.json @@ -24,8 +24,8 @@ "illuminate/support": "^6.0 || ^7.0" }, "require-dev": { + "bamarni/composer-bin-plugin": "^1.3", "codedungeon/phpunit-result-printer": "^0.26.2", - "elbgoods/ci-test-tools": "^1.7.0", "nunomaduro/collision": "^3.0", "orchestra/testbench": "^4.0 || ^5.0", "phpunit/phpunit": "^8.0 || ^9.0" @@ -51,5 +51,13 @@ } }, "minimum-stability": "dev", - "prefer-stable": true + "prefer-stable": true, + "scripts": { + "post-install-cmd": [ + "@composer bin all install --ansi" + ], + "post-update-cmd": [ + "@composer bin all update --ansi" + ] + } } diff --git a/vendor-bin/elbgoods/composer.json b/vendor-bin/elbgoods/composer.json new file mode 100644 index 0000000..f872671 --- /dev/null +++ b/vendor-bin/elbgoods/composer.json @@ -0,0 +1,5 @@ +{ + "require-dev": { + "elbgoods/ci-test-tools": "^1.7" + } +} From 62ac119b5fc9e170bbab1eacb52675d8c69bd1df Mon Sep 17 00:00:00 2001 From: Tom Witkowski Date: Tue, 3 Mar 2020 12:33:40 +0100 Subject: [PATCH 06/10] bump collision --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 970867c..839541f 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.3", "codedungeon/phpunit-result-printer": "^0.26.2", - "nunomaduro/collision": "^3.0", + "nunomaduro/collision": "^3.0 || ^4.0", "orchestra/testbench": "^4.0 || ^5.0", "phpunit/phpunit": "^8.0 || ^9.0" }, From d1f1235df3fd396cdbe3e3fe88757cb889256607 Mon Sep 17 00:00:00 2001 From: Tom Witkowski Date: Tue, 3 Mar 2020 12:36:28 +0100 Subject: [PATCH 07/10] fix collision --- composer.json | 2 +- phpunit.xml.dist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 839541f..6a9c4fb 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.3", "codedungeon/phpunit-result-printer": "^0.26.2", - "nunomaduro/collision": "^3.0 || ^4.0", + "nunomaduro/collision": "^4.0", "orchestra/testbench": "^4.0 || ^5.0", "phpunit/phpunit": "^8.0 || ^9.0" }, diff --git a/phpunit.xml.dist b/phpunit.xml.dist index f4bb52d..38636d8 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -23,7 +23,7 @@ - + From 3ae3f1f24564864e1f324967e8fcf63d4f4e1702 Mon Sep 17 00:00:00 2001 From: Tom Witkowski Date: Tue, 3 Mar 2020 12:39:10 +0100 Subject: [PATCH 08/10] drop phpunit candy --- composer.json | 2 -- phpunit.xml.dist | 4 ---- 2 files changed, 6 deletions(-) diff --git a/composer.json b/composer.json index 6a9c4fb..54eed94 100644 --- a/composer.json +++ b/composer.json @@ -25,8 +25,6 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.3", - "codedungeon/phpunit-result-printer": "^0.26.2", - "nunomaduro/collision": "^4.0", "orchestra/testbench": "^4.0 || ^5.0", "phpunit/phpunit": "^8.0 || ^9.0" }, diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 38636d8..6193f8e 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -10,7 +10,6 @@ convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" - printerClass="Codedungeon\PHPUnitPrettyResultPrinter\Printer" > @@ -22,9 +21,6 @@ ./src - - - From d5c8ce2dfd7e6b468b6ce056d3a97a679096294a Mon Sep 17 00:00:00 2001 From: Tom Witkowski Date: Tue, 3 Mar 2020 12:41:42 +0100 Subject: [PATCH 09/10] fix phpstan --- phpstan.neon.dist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 97496f0..bd9094b 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -1,6 +1,6 @@ includes: - - ./vendor/nunomaduro/larastan/extension.neon - - ./vendor/elbgoods/ci-test-tools/configs/phpstan.neon.dist + - ./vendor-bin/elbgoods/vendor/nunomaduro/larastan/extension.neon + - ./vendor-bin/elbgoods/vendor/elbgoods/ci-test-tools/configs/phpstan.neon.dist parameters: paths: From 90b3a0522a9bdb7152d37d14f083944a87b0dcc5 Mon Sep 17 00:00:00 2001 From: Tom Witkowski Date: Tue, 3 Mar 2020 13:39:19 +0100 Subject: [PATCH 10/10] v0.6.0 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3883c8f..29a366c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this package will be documented in this file. +## v0.6.0 + +* add Laravel 7 support + ## v0.5.0 * upgrade `astrotomic/laravel-guzzle` to v2.0.0