From 8be8cabdf85366fdc58af5330b46f7631988314b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Mon, 20 Dec 2021 10:07:29 +0100 Subject: [PATCH 1/3] Support PHP 8.1, upgrade dependencies --- .github/workflows/php-checks.yml | 2 +- composer.json | 16 ++++++++-------- phpstan.neon | 7 +++++++ 3 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 phpstan.neon diff --git a/.github/workflows/php-checks.yml b/.github/workflows/php-checks.yml index 77d267f..9ee0a9d 100644 --- a/.github/workflows/php-checks.yml +++ b/.github/workflows/php-checks.yml @@ -5,7 +5,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: ['7.3', '7.4', '8.0'] + php-versions: ['7.4', '8.0', '8.1'] name: PHP ${{ matrix.php-versions }} tests steps: - name: Checkout diff --git a/composer.json b/composer.json index c20c560..7f3071d 100644 --- a/composer.json +++ b/composer.json @@ -28,11 +28,11 @@ }, "scripts": { "phpcheck": [ - "./vendor/bin/phpstan analyse -l max --memory-limit=1G src/", - "./vendor/bin/phpcs -p --standard=PSR2 --extensions=php src/" + "./vendor/bin/phpstan analyse -c phpstan.neon -l max --memory-limit=1G src/ tests/", + "./vendor/bin/phpcs -p --standard=PSR2 --extensions=php src/ tests/" ], "phpcbf": [ - "./vendor/bin/phpcbf -p --standard=PSR2 --extensions=php src/" + "./vendor/bin/phpcbf -p --standard=PSR2 --extensions=php src/ tests/" ], "phpunit": [ "./vendor/bin/phpunit" @@ -40,13 +40,13 @@ }, "minimum-stability": "stable", "require": { + "php": "7.4.* || 8.0.* || 8.1.*", "ext-json": "*", - "php": "7.3.* || 7.4.* || 8.0.*", - "symfony/finder": "~4.4" + "symfony/finder": "^5.0.0" }, "require-dev": { - "phpstan/phpstan": "0.12.34", - "phpunit/phpunit": "~8.5", - "squizlabs/php_codesniffer": "^3.5" + "phpstan/phpstan": "1.2.0", + "phpunit/phpunit": "9.5.10", + "squizlabs/php_codesniffer": "3.6.2" } } diff --git a/phpstan.neon b/phpstan.neon new file mode 100644 index 0000000..7dc87ff --- /dev/null +++ b/phpstan.neon @@ -0,0 +1,7 @@ +parameters: + ignoreErrors: + - + message: "#^Unreachable statement \\- code above always terminates\\.$#" + count: 1 + path: tests/Naneau/ProjectVersioner/Test/Reader/FinderTest.php + From 9aff23af8dc7f285eaa2e6caecc47e8623686b25 Mon Sep 17 00:00:00 2001 From: t0mmie Date: Wed, 22 Dec 2021 09:42:37 +0100 Subject: [PATCH 2/3] Update CHANGELOG.md --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 210fe2d..c078d7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## 2.0.0 + +### PHP support + +- Dropped support for PHP `7.3`. +- Added support for PHP `8.1`. + +### 3rd party updates + +- Updated `symfony/finder` to version `5`. + ## 1.2.0 ### PHP support From c8eca6c850f3f63fcd966d8db481ebd836adc38c Mon Sep 17 00:00:00 2001 From: t0mmie Date: Wed, 22 Dec 2021 09:42:44 +0100 Subject: [PATCH 3/3] Tabs to spaces --- phpstan.neon | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/phpstan.neon b/phpstan.neon index 7dc87ff..9c20c3e 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,7 +1,7 @@ parameters: - ignoreErrors: - - - message: "#^Unreachable statement \\- code above always terminates\\.$#" - count: 1 - path: tests/Naneau/ProjectVersioner/Test/Reader/FinderTest.php + ignoreErrors: + - + message: "#^Unreachable statement \\- code above always terminates\\.$#" + count: 1 + path: tests/Naneau/ProjectVersioner/Test/Reader/FinderTest.php