docs: add type hint for psalm

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
nextcloud · Dec 7, 2022 · f523fa3 · f523fa3
1 parent 50aeb6f
commit f523fa3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/Cache/Cache.php b/lib/Cache/Cache.php
@@ -132,6 +132,7 @@ public function save(): void {
 				foreach (array_keys(array_flip($val['slice'])) as $slice) {
 					$data = [];
 					foreach (array_keys($s['s'], $slice) as $uid) {
+						/** @var int $uid */
 						$data[$uid] = is_array($d[$uid])
 							? serialize($d[$uid])
 							: $d[$uid];
@@ -387,7 +388,7 @@ protected function _loadUids($mailbox, $uids, $uidvalid = null): void {
 	 * @return void
 	 */
 	protected function _loadSlice($mailbox, $slice) {
-		$cache_id = $this->_getCid($mailbox, $slice);
+		$cache_id = $this->_getCid($mailbox, (string)$slice);
 
 		if (!empty($this->_loaded[$cache_id])) {
 			return;

diff --git a/lib/Service/MimeMessage.php b/lib/Service/MimeMessage.php
@@ -24,6 +24,7 @@
 namespace OCA\Mail\Service;
 
 use DOMDocument;
+use DOMElement;
 use DOMNode;
 use Horde_Mime_Part;
 use Horde_Text_Filter;
@@ -53,7 +54,7 @@ public function build(bool $isHtml, string $content, array $attachments): Horde_
 
 			for ($i = 0; $i < $images->count(); $i++) {
 				$image = $images->item($i);
-				if ($image === null) {
+				if (!($image instanceof DOMElement)) {
 					continue;
 				}
 
@@ -164,8 +165,10 @@ public function build(bool $isHtml, string $content, array $attachments): Horde_
 	 * @return string|null non-null, add this text to the output and skip further processing of the node.
 	 */
 	public function htmlToTextCallback(DOMDocument $doc, DOMNode $node) {
-		if ($node instanceof \DOMElement && strtolower($node->tagName) === 'p') {
-			return $node->textContent . "\n";
+		if ($node instanceof DOMElement) {
+			if (strtolower($node->tagName) === 'p') {
+				return $node->textContent . "\n";
+			}
 		}
 
 		return null;