Merge pull request #89 from LibreSign/chore/bump-psalm

chore: bump psalm

Author: vitormattos

composer.json

@@ -9,26 +9,23 @@
     "type": "library",
     "license": "AGPL-3.0-or-later",
     "prefer-stable": true,
-    "authors": [
-        {
-            "name": "Vitor Mattos",
-            "email": "vitor@php.rio"
-        }
-    ],
+    "authors": [{
+        "name": "Vitor Mattos",
+        "email": "vitor@php.rio"
+    }],
     "scripts": {
         "bin": "echo 'bin not installed'",
         "cs:check": "php-cs-fixer fix --dry-run --diff",
         "cs:fix": "php-cs-fixer fix",
         "psalm": "psalm --threads=1",
-        "psalm:update-baseline": "psalm --threads=1 --update-baseline --set-baseline=psalm-baseline.xml",
-        "psalm:clear": "psalm --clear-cache && psalm --clear-global-cache",
+        "psalm:update-baseline": "psalm --no-cache --threads=$(nproc) --update-baseline --set-baseline=psalm-baseline.xml",
         "post-install-cmd": [
-          "@composer bin all install --ansi",
-          "composer dump-autoload"
+            "@composer bin all install --ansi",
+            "composer dump-autoload"
         ],
         "post-update-cmd": [
-          "@composer bin all update --ansi",
-          "composer dump-autoload"
+            "@composer bin all update --ansi",
+            "composer dump-autoload"
         ]
     },
     "require": {
@@ -53,14 +50,14 @@
         }
     },
     "extra": {
-      "bamarni-bin": {
-        "bin-links": true,
-        "forward-command": true
-      }
+        "bamarni-bin": {
+            "bin-links": true,
+            "forward-command": true
+        }
     },
     "autoload": {
         "psr-4": {
             "Libresign\\NextcloudBehat\\": "src/"
         }
     }
-}
+}

features/bootstrap/FeatureContext.php

@@ -93,9 +93,11 @@ public function setTheResponseTo(PyStringNode $response): void {
 	 */
 	public function theResponseShouldBeAJsonArrayWithTheFollowingMandatoryValues(TableNode $table): void {
 		$lastRequest = $this->getLastRequest();
+		$body = json_encode($lastRequest->getParsedInput());
+		Assert::assertIsString($body);
 		// Mock response to be equal to body of request
 		$this->mockServer->setDefaultResponse(new MockWebServerResponse(
-			json_encode($lastRequest->getParsedInput())
+			$body
 		));
 		parent::theResponseShouldBeAJsonArrayWithTheFollowingMandatoryValues($table);
 	}

psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.23.1@8471a896ccea3526b26d082f4461eeea467f10a4">
+<files psalm-version="6.5.0@38fc8444edf0cebc9205296ee6e30e906ade783b">
   <file src="src/NextcloudApiContext.php">
     <ForbiddenCode>
       <code><![CDATA[`which jq`]]></code>

src/NextcloudApiContext.php

@@ -283,17 +283,21 @@ private function testAndGetActualValue(array $value, string $json): string {
 			);
 			if (!is_string($actual)) {
 				$actual = json_encode($actual);
+				Assert::assertIsString($actual);
 			}
 			return $actual;
 		}
+		$responseAsJsonString = json_encode($realResponseArray);
+		Assert::assertIsString($responseAsJsonString);
 		Assert::assertArrayHasKey(
 			$value['key'],
 			$realResponseArray,
-			'Not found: "' . $value['key'] . '" at array: ' . json_encode($realResponseArray)
+			'Not found: "' . $value['key'] . '" at array: ' . $responseAsJsonString
 		);
 		$actual = $realResponseArray[$value['key']];
 		if (!is_string($actual)) {
 			$actual = json_encode($actual);
+			Assert::assertIsString($actual);
 		}
 		return $actual;
 	}
@@ -327,7 +331,9 @@ public function fetchFieldFromPreviousJsonResponse(string $path): void {
 		$keys = explode('.', $path);
 		$value = $responseArray;
 		foreach ($keys as $key) {
-			Assert::assertArrayHasKey($key, $value, 'Key [' . $key . '] of path [' . $path . '] not found at body: ' . json_encode($responseArray));
+			$body = json_encode($responseArray);
+			Assert::assertIsString($body);
+			Assert::assertArrayHasKey($key, $value, 'Key [' . $key . '] of path [' . $path . '] not found at body: ' . $body);
 			$value = $value[$key];
 		}
 		if (isset($alias)) {
@@ -419,7 +425,9 @@ private function parseTextRcursive(array &$array): array {
 				$value = $this->parseText($value);
 			} elseif ($value instanceof \stdClass) {
 				$value = (array) $value;
-				$value = json_decode(json_encode($this->parseTextRcursive($value)));
+				$buffer = json_encode($this->parseTextRcursive($value));
+				Assert::assertIsString($buffer);
+				$value = json_decode($buffer);
 			}
 		});
 		return $array;
@@ -433,6 +441,7 @@ protected function parseText(string $text): string {
 			$replacements[] = $value;
 		}
 		$text = preg_replace($patterns, $replacements, $text);
+		Assert::assertIsString($text);
 		return $text;
 	}
 

vendor-bin/psalm/composer.json

@@ -1,5 +1,11 @@
 {
-    "require": {
-        "vimeo/psalm": "^5.12"
+    "config": {
+        "platform": {
+            "php": "8.1.17"
+        },
+        "sort-packages": true
+    },
+    "require-dev": {
+        "vimeo/psalm": "^6.5.0"
     }
-}
+}