Merge pull request #5500 from LibreSign/fix/apply-rector

vitormattos · web-flow · commit 243b8822d23f · 2025-10-05T17:29:37.000-03:00
fix: apply rector
diff --git a/lib/Controller/IdentifyAccountController.php b/lib/Controller/IdentifyAccountController.php
@@ -86,7 +86,6 @@ private function registerPlugin(string $method): void {
 
 		$refObject = new \ReflectionObject($this->collaboratorSearch);
 		$refProperty = $refObject->getProperty('pluginList');
-		$refProperty->setAccessible(true);
 
 		$plugins = $refProperty->getValue($this->collaboratorSearch);
 		$plugins[SignerPlugin::TYPE_SIGNER] = [SignerPlugin::class];
diff --git a/lib/Db/IdentifyMethodMapper.php b/lib/Db/IdentifyMethodMapper.php
@@ -74,6 +74,9 @@ public function neutralizeDeletedUser(string $userId, string $displayName): void
 		}
 	}
 
+	/**
+	 * @return array<string, string>[]
+	 */
 	public function searchByIdentifierValue(string $search, string $userId, string $method, int $limit = 20, int $offset = 0): array {
 		$qb = $this->db->getQueryBuilder();
 
diff --git a/lib/Db/SignRequestMapper.php b/lib/Db/SignRequestMapper.php
@@ -221,6 +221,7 @@ public function findRemindersCandidates(): \Generator {
 
 		$result = $qb->executeQuery();
 		try {
+			/** @var array<string, mixed> $row */
 			while ($row = $result->fetch()) {
 				$signRequest = new SignRequest();
 				$identifyMethod = new IdentifyMethod();
diff --git a/lib/Files/TSimpleFile.php b/lib/Files/TSimpleFile.php
@@ -19,12 +19,10 @@ public function getInternalPathOfFile(ISimpleFile $node): string {
 		$reflection = new \ReflectionClass($node);
 		if ($reflection->hasProperty('parentFolder')) {
 			$reflectionProperty = $reflection->getProperty('parentFolder');
-			$reflectionProperty->setAccessible(true);
 			$folder = $reflectionProperty->getValue($node);
 			$path = $folder->getInternalPath() . '/' . $node->getName();
 		} elseif ($reflection->hasProperty('file')) {
 			$reflectionProperty = $reflection->getProperty('file');
-			$reflectionProperty->setAccessible(true);
 			$file = $reflectionProperty->getValue($node);
 			$path = $file->getPath();
 		}
@@ -37,7 +35,6 @@ public function getInternalPathOfFile(ISimpleFile $node): string {
 	private function getInternalPathOfFolder(ISimpleFolder $node): string {
 		$reflection = new \ReflectionClass($node);
 		$reflectionProperty = $reflection->getProperty('folder');
-		$reflectionProperty->setAccessible(true);
 		$folder = $reflectionProperty->getValue($node);
 		$path = $folder->getInternalPath();
 		return $path;
diff --git a/lib/Handler/CertificateEngine/AEngineHandler.php b/lib/Handler/CertificateEngine/AEngineHandler.php
@@ -275,7 +275,6 @@ public function getConfigPath(): string {
 	private function getInternalPathOfFolder(ISimpleFolder $node): string {
 		$reflection = new \ReflectionClass($node);
 		$reflectionProperty = $reflection->getProperty('folder');
-		$reflectionProperty->setAccessible(true);
 		$folder = $reflectionProperty->getValue($node);
 		$path = $folder->getInternalPath();
 		return $path;
diff --git a/lib/Handler/CertificateEngine/CfsslHandler.php b/lib/Handler/CertificateEngine/CfsslHandler.php
@@ -274,7 +274,7 @@ private function portOpen(): bool {
 		$host = parse_url($this->getCfsslUri(), PHP_URL_HOST);
 		$port = parse_url($this->getCfsslUri(), PHP_URL_PORT);
 
-		set_error_handler(function () { });
+		set_error_handler(function (): void { });
 		$socket = fsockopen($host, $port, $errno, $errstr, 0.1);
 		restore_error_handler();
 		if (!$socket || $errno || $errstr) {
diff --git a/lib/Migration/DeleteOldBinaries.php b/lib/Migration/DeleteOldBinaries.php
@@ -108,7 +108,6 @@ private function deleteRecursive(Folder $folder, array $allowedFiles): void {
 	private function getSimpleFolderList(ISimpleFolder $node): array {
 		$reflection = new \ReflectionClass($node);
 		$reflectionProperty = $reflection->getProperty('folder');
-		$reflectionProperty->setAccessible(true);
 		$folder = $reflectionProperty->getValue($node);
 		$list = $folder->getDirectoryListing();
 		return $list;
diff --git a/lib/Service/FolderService.php b/lib/Service/FolderService.php
@@ -102,7 +102,6 @@ protected function getContainerFolder(): Folder {
 		$containerFolder = $this->appData->getFolder('/');
 		$reflection = new \ReflectionClass($containerFolder);
 		$reflectionProperty = $reflection->getProperty('folder');
-		$reflectionProperty->setAccessible(true);
 		return $reflectionProperty->getValue($containerFolder);
 	}
 
diff --git a/lib/Service/IdentifyMethod/SignatureMethod/EmailToken.php b/lib/Service/IdentifyMethod/SignatureMethod/EmailToken.php
@@ -35,8 +35,8 @@ public function toArray(): array {
 		$email = match ($entity->getIdentifierKey()) {
 			'email' => $entity->getIdentifierValue(),
 			'account' => $this->identifyService->getUserManager()->get($entity->getIdentifierValue())
-				?->getEMailAddress(),
-			default => null,
+				?->getEMailAddress() ?? '',
+			default => '',
 		};
 
 		if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
diff --git a/lib/Service/IdentifyMethod/SignatureMethod/TwofactorGatewayToken.php b/lib/Service/IdentifyMethod/SignatureMethod/TwofactorGatewayToken.php
@@ -33,8 +33,8 @@ public function toArray(): array {
 		$identifier = match ($entity->getIdentifierKey()) {
 			'identifier' => $entity->getIdentifierValue(),
 			'account' => $this->identifyService->getUserManager()->get($entity->getIdentifierValue())
-				?->getEMailAddress(),
-			default => null,
+				?->getEMailAddress() ?? '',
+			default => '',
 		};
 
 		$code = $entity->getCode();
diff --git a/lib/Service/Install/SignSetupService.php b/lib/Service/Install/SignSetupService.php
@@ -264,7 +264,6 @@ private function getDataDir(): string {
 	private function getInternalPathOfFolder(ISimpleFolder $node): string {
 		$reflection = new \ReflectionClass($node);
 		$reflectionProperty = $reflection->getProperty('folder');
-		$reflectionProperty->setAccessible(true);
 		$folder = $reflectionProperty->getValue($node);
 		$path = $folder->getInternalPath();
 		return $path;
@@ -534,7 +533,7 @@ private function createSignatureData(array $hashes): array {
 
 		return [
 			'hashes' => $hashes,
-			'signature' => base64_encode($signature),
+			'signature' => base64_encode((string)$signature),
 			'certificate' => $this->getCertificate()->saveX509($this->getCertificate()->getCurrentCert()),
 		];
 	}
diff --git a/tests/php/Api/ApiRequester.php b/tests/php/Api/ApiRequester.php
@@ -65,7 +65,7 @@ private function setupRequest(RequestInterface $request):void {
 		}
 		$_SERVER = array_merge($_SERVER, $server);
 		foreach ($request->getHeaders() as $key => $value) {
-			$name = strtoupper($key);
+			$name = strtoupper((string)$key);
 			$name = str_replace('-', '_', $name);
 			$server['HTTP_' . $name] = $value[0];
 		}
@@ -106,7 +106,6 @@ private function setupRequest(RequestInterface $request):void {
 		$router = \OCP\Server::get(\OC\Route\Router::class);
 		$reflectionClass = new \ReflectionClass($router);
 		$property = $reflectionClass->getProperty('context');
-		$property->setAccessible(true);
 		$property->setValue($router, new RequestContext(
 			$server['SCRIPT_NAME'],
 			$server['REQUEST_METHOD'],
diff --git a/tests/php/Unit/Handler/CertificateEngine/CertificateEngineFactoryTest.php b/tests/php/Unit/Handler/CertificateEngine/CertificateEngineFactoryTest.php
@@ -24,7 +24,6 @@ class CertificateEngineFactoryTest extends \OCA\Libresign\Tests\Unit\TestCase {
 	public function tearDown(): void {
 		$ref = new \ReflectionClass(CertificateEngineFactory::class);
 		$prop = $ref->getProperty('engine');
-		$prop->setAccessible(true);
 		$prop->setValue($ref, null);
 	}
 
diff --git a/tests/php/Unit/Handler/SignEngine/JSignPdfHandlerTest.php b/tests/php/Unit/Handler/SignEngine/JSignPdfHandlerTest.php
@@ -384,7 +384,7 @@ public static function providerSignAffectedParams(): array {
 	private static function getElement(array $attributes = [], string $imagePath = ''): VisibleElementAssoc {
 		$element = new FileElement();
 		foreach ($attributes as $attribute => $value) {
-			$method = 'set' . ucfirst($attribute);
+			$method = 'set' . ucfirst((string)$attribute);
 			$element->$method($value);
 		}
 		return new VisibleElementAssoc(
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
@@ -62,7 +62,7 @@
   </file>
   <file src="lib/Handler/CertificateEngine/CfsslHandler.php">
     <InvalidArgument>
-      <code><![CDATA[function () { }]]></code>
+      <code><![CDATA[function (): void { }]]></code>
     </InvalidArgument>
   </file>
   <file src="lib/Helper/Pagination.php">

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,9 @@ public function neutralizeDeletedUser(string $userId, string $displayName): void`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
	`77`	`+ /**`
	`78`	`+ * @return array<string, string>[]`
	`79`	`+ */`
`77`	`80`	`public function searchByIdentifierValue(string $search, string $userId, string $method, int $limit = 20, int $offset = 0): array {`
`78`	`81`	`$qb = $this->db->getQueryBuilder();`
`79`	`82`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,6 @@ protected function getContainerFolder(): Folder {`
`102`	`102`	`$containerFolder = $this->appData->getFolder('/');`
`103`	`103`	`$reflection = new \ReflectionClass($containerFolder);`
`104`	`104`	`$reflectionProperty = $reflection->getProperty('folder');`
`105`		`- $reflectionProperty->setAccessible(true);`
`106`	`105`	`return $reflectionProperty->getValue($containerFolder);`
`107`	`106`	`}`
`108`	`107`