check for the UndefinedInterfaceMethod psalm

Signed-off-by: nabim777 <[email protected]>
nextcloud · Sep 23, 2024 · b2dad67 · b2dad67
1 parent 034a2c4
commit b2dad67
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 18 deletions.
diff --git a/psalm.xml b/psalm.xml
@@ -16,7 +16,7 @@
 		<ignoreFiles>
 			<directory name="vendor" />
 			<directory name="../../**" />
-			<directory name="../**" />
+<!--			<directory name="../**" />-->
 		</ignoreFiles>
 	</projectFiles>
 	<stubs>

diff --git a/tests/acceptance/features/bootstrap/FeatureContext.php b/tests/acceptance/features/bootstrap/FeatureContext.php
@@ -553,9 +553,9 @@ public function theDataOfTheOCSResponseShouldMatch(
 		PyStringNode $schemaString
 	): void {
 		$responseAsJson = json_decode($this->response->getBody()->getContents());
-		$_responseAsJson = $responseAsJson->ocs->data;
+		$responseAsJson = $responseAsJson->ocs->data;
 		JsonAssertions::assertJsonDocumentMatchesSchema(
-			$_responseAsJson,
+			$responseAsJson,
 			$this->getJSONSchema($schemaString)
 		);
 	}
@@ -569,9 +569,9 @@ public function theDataOfTheOCSResponseShouldMatch(
 	public function theDataOfTheResponseShouldMatch(
 		PyStringNode $schemaString
 	): void {
-		$_responseAsJson = json_decode($this->response->getBody()->getContents());
+		$responseAsJson = json_decode($this->response->getBody()->getContents());
 		JsonAssertions::assertJsonDocumentMatchesSchema(
-			$_responseAsJson,
+			$responseAsJson,
 			$this->getJSONSchema($schemaString)
 		);
 	}
@@ -719,7 +719,10 @@ public function getIdOfFileOrFolder(string $user, string $path): int {
 			'oc',
 			'http://owncloud.org/ns'
 		);
-		return (int)(string)$responseXmlObject->xpath('//oc:fileid')[0];
+		$fileId = $responseXmlObject->xpath('//oc:fileid')[0] ?? null;
+		Assert::assertNotNull($fileId, __METHOD__ . " file $path user $user not found (the file may not exist)");
+
+		return (int)(string) $fileId;
 	}
 
 	public function fileOrFolderExists(string $user, string $path): bool {
@@ -1089,11 +1092,6 @@ public function sendRequestsToAppEndpoint(
 		$fullUrl = $this->getBaseUrl();
 		$fullUrl .= "index.php/apps/integration_openproject/" . $endpoint;
 
-		// Handle PyStringNode
-		if ($data instanceof PyStringNode) {
-			$data = (string)$data;
-		}
-
 		// don't set content-type for multipart requests
 		if (is_array($data) && $headers === null) {
 			$options['multipart'] = $data;

diff --git a/tests/acceptance/features/bootstrap/FilesVersionsContext.php b/tests/acceptance/features/bootstrap/FilesVersionsContext.php
@@ -29,7 +29,6 @@ public function theVersionFolderOfFileShouldContainElements(
 		int $count
 	):void {
 		$fileId = $this->featureContext->getIdOfFileOrFolder($user, $path);
-		Assert::assertNotNull($fileId, __METHOD__ . " file $path user $user not found (the file may not exist)");
 		$this->theVersionFolderOfFileIdShouldContainElements($user, $fileId, $count);
 	}
 

diff --git a/tests/lib/Controller/ConfigControllerTest.php b/tests/lib/Controller/ConfigControllerTest.php
@@ -836,7 +836,7 @@ public function checkForUsersCountBeforeTest($expectedCount = 1): IUserManager {
 		$actualCount = 1;
 		$userManager = \OC::$server->getUserManager();
 		$count = 0;
-		$function = function () use (&$count) {
+		$function = function (IUser $user) use (&$count) {
 			$count++;
 			return null;
 		};

diff --git a/tests/lib/Controller/OpenProjectAPIControllerTest.php b/tests/lib/Controller/OpenProjectAPIControllerTest.php
@@ -31,10 +31,10 @@
 use Psr\Log\LoggerInterface;
 
 class OpenProjectAPIControllerTest extends TestCase {
-	/** @var IConfig $configMock */
+	/** @var IConfig */
 	private $configMock;
 
-	/** @var IRequest $requestMock */
+	/** @var IRequest */
 	private $requestMock;
 
 	/**
@@ -79,9 +79,10 @@ public function setUpMocks(): void {
 
 	/**
 	 * @param string $token
+	 * @psalm-suppress UndefinedInterfaceMethod
 	 * @return void
 	 */
-	public function getUserValueMock($token = '123') {
+	public function getUserValueMock(string $token = '123'): void {
 		$this->configMock
 			->method('getUserValue')
 			->withConsecutive(
@@ -93,7 +94,7 @@ public function getUserValueMock($token = '123') {
 	/**
 	 * @return void
 	 */
-	public function testGetNotifications() {
+	public function testGetNotifications(): void {
 		$this->getUserValueMock();
 		$service = $this->getMockBuilder(OpenProjectAPIService::class)
 			->disableOriginalConstructor()

diff --git a/tests/lib/Service/OpenProjectAPIServiceTest.php b/tests/lib/Service/OpenProjectAPIServiceTest.php
@@ -635,7 +635,6 @@ private function getOpenProjectAPIService(
 	) {
 		$certificateManager = $this->getMockBuilder('\OCP\ICertificateManager')->getMock();
 		$certificateManager->method('getAbsoluteBundlePath')->willReturn('/');
-		$ocClient = null;
 		$client = new GuzzleClient();
 		$clientConfigMock = $this->getMockBuilder(IConfig::class)->getMock();
 		$clientConfigMock