From 2bc1c677701c5c9a8268c39fac18386dd8f41347 Mon Sep 17 00:00:00 2001 From: alexmerlin Date: Mon, 27 Jan 2025 09:02:13 +0200 Subject: [PATCH 1/2] Issue #32: Bump Psalm to 6.x Signed-off-by: alexmerlin --- .laminas-ci.json | 3 -- README.md | 2 +- composer.json | 2 +- psalm-baseline.xml | 42 ++++++++++++++++++++++++++++ psalm.xml | 1 + src/AuthenticationInterface.php | 3 -- src/Exception/ExceptionInterface.php | 3 -- src/Identity/IdentityInterface.php | 3 -- 8 files changed, 45 insertions(+), 14 deletions(-) create mode 100644 psalm-baseline.xml diff --git a/.laminas-ci.json b/.laminas-ci.json index 82cd446..29216fa 100644 --- a/.laminas-ci.json +++ b/.laminas-ci.json @@ -1,6 +1,3 @@ { - "ignore_php_platform_requirements": { - "8.4": true - }, "backwardCompatibilityCheck": true } diff --git a/README.md b/README.md index 7469370..3564f00 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Authentication base package defining interfaces for authentication services to be used with Dotkernel applications. ![OSS Lifecycle](https://img.shields.io/osslifecycle/dotkernel/dot-authentication) -![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-authentication/2.5.0) +![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-authentication/2.5.1) [![GitHub issues](https://img.shields.io/github/issues/dotkernel/dot-authentication)](https://github.com/dotkernel/dot-authentication/issues) [![GitHub forks](https://img.shields.io/github/forks/dotkernel/dot-authentication)](https://github.com/dotkernel/dot-authentication/network) diff --git a/composer.json b/composer.json index b0b1db3..c1a0777 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "require-dev": { "laminas/laminas-coding-standard": "^3.0", "phpunit/phpunit": "^10.2", - "vimeo/psalm": "^5.13" + "vimeo/psalm": "^6.0" }, "autoload": { "psr-4": { diff --git a/psalm-baseline.xml b/psalm-baseline.xml new file mode 100644 index 0000000..446f66a --- /dev/null +++ b/psalm-baseline.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/psalm.xml b/psalm.xml index df50202..55c65c5 100644 --- a/psalm.xml +++ b/psalm.xml @@ -5,6 +5,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://getpsalm.org/schema/config" xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd" + errorBaseline="psalm-baseline.xml" > diff --git a/src/AuthenticationInterface.php b/src/AuthenticationInterface.php index a7892b9..baff1f7 100644 --- a/src/AuthenticationInterface.php +++ b/src/AuthenticationInterface.php @@ -8,9 +8,6 @@ use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; -/** - * Interface AuthenticationInterface - */ interface AuthenticationInterface { /** diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php index 76add1f..fbd8d1c 100644 --- a/src/Exception/ExceptionInterface.php +++ b/src/Exception/ExceptionInterface.php @@ -4,9 +4,6 @@ namespace Dot\Authentication\Exception; -/** - * Interface ExceptionInterface - */ interface ExceptionInterface { } diff --git a/src/Identity/IdentityInterface.php b/src/Identity/IdentityInterface.php index eaea76d..2a76054 100644 --- a/src/Identity/IdentityInterface.php +++ b/src/Identity/IdentityInterface.php @@ -4,9 +4,6 @@ namespace Dot\Authentication\Identity; -/** - * Interface IdentityInterface - */ interface IdentityInterface { public function getId(): mixed; From 8c17d6978d38cf627c1abf45f92f72909e42c99a Mon Sep 17 00:00:00 2001 From: Alex Karajos Date: Mon, 27 Jan 2025 09:40:38 +0200 Subject: [PATCH 2/2] Run Codecov on PHP 8.4 as well --- .github/workflows/codecov.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 190b4da..7ad749b 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -18,6 +18,7 @@ jobs: - "8.1" - "8.2" - "8.3" + - "8.4" steps: - name: Checkout