update php and pimcore, fix deprecations (#57)

* update php and pimcore, fix deprecations * Apply php-cs-fixer changes * update php and pimcore, fix deprecations
pimcore · Jan 20, 2025 · f75aff0 · f75aff0
1 parent 32b0ad4
commit f75aff0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 100 deletions.
diff --git a/.github/workflows/codeception.yaml b/.github/workflows/codeception.yaml
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,8 +1,11 @@
 parameters:
     level: 6
     reportUnmatchedIgnoredErrors: false
-    checkGenericClassInNonGenericObjectType: false
-    checkMissingIterableValueType: false
+    ignoreErrors:
+            -
+                identifier: missingType.iterableValue
+            -
+                identifier: missingType.generics
     paths:
         - src
     bootstrapFiles:

diff --git a/src/Document/Newsletter/SendingParamContainer.php b/src/Document/Newsletter/SendingParamContainer.php
@@ -34,7 +34,7 @@ class SendingParamContainer
      * SendingParamContainer constructor.
      *
      */
-    public function __construct(string $email, array $params = null)
+    public function __construct(string $email, ?array $params = null)
     {
         $this->email = $email;
         $this->params = $params;

diff --git a/src/Model/Document/Newsletter/Dao.php b/src/Model/Document/Newsletter/Dao.php
@@ -31,7 +31,7 @@ class Dao extends Model\Document\Email\Dao
      *
      * @throws Model\Exception\NotFoundException
      */
-    public function getById(int $id = null): void
+    public function getById(?int $id = null): void
     {
         if ($id != null) {
             $this->model->setId($id);

diff --git a/src/Tool/Newsletter.php b/src/Tool/Newsletter.php
@@ -65,8 +65,8 @@ public function __construct(string $classId)
      */
     public static function prepareMail(
         NewsletterDocument $newsletterDocument,
-        SendingParamContainer $sendingContainer = null,
-        string $hostUrl = null
+        ?SendingParamContainer $sendingContainer = null,
+        ?string $hostUrl = null
     ): Mail {
         $mail = new Mail();
         $mail->setIgnoreDebugMode(true);