Fix psalm issues to fix CI build

mstilkerich · Sep 11, 2021 · 512bcb6 · 512bcb6
1 parent f083b17
commit 512bcb6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/DataConversion.php b/src/DataConversion.php
@@ -1130,6 +1130,7 @@ private static function composeDisplayname(array $save_data): string
         $dname = [];
         foreach (["firstname", "surname"] as $attr) {
             if (!empty($save_data[$attr])) {
+                /** @psalm-var string */
                 $dname[] = $save_data[$attr];
             }
         }

diff --git a/src/Db/AbstractDatabase.php b/src/Db/AbstractDatabase.php
@@ -46,6 +46,7 @@
  * }
  *
  * @psalm-import-type SaveDataFromDC from \MStilkerich\CardDavAddressbook4Roundcube\DataConversion
+ * @psalm-import-type SaveDataMultiField from \MStilkerich\CardDavAddressbook4Roundcube\DataConversion
  */
 abstract class AbstractDatabase
 {
@@ -191,7 +192,8 @@ public function storeContact(
         $email_keys = preg_grep('/^email(:|$)/', array_keys($save_data));
         $email_addrs = [];
         foreach ($email_keys as $email_key) {
-            $email_addrs = array_merge($email_addrs, (array) $save_data[$email_key]);
+            /** @psalm-var SaveDataMultiField $save_data[$email_key] */
+            $email_addrs = array_merge($email_addrs, $save_data[$email_key]);
         }
         $save_data['email'] = implode(', ', $email_addrs);