From 67e3a992f7ac707297c9cbae02bc7a4839c9debb Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Sun, 12 Jan 2025 08:53:49 +0100
Subject: [PATCH 01/14] feat(psalm): Enable finding unused baseline entries

Signed-off-by: provokateurin <kate@provokateurin.de>
---
 psalm.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/psalm.xml b/psalm.xml
index b86e8799c..35eb0ab4f 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -6,6 +6,7 @@
 		xmlns="https://getpsalm.org/schema/config"
 		xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
 		errorBaseline="tests/psalm-baseline.xml"
+		findUnusedBaselineEntry="true"
 >
 	<!--
 	SPDX-FileCopyrightText: Christian Wolf <github@christianwolf.email>

From bd11ad2c6df5a24cb938d44d07db3a3698bcc72d Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Sat, 4 Jan 2025 00:50:58 +0100
Subject: [PATCH 02/14] fix(composer): Use correct OCP version

Signed-off-by: provokateurin <kate@provokateurin.de>
---
 composer.json            |   4 +-
 composer.lock            |  26 +++++-----
 tests/psalm-baseline.xml | 109 ++++++++++++++-------------------------
 3 files changed, 55 insertions(+), 84 deletions(-)

diff --git a/composer.json b/composer.json
index 8db009ef1..05f5d8117 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
         "nextcloud/coding-standard": "^1.0.0",
         "christophwurst/nextcloud_testing": "^1.0.0",
         "psalm/phar": "^5.12",
-        "nextcloud/ocp": "^27.0"
+        "nextcloud/ocp": "dev-stable28"
     },
     "scripts": {
         "cs:check": "./vendor/bin/php-cs-fixer fix --dry-run --diff",
@@ -31,7 +31,7 @@
     },
     "config": {
         "platform": {
-            "php": "7.4"
+            "php": "8.0"
         }
     }
 }
diff --git a/composer.lock b/composer.lock
index e05a1779c..6f79bece4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "418ab4ba5a5387a733911562eb0e66a6",
+    "content-hash": "6839ae5646dea95524fd8e330b23aa06",
     "packages": [],
     "packages-dev": [
         {
@@ -268,20 +268,20 @@
         },
         {
             "name": "nextcloud/ocp",
-            "version": "v27.1.9",
+            "version": "dev-stable28",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nextcloud-deps/ocp.git",
-                "reference": "f451f80f29eda90c3283e9ad90c83e0a09a03010"
+                "reference": "d1399b589aa6c0393b4f62bd7022315a711d8c09"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/f451f80f29eda90c3283e9ad90c83e0a09a03010",
-                "reference": "f451f80f29eda90c3283e9ad90c83e0a09a03010",
+                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/d1399b589aa6c0393b4f62bd7022315a711d8c09",
+                "reference": "d1399b589aa6c0393b4f62bd7022315a711d8c09",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.4 || ~8.0 || ~8.1",
+                "php": "~8.0 || ~8.1 || ~8.2 || ~8.3",
                 "psr/clock": "^1.0",
                 "psr/container": "^2.0.2",
                 "psr/event-dispatcher": "^1.0",
@@ -290,7 +290,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-stable27": "27.0.0-dev"
+                    "dev-stable28": "28.0.0-dev"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -306,9 +306,9 @@
             "description": "Composer package containing Nextcloud's public API (classes, interfaces)",
             "support": {
                 "issues": "https://github.com/nextcloud-deps/ocp/issues",
-                "source": "https://github.com/nextcloud-deps/ocp/tree/v27.1.9"
+                "source": "https://github.com/nextcloud-deps/ocp/tree/stable28"
             },
-            "time": "2024-04-11T00:33:20+00:00"
+            "time": "2025-01-08T00:43:56+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -2492,15 +2492,17 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "nextcloud/ocp": 20
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
         "ext-libxml": "*"
     },
-    "platform-dev": [],
+    "platform-dev": {},
     "platform-overrides": {
-        "php": "7.4"
+        "php": "8.0"
     },
     "plugin-api-version": "2.6.0"
 }
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index 755e475b4..1f1745399 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -1,51 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
-  <file src="lib/Controller/Implementation/CategoryImplementation.php">
-    <InvalidArgument>
-      <code><![CDATA[$e->getMessage()]]></code>
-      <code><![CDATA['New category name not found in data']]></code>
-    </InvalidArgument>
-  </file>
-  <file src="lib/Controller/Implementation/ConfigImplementation.php">
-    <InvalidArgument>
-      <code><![CDATA['OK']]></code>
-      <code><![CDATA['Search index rebuilt successfully']]></code>
-    </InvalidArgument>
-  </file>
-  <file src="lib/Controller/Implementation/RecipeImplementation.php">
-    <InvalidArgument>
-      <code><![CDATA[$e->getMessage()]]></code>
-      <code><![CDATA[$e->getMessage()]]></code>
-      <code><![CDATA[$e->getMessage()]]></code>
-      <code><![CDATA[$e->getMessage()]]></code>
-      <code><![CDATA[$e->getMessage()]]></code>
-      <code><![CDATA[$file->getParent()->getId()]]></code>
-      <code><![CDATA[$file->getParent()->getId()]]></code>
-      <code>$id</code>
-      <code><![CDATA['Field "url" is required']]></code>
-      <code><![CDATA['Recipe ' . $id . ' deleted successfully']]></code>
-    </InvalidArgument>
-    <TooManyArguments>
-      <code><![CDATA[new JSONResponse($recipes, 200, ['Content-Type' => 'application/json'])]]></code>
-      <code><![CDATA[new JSONResponse($recipes, Http::STATUS_OK, ['Content-Type' => 'application/json'])]]></code>
-      <code><![CDATA[new JSONResponse($recipes, Http::STATUS_OK, ['Content-Type' => 'application/json'])]]></code>
-    </TooManyArguments>
-  </file>
+<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
   <file src="lib/Db/RecipeDb.php">
     <RedundantCondition>
       <code><![CDATA[$keywords && is_array($keywords)]]></code>
-      <code>is_array($keywords)</code>
+      <code><![CDATA[is_array($keywords)]]></code>
     </RedundantCondition>
   </file>
   <file src="lib/Helper/Filter/JSON/FixInstructionsFilter.php">
     <NamedArgumentNotAllowed>
-      <code>$instructions</code>
-      <code>$newElements</code>
+      <code><![CDATA[$instructions]]></code>
+      <code><![CDATA[$newElements]]></code>
     </NamedArgumentNotAllowed>
   </file>
   <file src="lib/Helper/Filter/JSON/SchemaConformityFilter.php">
     <FalseOperand>
-      <code>$changed</code>
+      <code><![CDATA[$changed]]></code>
     </FalseOperand>
     <InvalidOperand>
       <code><![CDATA[$this->setJSONValue($json, '@type', 'Recipe')]]></code>
@@ -53,51 +22,51 @@
   </file>
   <file src="lib/Helper/HTMLParser/HttpMicrodataParser.php">
     <UndefinedMethod>
-      <code>getAttribute</code>
-      <code>getAttribute</code>
-      <code>getElementsByTagName</code>
-      <code>hasAttribute</code>
+      <code><![CDATA[getAttribute]]></code>
+      <code><![CDATA[getAttribute]]></code>
+      <code><![CDATA[getElementsByTagName]]></code>
+      <code><![CDATA[hasAttribute]]></code>
     </UndefinedMethod>
   </file>
   <file src="lib/Helper/ImageService/ThumbnailFileHelper.php">
     <UndefinedDocblockClass>
-      <code>GenericFileException</code>
-      <code>GenericFileException</code>
-      <code>InvalidPathException</code>
-      <code>InvalidPathException</code>
-      <code>InvalidThumbnailTypeException</code>
-      <code>InvalidThumbnailTypeException</code>
-      <code>LockedException</code>
-      <code>LockedException</code>
+      <code><![CDATA[GenericFileException]]></code>
+      <code><![CDATA[GenericFileException]]></code>
+      <code><![CDATA[InvalidPathException]]></code>
+      <code><![CDATA[InvalidPathException]]></code>
+      <code><![CDATA[InvalidThumbnailTypeException]]></code>
+      <code><![CDATA[InvalidThumbnailTypeException]]></code>
+      <code><![CDATA[LockedException]]></code>
+      <code><![CDATA[LockedException]]></code>
     </UndefinedDocblockClass>
   </file>
   <file src="lib/Helper/RestParameterParser.php">
     <InvalidReturnType>
-      <code>array</code>
+      <code><![CDATA[array]]></code>
     </InvalidReturnType>
   </file>
   <file src="lib/Helper/UserConfigHelper.php">
     <InvalidScalarArgument>
-      <code>$value</code>
+      <code><![CDATA[$value]]></code>
     </InvalidScalarArgument>
   </file>
   <file src="lib/Helper/UserFolderHelper.php">
     <MissingDependency>
       <code><![CDATA[$this->root]]></code>
       <code><![CDATA[$this->root]]></code>
-      <code>IRootFolder</code>
-      <code>IRootFolder</code>
+      <code><![CDATA[IRootFolder]]></code>
+      <code><![CDATA[IRootFolder]]></code>
     </MissingDependency>
   </file>
   <file src="lib/Service/ImageService.php">
     <UndefinedDocblockClass>
-      <code>GenericFileException</code>
-      <code>InvalidPathException</code>
-      <code>InvalidThumbnailTypeException</code>
-      <code>NoRecipeImageFoundException</code>
-      <code>NoRecipeImageFoundException</code>
-      <code>NoRecipeImageFoundException</code>
-      <code>RecipeImageExistsException</code>
+      <code><![CDATA[GenericFileException]]></code>
+      <code><![CDATA[InvalidPathException]]></code>
+      <code><![CDATA[InvalidThumbnailTypeException]]></code>
+      <code><![CDATA[NoRecipeImageFoundException]]></code>
+      <code><![CDATA[NoRecipeImageFoundException]]></code>
+      <code><![CDATA[NoRecipeImageFoundException]]></code>
+      <code><![CDATA[RecipeImageExistsException]]></code>
     </UndefinedDocblockClass>
   </file>
   <file src="lib/Service/RecipeService.php">
@@ -106,26 +75,26 @@
       <code><![CDATA[$this->root]]></code>
       <code><![CDATA[$this->root]]></code>
       <code><![CDATA[$this->root]]></code>
-      <code>IRootFolder</code>
+      <code><![CDATA[IRootFolder]]></code>
     </MissingDependency>
     <RedundantCondition>
       <code><![CDATA[!array_key_exists('dateCreated', $json) && method_exists($file, 'getCreationTime')]]></code>
     </RedundantCondition>
     <UndefinedInterfaceMethod>
-      <code>newFile</code>
-      <code>newFile</code>
-      <code>newFile</code>
-      <code>nodeExists</code>
+      <code><![CDATA[newFile]]></code>
+      <code><![CDATA[newFile]]></code>
+      <code><![CDATA[newFile]]></code>
+      <code><![CDATA[nodeExists]]></code>
     </UndefinedInterfaceMethod>
   </file>
   <file src="lib/Service/ThumbnailService.php">
     <MissingDependency>
-      <code>$img</code>
-      <code>$img</code>
-      <code>$img</code>
-      <code>$img</code>
-      <code>$img</code>
-      <code>Image</code>
+      <code><![CDATA[$img]]></code>
+      <code><![CDATA[$img]]></code>
+      <code><![CDATA[$img]]></code>
+      <code><![CDATA[$img]]></code>
+      <code><![CDATA[$img]]></code>
+      <code><![CDATA[Image]]></code>
     </MissingDependency>
   </file>
 </files>

From 2cef63f82005b2ba23c0a1aa2ef094f0cc5ae53c Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Sat, 4 Jan 2025 00:37:29 +0100
Subject: [PATCH 03/14] fix(composer): Add missing ext-dom dependency

Signed-off-by: provokateurin <kate@provokateurin.de>
---
 composer.json | 3 ++-
 composer.lock | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 05f5d8117..138a80860 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,8 @@
         }
     ],
     "require": {
-      "ext-libxml": "*"
+		"ext-libxml": "*",
+        "ext-dom": "*"
     },
     "require-dev": {
         "nextcloud/coding-standard": "^1.0.0",
diff --git a/composer.lock b/composer.lock
index 6f79bece4..f093c5cd0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6839ae5646dea95524fd8e330b23aa06",
+    "content-hash": "e5146684b199d0f423995ee72c758d0c",
     "packages": [],
     "packages-dev": [
         {
@@ -2498,7 +2498,8 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "ext-libxml": "*"
+        "ext-libxml": "*",
+        "ext-dom": "*"
     },
     "platform-dev": {},
     "platform-overrides": {

From b955a6418886c05e5ed070206d5ee6f47d953607 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Sat, 4 Jan 2025 00:51:13 +0100
Subject: [PATCH 04/14] fix(psalm): Check against correct PHP version

Signed-off-by: provokateurin <kate@provokateurin.de>
---
 psalm.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/psalm.xml b/psalm.xml
index 35eb0ab4f..6e49d1155 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -7,6 +7,7 @@
 		xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
 		errorBaseline="tests/psalm-baseline.xml"
 		findUnusedBaselineEntry="true"
+		phpVersion="8.0"
 >
 	<!--
 	SPDX-FileCopyrightText: Christian Wolf <github@christianwolf.email>

From dfa66f5c98cc14dfb037f817c8689bde8a6dda7f Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Sat, 4 Jan 2025 00:24:22 +0100
Subject: [PATCH 05/14] fix(RecipeService): Stop unnecessarily checking for
 methods on File

Signed-off-by: provokateurin <kate@provokateurin.de>
---
 lib/Service/RecipeService.php | 10 ++--------
 tests/psalm-baseline.xml      |  3 ---
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/lib/Service/RecipeService.php b/lib/Service/RecipeService.php
index b7c0cf7cc..a8a0d51c1 100755
--- a/lib/Service/RecipeService.php
+++ b/lib/Service/RecipeService.php
@@ -566,14 +566,8 @@ public function getVisibleInfoBlocks(): array {
 
 	/**
 	 * Get recipe file contents as an array
-	 *
-	 * @param File $file
 	 */
-	public function parseRecipeFile($file): ?array {
-		if (!$file) {
-			return null;
-		}
-
+	public function parseRecipeFile(File $file): ?array {
 		$json = json_decode($file->getContent(), true);
 
 		if (!$json) {
@@ -583,7 +577,7 @@ public function parseRecipeFile($file): ?array {
 		$json['id'] = $file->getParent()->getId();
 
 
-		if (!array_key_exists('dateCreated', $json) && method_exists($file, 'getCreationTime')) {
+		if (!array_key_exists('dateCreated', $json)) {
 			$json['dateCreated'] = $file->getCreationTime();
 		}
 
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index 1f1745399..688a54ff8 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -77,9 +77,6 @@
       <code><![CDATA[$this->root]]></code>
       <code><![CDATA[IRootFolder]]></code>
     </MissingDependency>
-    <RedundantCondition>
-      <code><![CDATA[!array_key_exists('dateCreated', $json) && method_exists($file, 'getCreationTime')]]></code>
-    </RedundantCondition>
     <UndefinedInterfaceMethod>
       <code><![CDATA[newFile]]></code>
       <code><![CDATA[newFile]]></code>

From 8c4583e517760adeccba1ce278312be85e54218e Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Sat, 4 Jan 2025 00:28:15 +0100
Subject: [PATCH 06/14] fix(RecipeService): Catch recipe folder not being a
 folder

Signed-off-by: provokateurin <kate@provokateurin.de>
---
 lib/Service/RecipeService.php | 3 +++
 tests/psalm-baseline.xml      | 6 ------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/Service/RecipeService.php b/lib/Service/RecipeService.php
index a8a0d51c1..c26ed514a 100755
--- a/lib/Service/RecipeService.php
+++ b/lib/Service/RecipeService.php
@@ -224,6 +224,9 @@ public function addRecipe($json, $importedHtml = null) {
 		if (isset($json['id']) && $json['id']) {
 			// Recipe already has an id, update it
 			$recipe_folder = $user_folder->getById($json['id'])[0];
+			if (!($recipe_folder instanceof Folder)) {
+				throw new \RuntimeException($this->il10n->t('Unexpected node received for recipe folder.'));
+			}
 
 			$old_path = $recipe_folder->getPath();
 			$new_path = dirname($old_path) . '/' . $recipeFolderName;
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index 688a54ff8..a1372be03 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -77,12 +77,6 @@
       <code><![CDATA[$this->root]]></code>
       <code><![CDATA[IRootFolder]]></code>
     </MissingDependency>
-    <UndefinedInterfaceMethod>
-      <code><![CDATA[newFile]]></code>
-      <code><![CDATA[newFile]]></code>
-      <code><![CDATA[newFile]]></code>
-      <code><![CDATA[nodeExists]]></code>
-    </UndefinedInterfaceMethod>
   </file>
   <file src="lib/Service/ThumbnailService.php">
     <MissingDependency>

From 82a0fad55508f34fc97b25983478003c139d255a Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Sat, 4 Jan 2025 00:30:19 +0100
Subject: [PATCH 07/14] fix(ImageService): Add missing exception imports

Signed-off-by: provokateurin <kate@provokateurin.de>
---
 lib/Service/ImageService.php |  5 +++++
 tests/psalm-baseline.xml     | 11 -----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/lib/Service/ImageService.php b/lib/Service/ImageService.php
index ba769c20a..14316aa4b 100644
--- a/lib/Service/ImageService.php
+++ b/lib/Service/ImageService.php
@@ -2,10 +2,15 @@
 
 namespace OCA\Cookbook\Service;
 
+use OCA\Cookbook\Exception\InvalidThumbnailTypeException;
+use OCA\Cookbook\Exception\NoRecipeImageFoundException;
+use OCA\Cookbook\Exception\RecipeImageExistsException;
 use OCA\Cookbook\Helper\ImageService\ImageFileHelper;
 use OCA\Cookbook\Helper\ImageService\ThumbnailFileHelper;
 use OCP\Files\File;
 use OCP\Files\Folder;
+use OCP\Files\GenericFileException;
+use OCP\Files\InvalidPathException;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
 use OCP\Lock\LockedException;
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index a1372be03..a100fe76e 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -58,17 +58,6 @@
       <code><![CDATA[IRootFolder]]></code>
     </MissingDependency>
   </file>
-  <file src="lib/Service/ImageService.php">
-    <UndefinedDocblockClass>
-      <code><![CDATA[GenericFileException]]></code>
-      <code><![CDATA[InvalidPathException]]></code>
-      <code><![CDATA[InvalidThumbnailTypeException]]></code>
-      <code><![CDATA[NoRecipeImageFoundException]]></code>
-      <code><![CDATA[NoRecipeImageFoundException]]></code>
-      <code><![CDATA[NoRecipeImageFoundException]]></code>
-      <code><![CDATA[RecipeImageExistsException]]></code>
-    </UndefinedDocblockClass>
-  </file>
   <file src="lib/Service/RecipeService.php">
     <MissingDependency>
       <code><![CDATA[$this->root]]></code>

From 81cf21fc6131f38ccb4a07b7619f1f3e13772168 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Sat, 4 Jan 2025 00:31:39 +0100
Subject: [PATCH 08/14] fix(UserConfigHelper): Explicitly cast value to string

Signed-off-by: provokateurin <kate@provokateurin.de>
---
 lib/Helper/UserConfigHelper.php | 2 +-
 tests/psalm-baseline.xml        | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/Helper/UserConfigHelper.php b/lib/Helper/UserConfigHelper.php
index f78cc5f62..a4b2efe51 100644
--- a/lib/Helper/UserConfigHelper.php
+++ b/lib/Helper/UserConfigHelper.php
@@ -124,7 +124,7 @@ public function getUpdateInterval(): int {
 	 * @throws UserNotLoggedInException if no user is logged in
 	 */
 	public function setUpdateInterval(int $value): void {
-		$this->setRawValue(self::KEY_UPDATE_INTERVAL, $value);
+		$this->setRawValue(self::KEY_UPDATE_INTERVAL, (string)$value);
 	}
 
 	/**
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index a100fe76e..e9446f2a2 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -45,11 +45,6 @@
       <code><![CDATA[array]]></code>
     </InvalidReturnType>
   </file>
-  <file src="lib/Helper/UserConfigHelper.php">
-    <InvalidScalarArgument>
-      <code><![CDATA[$value]]></code>
-    </InvalidScalarArgument>
-  </file>
   <file src="lib/Helper/UserFolderHelper.php">
     <MissingDependency>
       <code><![CDATA[$this->root]]></code>

From fb0e10cf74edd917ab159bac3c61f44282621e42 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Sat, 4 Jan 2025 00:33:23 +0100
Subject: [PATCH 09/14] fix(RestParameterParser): Handle unsupported
 content-types

Signed-off-by: provokateurin <kate@provokateurin.de>
---
 lib/Helper/RestParameterParser.php | 2 ++
 tests/psalm-baseline.xml           | 5 -----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/Helper/RestParameterParser.php b/lib/Helper/RestParameterParser.php
index 6e6bac3f5..deb5e30eb 100644
--- a/lib/Helper/RestParameterParser.php
+++ b/lib/Helper/RestParameterParser.php
@@ -55,6 +55,8 @@ public function getParameters(): array {
 					}
 
 					break;
+				default:
+					throw new \Exception($this->l->t('Unsupported type of transmitted data. This is a bug, please report it.'));
 			}
 		} else {
 			throw new \Exception($this->l->t('Cannot detect type of transmitted data. This is a bug, please report it.'));
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index e9446f2a2..dfb6d7a99 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -40,11 +40,6 @@
       <code><![CDATA[LockedException]]></code>
     </UndefinedDocblockClass>
   </file>
-  <file src="lib/Helper/RestParameterParser.php">
-    <InvalidReturnType>
-      <code><![CDATA[array]]></code>
-    </InvalidReturnType>
-  </file>
   <file src="lib/Helper/UserFolderHelper.php">
     <MissingDependency>
       <code><![CDATA[$this->root]]></code>

From bd6b11bbf4fbea96648c271f736f3aef9dda4c07 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Sat, 4 Jan 2025 00:34:27 +0100
Subject: [PATCH 10/14] fix(ThumbnailFileHelper): Add missing exception imports

Signed-off-by: provokateurin <kate@provokateurin.de>
---
 lib/Helper/ImageService/ThumbnailFileHelper.php |  4 ++++
 tests/psalm-baseline.xml                        | 12 ------------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/lib/Helper/ImageService/ThumbnailFileHelper.php b/lib/Helper/ImageService/ThumbnailFileHelper.php
index ae16f8810..3a23af29c 100644
--- a/lib/Helper/ImageService/ThumbnailFileHelper.php
+++ b/lib/Helper/ImageService/ThumbnailFileHelper.php
@@ -2,12 +2,16 @@
 
 namespace OCA\Cookbook\Helper\ImageService;
 
+use OCA\Cookbook\Exception\InvalidThumbnailTypeException;
 use OCA\Cookbook\Exception\NoRecipeImageFoundException;
 use OCP\Files\File;
 use OCP\Files\Folder;
+use OCP\Files\GenericFileException;
+use OCP\Files\InvalidPathException;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
 use OCP\IL10N;
+use OCP\Lock\LockedException;
 
 /**
  * This class allows to handle the files of the thumbnails
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index dfb6d7a99..6ea453b0f 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -28,18 +28,6 @@
       <code><![CDATA[hasAttribute]]></code>
     </UndefinedMethod>
   </file>
-  <file src="lib/Helper/ImageService/ThumbnailFileHelper.php">
-    <UndefinedDocblockClass>
-      <code><![CDATA[GenericFileException]]></code>
-      <code><![CDATA[GenericFileException]]></code>
-      <code><![CDATA[InvalidPathException]]></code>
-      <code><![CDATA[InvalidPathException]]></code>
-      <code><![CDATA[InvalidThumbnailTypeException]]></code>
-      <code><![CDATA[InvalidThumbnailTypeException]]></code>
-      <code><![CDATA[LockedException]]></code>
-      <code><![CDATA[LockedException]]></code>
-    </UndefinedDocblockClass>
-  </file>
   <file src="lib/Helper/UserFolderHelper.php">
     <MissingDependency>
       <code><![CDATA[$this->root]]></code>

From b0073cb2f93cf001796f69af82d963c5b6b1abbc Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Sat, 4 Jan 2025 00:39:48 +0100
Subject: [PATCH 11/14] fix(HttpMicrodataParser): Use concrete DOMNode
 sub-types to fix polymorphic calls

Signed-off-by: provokateurin <kate@provokateurin.de>
---
 lib/Helper/HTMLParser/HttpMicrodataParser.php | 13 +++++++------
 tests/psalm-baseline.xml                      |  8 --------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/lib/Helper/HTMLParser/HttpMicrodataParser.php b/lib/Helper/HTMLParser/HttpMicrodataParser.php
index 259963d41..1ce27daab 100644
--- a/lib/Helper/HTMLParser/HttpMicrodataParser.php
+++ b/lib/Helper/HTMLParser/HttpMicrodataParser.php
@@ -3,6 +3,7 @@
 namespace OCA\Cookbook\Helper\HTMLParser;
 
 use DOMDocument;
+use DOMElement;
 use DOMNode;
 use DOMNodeList;
 use DOMXPath;
@@ -58,9 +59,9 @@ public function parse(DOMDocument $document, ?string $url): array {
 	/**
 	 * Parse a DOM node that represents a recipe
 	 *
-	 * @param DOMNode $recipeNode The DOM node to parse
+	 * @param DOMElement $recipeNode The DOM node to parse
 	 */
-	private function parseRecipe(DOMNode $recipeNode): void {
+	private function parseRecipe(DOMElement $recipeNode): void {
 		$this->searchSimpleProperties($recipeNode, 'name');
 		$this->searchSimpleProperties($recipeNode, 'keywords');
 		$this->searchSimpleProperties($recipeNode, 'category');
@@ -75,9 +76,9 @@ private function parseRecipe(DOMNode $recipeNode): void {
 
 	/**
 	 * Make one final desperate attempt at getting the instructions
-	 * @param DOMNode $recipeNode The recipe node to use
+	 * @param DOMElement $recipeNode The recipe node to use
 	 */
-	private function fixupInstructions(DOMNode $recipeNode): void {
+	private function fixupInstructions(DOMElement $recipeNode): void {
 		if (
 			!isset($this->recipe['recipeInstructions']) ||
 			!$this->recipe['recipeInstructions'] || sizeof($this->recipe['recipeInstructions']) < 1
@@ -254,12 +255,12 @@ private function extractAttribute(DOMNodeList $nodes, array $attributes): array
 	 * This can be used to extract a single attribute from the DOM tree.
 	 * The attributes are evaluated first to last and the first found attribute is returned.
 	 *
-	 * @param DOMNode $node The  node to evaluate
+	 * @param DOMElement $node The  node to evaluate
 	 * @param array $attributes The possible attributes to check
 	 * @throws AttributeNotFoundException If none of the named attributes is found
 	 * @return string The value of the attribute
 	 */
-	private function extractSingeAttribute(DOMNode $node, array $attributes): string {
+	private function extractSingeAttribute(DOMElement $node, array $attributes): string {
 		foreach ($attributes as $attr) {
 			if ($node->hasAttribute($attr) && !empty($node->getAttribute($attr))) {
 				return $node->getAttribute($attr);
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index 6ea453b0f..1e3cee83f 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -20,14 +20,6 @@
       <code><![CDATA[$this->setJSONValue($json, '@type', 'Recipe')]]></code>
     </InvalidOperand>
   </file>
-  <file src="lib/Helper/HTMLParser/HttpMicrodataParser.php">
-    <UndefinedMethod>
-      <code><![CDATA[getAttribute]]></code>
-      <code><![CDATA[getAttribute]]></code>
-      <code><![CDATA[getElementsByTagName]]></code>
-      <code><![CDATA[hasAttribute]]></code>
-    </UndefinedMethod>
-  </file>
   <file src="lib/Helper/UserFolderHelper.php">
     <MissingDependency>
       <code><![CDATA[$this->root]]></code>

From b887874c67cd2ffd1b9339c1a0a1a01c7e803920 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Sat, 4 Jan 2025 00:41:18 +0100
Subject: [PATCH 12/14] fix(SchemaConformityFilter): Fix type coercions for
 boolean operators

Signed-off-by: provokateurin <kate@provokateurin.de>
---
 lib/Helper/Filter/JSON/SchemaConformityFilter.php | 12 +++++++-----
 tests/psalm-baseline.xml                          |  8 --------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/lib/Helper/Filter/JSON/SchemaConformityFilter.php b/lib/Helper/Filter/JSON/SchemaConformityFilter.php
index 920869665..f4e5b55eb 100644
--- a/lib/Helper/Filter/JSON/SchemaConformityFilter.php
+++ b/lib/Helper/Filter/JSON/SchemaConformityFilter.php
@@ -8,10 +8,12 @@
 class SchemaConformityFilter extends AbstractJSONFilter {
 	public function apply(array &$json): bool {
 		$changed = false;
-
-		$changed |= $this->setJSONValue($json, '@context', 'http://schema.org');
-		$changed |= $this->setJSONValue($json, '@type', 'Recipe');
-
-		return (bool)$changed;
+		if ($this->setJSONValue($json, '@context', 'http://schema.org')) {
+			$changed = true;
+		}
+		if ($this->setJSONValue($json, '@type', 'Recipe')) {
+			$changed = true;
+		}
+		return $changed;
 	}
 }
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index 1e3cee83f..2293f2cc0 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -12,14 +12,6 @@
       <code><![CDATA[$newElements]]></code>
     </NamedArgumentNotAllowed>
   </file>
-  <file src="lib/Helper/Filter/JSON/SchemaConformityFilter.php">
-    <FalseOperand>
-      <code><![CDATA[$changed]]></code>
-    </FalseOperand>
-    <InvalidOperand>
-      <code><![CDATA[$this->setJSONValue($json, '@type', 'Recipe')]]></code>
-    </InvalidOperand>
-  </file>
   <file src="lib/Helper/UserFolderHelper.php">
     <MissingDependency>
       <code><![CDATA[$this->root]]></code>

From 144e0aff23296b32bcd261b88f928cc0942d302e Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Sat, 4 Jan 2025 00:45:29 +0100
Subject: [PATCH 13/14] fix(FixInstructionsFilter): Prevent accidentally
 calling array_merge() with named arguments

Signed-off-by: provokateurin <kate@provokateurin.de>
---
 lib/Helper/Filter/JSON/FixInstructionsFilter.php | 4 ++--
 tests/psalm-baseline.xml                         | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/lib/Helper/Filter/JSON/FixInstructionsFilter.php b/lib/Helper/Filter/JSON/FixInstructionsFilter.php
index 191f0c93e..2658e159f 100644
--- a/lib/Helper/Filter/JSON/FixInstructionsFilter.php
+++ b/lib/Helper/Filter/JSON/FixInstructionsFilter.php
@@ -107,7 +107,7 @@ public function apply(array &$json): bool {
 			}
 
 			ksort($instructions);
-			$instructions = array_merge(...$instructions);
+			$instructions = array_merge([], ...$instructions);
 		}
 
 		$instructions = array_map(function ($x) {
@@ -160,7 +160,7 @@ private function flattenItemList(array $list): array {
 		}
 
 		ksort($newElements);
-		$elements = array_merge(...$newElements);
+		$elements = array_merge([], ...$newElements);
 
 		return $elements;
 	}
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index 2293f2cc0..811e76fb5 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -6,12 +6,6 @@
       <code><![CDATA[is_array($keywords)]]></code>
     </RedundantCondition>
   </file>
-  <file src="lib/Helper/Filter/JSON/FixInstructionsFilter.php">
-    <NamedArgumentNotAllowed>
-      <code><![CDATA[$instructions]]></code>
-      <code><![CDATA[$newElements]]></code>
-    </NamedArgumentNotAllowed>
-  </file>
   <file src="lib/Helper/UserFolderHelper.php">
     <MissingDependency>
       <code><![CDATA[$this->root]]></code>

From 4b716901dd716df8f704864a2a3e2e36783a3165 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Sat, 4 Jan 2025 00:46:38 +0100
Subject: [PATCH 14/14] fix(RecipeDb): Remove unnecessary is_array() check

Signed-off-by: provokateurin <kate@provokateurin.de>
---
 lib/Db/RecipeDb.php      | 2 +-
 tests/psalm-baseline.xml | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/lib/Db/RecipeDb.php b/lib/Db/RecipeDb.php
index daefcc747..e951ea690 100755
--- a/lib/Db/RecipeDb.php
+++ b/lib/Db/RecipeDb.php
@@ -349,7 +349,7 @@ public function getRecipesByKeywords(string $keywords, string $user_id) {
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException if not found
 	 */
 	public function findRecipes(array $keywords, string $user_id) {
-		$has_keywords = $keywords && is_array($keywords) && $keywords[0];
+		$has_keywords = $keywords && $keywords[0];
 
 		if (!$has_keywords) {
 			return $this->findAllRecipes($user_id);
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index 811e76fb5..46b21b2fe 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
-  <file src="lib/Db/RecipeDb.php">
-    <RedundantCondition>
-      <code><![CDATA[$keywords && is_array($keywords)]]></code>
-      <code><![CDATA[is_array($keywords)]]></code>
-    </RedundantCondition>
-  </file>
   <file src="lib/Helper/UserFolderHelper.php">
     <MissingDependency>
       <code><![CDATA[$this->root]]></code>