From 411d0897879b2ccedc5825c7e66f9e86c91cdf0c Mon Sep 17 00:00:00 2001 From: alexmerlin Date: Mon, 27 Jan 2025 07:57:06 +0200 Subject: [PATCH 1/5] Issue #56: Bump Psalm to 6.x Signed-off-by: alexmerlin --- .laminas-ci.json | 3 --- composer.json | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) 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/composer.json b/composer.json index 1cafef9..810972e 100644 --- a/composer.json +++ b/composer.json @@ -28,8 +28,8 @@ }, "require-dev": { "phpunit/phpunit": "^10.5.9", - "vimeo/psalm": "^5.20", - "laminas/laminas-coding-standard": "^3.0" + "laminas/laminas-coding-standard": "^3.0", + "vimeo/psalm": "^6.0" }, "autoload": { "psr-4": { From c1d9218e5597b146f00a2f5ed76b47bb75066bb2 Mon Sep 17 00:00:00 2001 From: alexmerlin Date: Mon, 27 Jan 2025 08:00:43 +0200 Subject: [PATCH 2/5] package reorder Signed-off-by: alexmerlin --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 810972e..01a86ab 100644 --- a/composer.json +++ b/composer.json @@ -21,14 +21,14 @@ ], "require": { "php": "~8.2.0 || ~8.3.0 || ~8.4.0", - "laminas/laminas-servicemanager": "^3.22.1", "doctrine/annotations": "^1.14.3", "doctrine/cache": "^1.12.1 || ^2.1.1", - "doctrine/orm" : "^2.20" + "doctrine/orm" : "^2.20", + "laminas/laminas-servicemanager": "^3.22.1" }, "require-dev": { - "phpunit/phpunit": "^10.5.9", "laminas/laminas-coding-standard": "^3.0", + "phpunit/phpunit": "^10.5.9", "vimeo/psalm": "^6.0" }, "autoload": { From bb052d0af1150f852067d30cb0205070a142ed1a Mon Sep 17 00:00:00 2001 From: alexmerlin Date: Mon, 27 Jan 2025 08:01:40 +0200 Subject: [PATCH 3/5] updated readme Signed-off-by: alexmerlin --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 295b0b4..92bbeb9 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Dotkernel component used to create services through [Laminas Service Manager](ht This package can clean up your code, by getting rid of all the factories you write, sometimes just to inject a dependency or two. ![OSS Lifecycle](https://img.shields.io/osslifecycle?file_url=https%3A%2F%2Fgithub.com%2Fdotkernel%2Fdot-annotated-services%2Fblob%2F4.0%2FOSSMETADATA) -![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-annotated-services/4.2.0) +![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-annotated-services/4.2.1) [![GitHub issues](https://img.shields.io/github/issues/dotkernel/dot-annotated-services)](https://github.com/dotkernel/dot-annotated-services/issues) [![GitHub forks](https://img.shields.io/github/forks/dotkernel/dot-annotated-services)](https://github.com/dotkernel/dot-annotated-services/network) From ebf91211783795746d2d0f02d19bbcc1ed931b6b Mon Sep 17 00:00:00 2001 From: alexmerlin Date: Mon, 27 Jan 2025 08:17:08 +0200 Subject: [PATCH 4/5] docs updates Signed-off-by: alexmerlin --- docs/book/v5/configuration.md | 4 +++- docs/book/v5/installation.md | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/book/v5/configuration.md b/docs/book/v5/configuration.md index bdebef1..3c707d9 100644 --- a/docs/book/v5/configuration.md +++ b/docs/book/v5/configuration.md @@ -2,4 +2,6 @@ After installation, register `dot-annotated-services` in your project by adding the below line to your configuration aggregator (usually: `config/config.php`): - Dot\AnnotatedServices\ConfigProvider::class, +```php +Dot\AnnotatedServices\ConfigProvider::class, +``` diff --git a/docs/book/v5/installation.md b/docs/book/v5/installation.md index 8d628ea..13b0b2a 100644 --- a/docs/book/v5/installation.md +++ b/docs/book/v5/installation.md @@ -2,4 +2,6 @@ Install `dotkernel/dot-annotated-services` by executing the following Composer command: - composer require dotkernel/dot-annotated-services +```shell +composer require dotkernel/dot-annotated-services +``` From 492bc67430c9ebdf315f2c73f9400cb98d5ff4bd Mon Sep 17 00:00:00 2001 From: Alex Karajos Date: Mon, 27 Jan 2025 09:41:31 +0200 Subject: [PATCH 5/5] 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 184fa62..32a1a00 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -17,6 +17,7 @@ jobs: php: - "8.2" - "8.3" + - "8.4" steps: - name: Checkout