chore(code): apply Rector

Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>

Author: Altahrim

.psalm-baseline.xml

@@ -58,8 +58,5 @@
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[strrpos($version, '.')]]></code>
     </RiskyTruthyFalsyComparison>
-    <UnusedMethod>
-      <code><![CDATA[downloadProgressCallback]]></code>
-    </UnusedMethod>
   </file>
 </files>

index.php

@@ -87,6 +87,7 @@ public function __construct(
 		if (function_exists('opcache_invalidate')) {
 			opcache_invalidate($versionFileName, true);
 		}
+
 		if (!file_exists($versionFileName)) {
 			// fallback to version in config.php
 			$version = $this->getConfigOptionString('version');
@@ -376,7 +377,7 @@ private function getRecursiveDirectoryIterator(string $folder, array $excludedPa
 		/* Store first level children in an array to avoid trouble if changes happen while iterating */
 		$children = [];
 		while ($name = readdir($handle)) {
-			if (in_array($name, ['.', '..'])) {
+			if (in_array($name, ['.', '..'], true)) {
 				continue;
 			}
 
@@ -775,7 +776,7 @@ private function downloadArchive(string $fromUrl, string $toLocation): bool {
 
 		curl_setopt_array($ch, [
 			CURLOPT_NOPROGRESS => false,
-			CURLOPT_PROGRESSFUNCTION => [$this, 'downloadProgressCallback'],
+			CURLOPT_PROGRESSFUNCTION => $this->downloadProgressCallback(...),
 			CURLOPT_FILE => $fp,
 		]);
 
@@ -886,6 +887,7 @@ public function verifyIntegrity(string $urlOverride = '', string $signature = ''
 					'Custom download url provided. You need to provide a signature with --signature or skip integrity check with --no-verify.'
 				);
 			}
+
 			$signature = $this->getSignatureFromUpdater();
 		}
 
@@ -1349,11 +1351,8 @@ public function currentStep(): array {
 
 		if (isset($jsonData['step']) && $jsonData['step'] <= self::LAST_STEP && $jsonData['step'] > 0) {
 			$result['step'] = (int)$jsonData['step'];
-			if (isset($jsonData['state'])) {
-				$result['state'] = (string)$jsonData['state'];
-			} else {
-				$result['state'] = 'start';
-			}
+			$result['state'] = isset($jsonData['state']) ? (string)$jsonData['state'] : 'start';
+
 			if ($result['step'] === self::LAST_STEP && $result['state'] !== 'start') {
 				return [];
 			}

lib/UpdateCommand.php

@@ -31,6 +31,7 @@ class UpdateCommand extends Command {
 	protected bool $skipIntegrityCheck = false;
 
 	protected string $urlOverride = '';
+
 	protected string $signature = '';
 
 	/** Strings of text for stages of updater */
@@ -137,11 +138,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		}
 
 		// Check if already a step is in process
-		if ($this->ignoreState) {
-			$currentStep = [];
-		} else {
-			$currentStep = $this->updater->currentStep();
-		}
+		$currentStep = $this->ignoreState ? [] : $this->updater->currentStep();
+
 		$stepNumber = 0;
 		if ($currentStep !== []) {
 			$stepState = $currentStep['state'] ?? '';
@@ -158,6 +156,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 				);
 				return -1;
 			}
+
 			$output->writeln('Found an ongoing update, continue from step ' . $stepNumber);
 		}
 
@@ -466,6 +465,7 @@ protected function executeStep(int $step, OutputInterface $output): array {
 						$this->updater->silentLog('[info] Skipping integrity check as requested');
 						break;
 					}
+
 					$this->updater->verifyIntegrity($this->urlOverride, $this->signature);
 					break;
 				case 6:

lib/Updater.php

@@ -71,6 +71,7 @@ public function __construct(
 		if (function_exists('opcache_invalidate')) {
 			opcache_invalidate($versionFileName, true);
 		}
+
 		if (!file_exists($versionFileName)) {
 			// fallback to version in config.php
 			$version = $this->getConfigOptionString('version');
@@ -360,7 +361,7 @@ private function getRecursiveDirectoryIterator(string $folder, array $excludedPa
 		/* Store first level children in an array to avoid trouble if changes happen while iterating */
 		$children = [];
 		while ($name = readdir($handle)) {
-			if (in_array($name, ['.', '..'])) {
+			if (in_array($name, ['.', '..'], true)) {
 				continue;
 			}
 
@@ -759,7 +760,7 @@ private function downloadArchive(string $fromUrl, string $toLocation): bool {
 
 		curl_setopt_array($ch, [
 			CURLOPT_NOPROGRESS => false,
-			CURLOPT_PROGRESSFUNCTION => [$this, 'downloadProgressCallback'],
+			CURLOPT_PROGRESSFUNCTION => $this->downloadProgressCallback(...),
 			CURLOPT_FILE => $fp,
 		]);
 
@@ -870,6 +871,7 @@ public function verifyIntegrity(string $urlOverride = '', string $signature = ''
 					'Custom download url provided. You need to provide a signature with --signature or skip integrity check with --no-verify.'
 				);
 			}
+
 			$signature = $this->getSignatureFromUpdater();
 		}
 
@@ -1333,11 +1335,8 @@ public function currentStep(): array {
 
 		if (isset($jsonData['step']) && $jsonData['step'] <= self::LAST_STEP && $jsonData['step'] > 0) {
 			$result['step'] = (int)$jsonData['step'];
-			if (isset($jsonData['state'])) {
-				$result['state'] = (string)$jsonData['state'];
-			} else {
-				$result['state'] = 'start';
-			}
+			$result['state'] = isset($jsonData['state']) ? (string)$jsonData['state'] : 'start';
+
 			if ($result['step'] === self::LAST_STEP && $result['state'] !== 'start') {
 				return [];
 			}

tests/checkSameCodeBase.php

@@ -58,7 +58,7 @@ function findDiffPos($original, $copy) {
 foreach ($iterator as $path => $fileInfo) {
 	$fileName = explode($libDir, $path)[1];
 
-	if (in_array($fileName, $excludedFiles)) {
+	if (in_array($fileName, $excludedFiles, true)) {
 		continue;
 	}
 
@@ -67,7 +67,7 @@ function findDiffPos($original, $copy) {
 	$fileContent = explode("namespace NC\\Updater;\n", $fileContent, 2)[1];
 	$fileContent = preg_replace('/^use [^\\\\]*;\n/m', '', $fileContent);
 
-	$fileContent = trim($fileContent);
+	$fileContent = trim((string)$fileContent);
 
 	if (in_array(str_contains($indexPhpContent, $fileContent), [0, false], true)) {
 		$failedFiles[] = $fileName;

tests/features/bootstrap/FeatureContext.php

@@ -231,10 +231,12 @@ public function theArchiveForVersionIsAvailableLocally(string $version): void {
 			if (curl_exec($ch) === false) {
 				throw new \Exception('Curl error: ' . curl_error($ch));
 			}
+
 			$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
 			if ($httpCode !== 200) {
 				throw new \Exception('Download failed for ' . $url . ' - HTTP code: ' . $httpCode);
 			}
+
 			curl_close($ch);
 			fclose($fp);
 		}
@@ -282,6 +284,7 @@ private function runUpdaterWithLocalFileUrl(string $version, bool $noVerify): vo
 		if ($noVerify) {
 			$args .= ' --no-verify';
 		}
+
 		exec('./updater ' . $args . ' 2>&1', $output, $returnCode);
 
 		// sleep to let the opcache do it's work and invalidate the status.php
@@ -505,7 +508,7 @@ public function theConfigKeyIsSetTo(string $key, mixed $value, string $type = 's
 			return;
 		}
 
-		if (!in_array($type, ['string', 'boolean', 'integer', 'double'])) {
+		if (!in_array($type, ['string', 'boolean', 'integer', 'double'], true)) {
 			throw new Exception('Invalid type given: ' . $type);
 		}
 

updater.phar

@@ -25,6 +25,7 @@
     'NC\\Updater\\UpdateCommand' => $baseDir . '/lib/UpdateCommand.php',
     'NC\\Updater\\UpdateException' => $baseDir . '/lib/UpdateException.php',
     'NC\\Updater\\Updater' => $baseDir . '/lib/Updater.php',
+    'NC\\Updater\\Version' => $baseDir . '/lib/Version.php',
     'Normalizer' => $vendorDir . '/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php',
     'Psr\\Container\\ContainerExceptionInterface' => $vendorDir . '/psr/container/src/ContainerExceptionInterface.php',
     'Psr\\Container\\ContainerInterface' => $vendorDir . '/psr/container/src/ContainerInterface.php',

vendor/composer/autoload_classmap.php

@@ -103,6 +103,7 @@ class ComposerStaticInitcbbead1010db4afef500f7adc2b6cac3
         'NC\\Updater\\UpdateCommand' => __DIR__ . '/../..' . '/lib/UpdateCommand.php',
         'NC\\Updater\\UpdateException' => __DIR__ . '/../..' . '/lib/UpdateException.php',
         'NC\\Updater\\Updater' => __DIR__ . '/../..' . '/lib/Updater.php',
+        'NC\\Updater\\Version' => __DIR__ . '/../..' . '/lib/Version.php',
         'Normalizer' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php',
         'Psr\\Container\\ContainerExceptionInterface' => __DIR__ . '/..' . '/psr/container/src/ContainerExceptionInterface.php',
         'Psr\\Container\\ContainerInterface' => __DIR__ . '/..' . '/psr/container/src/ContainerInterface.php',