Merge pull request #7451 from LibreSign/backport/7450/stable32

[stable32] chore(rector): apply safe test-only batch and php81 baseline

Author: vitormattos

composer.json

@@ -22,6 +22,8 @@
 		"lint": "find . -name \\*.php -not -path './vendor/*' -not -path './3rdparty/*' -not -path './vendor-bin/*' -not -path './node_modules/*' -not -path './build/*' -not -path './tests/integration/vendor/*' -print0 | xargs -0 -n1 php -l",
 		"cs:check": "php-cs-fixer fix --dry-run --diff",
 		"cs:fix": "php-cs-fixer fix",
+		"rector:check": "rector --dry-run",
+		"rector:fix": "rector",
 		"openapi": "generate-spec --verbose && (npm run typescript:generate || echo 'Please manually regenerate the typescript OpenAPI models')",
 		"psalm": "psalm --no-cache --threads=$(nproc)",
 		"psalm:update-baseline": "psalm --threads=$(nproc) --update-baseline --set-baseline=tests/psalm-baseline.xml",

lib/Controller/CrlApiController.php

@@ -152,7 +152,7 @@ public function revoke(
 				'success' => false,
 				'message' => $e->getMessage(),
 			], Http::STATUS_BAD_REQUEST);
-		} catch (\Exception $e) {
+		} catch (\Exception) {
 			return new DataResponse([
 				'success' => false,
 				'message' => 'An error occurred while revoking the certificate',

lib/Controller/FileController.php

@@ -607,7 +607,7 @@ public function addFileToEnvelope(string $uuid): DataResponse {
 			$response = $this->fileListService->formatFileWithChildren($envelope, $addedFiles, $this->userSession->getUser());
 			return new DataResponse($response, Http::STATUS_OK);
 
-		} catch (DoesNotExistException $e) {
+		} catch (DoesNotExistException) {
 			return new DataResponse(
 				['message' => $this->l10n->t('Envelope not found')],
 				Http::STATUS_NOT_FOUND,
@@ -713,14 +713,14 @@ private function processUploadedFiles(array $uploadedFiles): array {
 					$this->fileService->validateUploadedFile($uploadedFile);
 					$filesArray[] = [
 						'uploadedFile' => $uploadedFile,
-						'name' => pathinfo($uploadedFile['name'], PATHINFO_FILENAME),
+						'name' => pathinfo((string)$uploadedFile['name'], PATHINFO_FILENAME),
 					];
 				}
 			} else {
 				$this->fileService->validateUploadedFile($uploadedFiles);
 				$filesArray[] = [
 					'uploadedFile' => $uploadedFiles,
-					'name' => pathinfo($uploadedFiles['name'], PATHINFO_FILENAME),
+					'name' => pathinfo((string)$uploadedFiles['name'], PATHINFO_FILENAME),
 				];
 			}
 		}
@@ -756,7 +756,7 @@ private function extractFileName(array $fileData): string {
 			return $fileData['name'];
 		}
 		if (!empty($fileData['url'])) {
-			return rawurldecode(pathinfo($fileData['url'], PATHINFO_FILENAME));
+			return rawurldecode(pathinfo((string)$fileData['url'], PATHINFO_FILENAME));
 		}
 		return '';
 	}

lib/Controller/PageController.php

@@ -251,7 +251,7 @@ public function indexFPath(string $path): TemplateResponse {
 				$this->initialState->provideInitialState('identificationDocumentsWaitingApproval', $file['settings']['identificationDocumentsWaitingApproval'] ?? false);
 			} catch (LibresignException $e) {
 				throw $e;
-			} catch (\Throwable $e) {
+			} catch (\Throwable) {
 				throw new LibresignException(json_encode([
 					'action' => JSActions::ACTION_DO_NOTHING,
 					'errors' => [['message' => $this->l10n->t('Invalid UUID')]],

lib/Db/CrlMapper.php

@@ -154,11 +154,11 @@ public function getRevokedCertificates(string $instanceId = '', int $generation
 	}
 
 	public function isInvalidAt(string $serialNumber, ?DateTime $checkDate = null): bool {
-		$checkDate = $checkDate ?? new DateTime();
+		$checkDate ??= new DateTime();
 
 		try {
 			$certificate = $this->findBySerialNumber($serialNumber);
-		} catch (DoesNotExistException $e) {
+		} catch (DoesNotExistException) {
 			return false;
 		}
 
@@ -174,7 +174,7 @@ public function isInvalidAt(string $serialNumber, ?DateTime $checkDate = null):
 	}
 
 	public function cleanupExpiredCertificates(?DateTime $before = null): int {
-		$before = $before ?? new DateTime('-1 year');
+		$before ??= new DateTime('-1 year');
 
 		$qb = $this->db->getQueryBuilder();
 

lib/Db/SignRequestMapper.php

@@ -503,7 +503,7 @@ public function getFilesToSearchProvider(IUser $user, string $fileName, int $lim
 				$file = File::fromRow($row);
 
 				$files[] = $file;
-			} catch (\Exception $e) {
+			} catch (\Exception) {
 				continue;
 			}
 		}

lib/Handler/SignEngine/Pkcs12Handler.php

@@ -170,7 +170,7 @@ private function extractTimestampData(array $decoded, array $result): array {
 			if (!empty($timestampData['genTime']) || !empty($timestampData['policy']) || !empty($timestampData['serialNumber'])) {
 				$result['timestamp'] = $timestampData;
 			}
-		} catch (\Throwable $e) {
+		} catch (\Throwable) {
 		}
 
 		if (!isset($result['signingTime']) || !$result['signingTime'] instanceof \DateTime) {
@@ -247,7 +247,7 @@ private function hasLibreSignCaId(array $parsed): bool {
 		}
 
 		foreach ($organizationalUnits as $ou) {
-			$ou = trim($ou);
+			$ou = trim((string)$ou);
 			if ($this->caIdentifierService->isValidCaId($ou, $instanceId)) {
 				return true;
 			}

lib/Listener/BeforeNodeDeletedListener.php

@@ -129,7 +129,7 @@ private function markOriginalFileAsDeleted(int $fileId, ?string $metadataJson =
 				if (is_array($decoded)) {
 					$existingMetadata = $decoded;
 				}
-			} catch (\Throwable $e) {
+			} catch (\Throwable) {
 			}
 		}
 

lib/Listener/MailNotifyListener.php

@@ -180,7 +180,7 @@ private function isNotificationDisabledAtActivity(string $userId, string $type):
 			$manager = \OCP\Server::get(\OCP\Activity\IManager::class);
 			try {
 				$manager->getSettingById($type);
-			} catch (\Exception $e) {
+			} catch (\Exception) {
 				return false;
 			}
 

lib/Listener/NotificationListener.php

@@ -213,7 +213,7 @@ private function isNotificationDisabledAtActivity(string $userId, string $type):
 			$manager = \OCP\Server::get(\OCP\Activity\IManager::class);
 			try {
 				$manager->getSettingById($type);
-			} catch (\Exception $e) {
+			} catch (\Exception) {
 				return false;
 			}