From 05b484d714f98b193e73ac94a413b736ef80d906 Mon Sep 17 00:00:00 2001 From: alexmerlin Date: Tue, 28 Jan 2025 09:01:01 +0200 Subject: [PATCH] Issue #83: Bump Psalm to 6.x Signed-off-by: alexmerlin --- .github/workflows/codecov.yml | 1 + .laminas-ci.json | 3 --- README.md | 2 +- composer.json | 4 ++-- docs/book/v4/configuration.md | 3 ++- docs/book/v5/configuration.md | 3 ++- 6 files changed, 8 insertions(+), 8 deletions(-) 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 diff --git a/.laminas-ci.json b/.laminas-ci.json index 790cfe4..a824eae 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 4b66d66..696be56 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ ## dot-mail badges ![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/5.2.0) +![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-mail/5.2.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 566b73c..4d7416a 100644 --- a/composer.json +++ b/composer.json @@ -30,15 +30,15 @@ "php": "~8.2.0 || ~8.3.0 || ~8.4.0", "ext-fileinfo": "*", "ext-json": "*", - "laminas/laminas-servicemanager": "^3.22 || ^4.0", "dotkernel/dot-event": "^4.0", + "laminas/laminas-servicemanager": "^3.22 || ^4.0", "symfony/mailer": "v7.1.6" }, "require-dev": { "laminas/laminas-coding-standard": "^3.0", "mikey179/vfsstream": "^v1.6.11", "phpunit/phpunit": "^10.5", - "vimeo/psalm": "^5.23" + "vimeo/psalm": "^6.0" }, "autoload": { "psr-4": { diff --git a/docs/book/v4/configuration.md b/docs/book/v4/configuration.md index ef84037..53e5b0c 100644 --- a/docs/book/v4/configuration.md +++ b/docs/book/v4/configuration.md @@ -3,7 +3,8 @@ Register `dot-mail` in you project by adding `Dot\Mail\ConfigProvider::class` to your configuration aggregator (to `config/config.php` for example). After registering the `ConfigProvider` copy the configuration file `config/mail.global.php.dist` into your project's `config/autoload/` directory as `mail.global.php`. -The resulting `mail.global.php` contains the necessary configurations for all available transport types, message options and logging options in one place. The config file provides a set of default values available to all mails under the `dot-mail.default` key. +The resulting `mail.global.php` contains the necessary configurations for all available transport types, message options and logging options in one place. +The config file provides a set of default values available to all mails under the `dot-mail.default` key. Many of these options can be programmatically set when sending the actual email. diff --git a/docs/book/v5/configuration.md b/docs/book/v5/configuration.md index 4c84742..11c318a 100644 --- a/docs/book/v5/configuration.md +++ b/docs/book/v5/configuration.md @@ -3,7 +3,8 @@ Register `dot-mail` in you project by adding `Dot\Mail\ConfigProvider::class` to your configuration aggregator (to `config/config.php` for example). After registering the `ConfigProvider` copy the configuration file `config/mail.global.php.dist` into your project's `config/autoload/` directory as `mail.global.php`. -The resulting `mail.global.php` contains the necessary configurations for all available transport types, message options and logging options in one place. The config file provides a set of default values available to all mails under the `dot-mail.default` key. +The resulting `mail.global.php` contains the necessary configurations for all available transport types, message options and logging options in one place. +The config file provides a set of default values available to all mails under the `dot-mail.default` key. Many of these options can be programmatically set when sending the actual email.