Merge pull request #53 from Jurj-Bogdan/issue-52

bump PHP to 8.3
dotkernel · Nov 29, 2023 · 4c50a47 · 4c50a47
2 parents 6cb4cd2 + eb157f3
commit 4c50a47
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -17,6 +17,7 @@ jobs:
         php:
           - "8.1"
           - "8.2"
+          - "8.3"
 
     steps:
       - name: Checkout

diff --git 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
@@ -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
@@ -8,6 +8,10 @@
 
 use function array_merge;
 
+/**
+ * @template TValue
+ * @template-extends AbstractOptions<TValue>
+ */
 class AttachmentsOptions extends AbstractOptions
 {
     public const DEFAULT_ITERATE   = false;

diff --git 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<TValue>
+ */
 class BodyOptions extends AbstractOptions
 {
     protected string $content = '';

diff --git 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<TValue>
+ */
 class MailOptions extends AbstractOptions
 {
     protected array $eventListeners                = [];

diff --git a/src/Options/MessageOptions.php b/src/Options/MessageOptions.php
@@ -6,6 +6,10 @@
 
 use Laminas\Stdlib\AbstractOptions;
 
+/**
+ * @template TValue
+ * @template-extends AbstractOptions<TValue>
+ */
 class MessageOptions extends AbstractOptions
 {
     protected string $from        = '';
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,7 @@ jobs: @@
             php:
               - "8.1"
               - "8.2"
+              - "8.3"
         steps:
           - name: Checkout
@@ Expand Down @@