From 61b8936da94df62e83eb6e0a8d7b5f05fcb28114 Mon Sep 17 00:00:00 2001 From: Jurj-Bogdan Date: Wed, 29 Nov 2023 12:44:46 +0200 Subject: [PATCH 1/2] bump PHP to 8.3 --- README.md | 2 +- composer.json | 16 ++++++++-------- src/Options/AttachmentsOptions.php | 4 ++++ src/Options/BodyOptions.php | 4 ++++ src/Options/MailOptions.php | 4 ++++ src/Options/MessageOptions.php | 4 ++++ 6 files changed, 25 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 424a474..8abc444 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ DotKernel mail component based on [laminas-mail](https://github.com/laminas/lami ![OSS Lifecycle](https://img.shields.io/osslifecycle/dotkernel/dot-mail) -![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-mail/4.1.0) +![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-mail/4.1.1) [![GitHub issues](https://img.shields.io/github/issues/dotkernel/dot-mail)](https://github.com/dotkernel/dot-mail/issues) [![GitHub forks](https://img.shields.io/github/forks/dotkernel/dot-mail)](https://github.com/dotkernel/dot-mail/network) diff --git a/composer.json b/composer.json index 96e3ece..10026df 100644 --- a/composer.json +++ b/composer.json @@ -26,18 +26,18 @@ } }, "require": { - "php": "~8.1.0 || ~8.2.0", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0", "ext-fileinfo": "*", "ext-json": "*", - "laminas/laminas-servicemanager": "^3.16.0", - "laminas/laminas-mail": "^2.17.0", - "dotkernel/dot-event": "^3.2.0" + "laminas/laminas-servicemanager": "^3.22.1", + "laminas/laminas-mail": "^2.25.1", + "dotkernel/dot-event": "^3.4.2" }, "require-dev": { - "laminas/laminas-coding-standard": "^2.5", - "mikey179/vfsstream": "^1.6", - "phpunit/phpunit": "^10.2.6", - "vimeo/psalm": "^5.13.1" + "laminas/laminas-coding-standard": "^2.5.0", + "mikey179/vfsstream": "^v1.6.11", + "phpunit/phpunit": "^10.4.2", + "vimeo/psalm": "^5.16.0" }, "autoload": { "psr-4": { diff --git a/src/Options/AttachmentsOptions.php b/src/Options/AttachmentsOptions.php index df97373..a5bcdb9 100644 --- a/src/Options/AttachmentsOptions.php +++ b/src/Options/AttachmentsOptions.php @@ -8,6 +8,10 @@ use function array_merge; +/** + * @template TValue + * @template-extends AbstractOptions + */ class AttachmentsOptions extends AbstractOptions { public const DEFAULT_ITERATE = false; diff --git a/src/Options/BodyOptions.php b/src/Options/BodyOptions.php index ccf0a5e..ada0622 100644 --- a/src/Options/BodyOptions.php +++ b/src/Options/BodyOptions.php @@ -7,6 +7,10 @@ use Dot\Mail\Service\MailServiceInterface; use Laminas\Stdlib\AbstractOptions; +/** + * @template TValue + * @template-extends AbstractOptions + */ class BodyOptions extends AbstractOptions { protected string $content = ''; diff --git a/src/Options/MailOptions.php b/src/Options/MailOptions.php index aa2cf4d..cb3c0f3 100644 --- a/src/Options/MailOptions.php +++ b/src/Options/MailOptions.php @@ -18,6 +18,10 @@ use function is_string; use function strtolower; +/** + * @template TValue + * @template-extends AbstractOptions + */ class MailOptions extends AbstractOptions { protected array $eventListeners = []; diff --git a/src/Options/MessageOptions.php b/src/Options/MessageOptions.php index d999665..4076bad 100644 --- a/src/Options/MessageOptions.php +++ b/src/Options/MessageOptions.php @@ -6,6 +6,10 @@ use Laminas\Stdlib\AbstractOptions; +/** + * @template TValue + * @template-extends AbstractOptions + */ class MessageOptions extends AbstractOptions { protected string $from = ''; From eb157f30598c397d99aaa1c64789aeadb86d3575 Mon Sep 17 00:00:00 2001 From: Jurj-Bogdan Date: Wed, 29 Nov 2023 13:21:32 +0200 Subject: [PATCH 2/2] updated yml files --- .github/workflows/codecov.yml | 1 + .github/workflows/cs-tests.yml | 1 + .github/workflows/static-analysis.yml | 1 + .github/workflows/unit-tests.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index f5980e7..190b4da 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -17,6 +17,7 @@ jobs: php: - "8.1" - "8.2" + - "8.3" steps: - name: Checkout diff --git a/.github/workflows/cs-tests.yml b/.github/workflows/cs-tests.yml index 3da9965..e73dfcf 100644 --- a/.github/workflows/cs-tests.yml +++ b/.github/workflows/cs-tests.yml @@ -17,6 +17,7 @@ jobs: php: - "8.1" - "8.2" + - "8.3" steps: - name: Checkout diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 74550fc..e9de91d 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -17,6 +17,7 @@ jobs: php: - "8.1" - "8.2" + - "8.3" steps: - name: Checkout diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index d2ab8e7..7f5f333 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -17,6 +17,7 @@ jobs: php: - "8.1" - "8.2" + - "8.3" steps: - name: Checkout