Apply php-cs-fixer changes

R0Wi · R0Wi · commit 377826a7a660 · 2025-10-03T10:18:47.000Z
diff --git a/lib/BackgroundJobs/ProcessFileJob.php b/lib/BackgroundJobs/ProcessFileJob.php
@@ -39,7 +39,7 @@ class ProcessFileJob extends \OCP\BackgroundJob\QueuedJob {
 	protected $logger;
 	/** @var IOcrService */
 	private $ocrService;
-	
+
 	public function __construct(
 		LoggerInterface $logger,
 		IOcrService $ocrService,
@@ -48,7 +48,7 @@ public function __construct(
 		$this->logger = $logger;
 		$this->ocrService = $ocrService;
 	}
-	
+
 	/**
 	 * @param mixed $argument
 	 */
diff --git a/lib/Events/TextRecognizedEvent.php b/lib/Events/TextRecognizedEvent.php
@@ -44,7 +44,7 @@ class TextRecognizedEvent extends Event {
 	 */
 	public function __construct(string $recognizedText, File $file) {
 		parent::__construct();
-		
+
 		$this->recognizedText = $recognizedText;
 		$this->file = $file;
 	}
diff --git a/lib/Notification/Notifier.php b/lib/Notification/Notifier.php
@@ -104,15 +104,15 @@ public function prepare(INotification $notification, string $languageCode): INot
 
 		// Only add file info if we have some ...
 		$richParams = false;
-		if ($notification->getObjectType() === 'file' &&
-			($fileId = $notification->getObjectId()) &&
-			($uid = $notification->getUser())) {
+		if ($notification->getObjectType() === 'file'
+			&& ($fileId = $notification->getObjectId())
+			&& ($uid = $notification->getUser())) {
 			$richParams = $this->tryGetRichParamForFile($uid, intval($fileId));
 			if ($richParams !== false) {
 				$notification->setRichSubject($richSubject, $richParams);
 			}
 		}
-		
+
 		// Fallback to generic error message without file link
 		if ($richParams === false) {
 			$notification->setParsedSubject($parsedSubject);
diff --git a/lib/OcrProcessors/CommandLineUtils.php b/lib/OcrProcessors/CommandLineUtils.php
@@ -44,7 +44,7 @@ public function __construct(
 
 	public function getCommandlineArgs(WorkflowSettings $settings, GlobalSettings $globalSettings, ?string $sidecarFile = null, array $additionalCommandlineArgs = []): string {
 		$isLocalExecution = !$this->ocrBackendInfoService->isRemoteBackend();
-		
+
 		// Default setting is quiet
 		$args = $isLocalExecution ? ['-q'] : [];
 
diff --git a/lib/OcrProcessors/OcrProcessorFactory.php b/lib/OcrProcessors/OcrProcessorFactory.php
@@ -67,14 +67,14 @@ public static function registerOcrProcessors(IRegistrationContext $context) : vo
 		*	"singleton per request" which leads to problems regarding the reused Command object
 		*	under the hood.
 		*/
-		$context->registerService(PdfOcrProcessor::class, fn (ContainerInterface $c) =>
-			new PdfOcrProcessor(
+		$context->registerService(PdfOcrProcessor::class, fn (ContainerInterface $c)
+			=> new PdfOcrProcessor(
 				$c->get(ICommand::class),
 				$c->get(LoggerInterface::class),
 				$c->get(ISidecarFileAccessor::class),
 				$c->get(ICommandLineUtils::class)), false);
-		$context->registerService(ImageOcrProcessor::class, fn (ContainerInterface $c) =>
-			new ImageOcrProcessor(
+		$context->registerService(ImageOcrProcessor::class, fn (ContainerInterface $c)
+			=> new ImageOcrProcessor(
 				$c->get(ICommand::class),
 				$c->get(LoggerInterface::class),
 				$c->get(ISidecarFileAccessor::class),
diff --git a/lib/OcrProcessors/Remote/Client/ApiClient.php b/lib/OcrProcessors/Remote/Client/ApiClient.php
@@ -37,7 +37,7 @@ public function __construct(
 		private LoggerInterface $logger,
 	) {
 	}
-	
+
 	public function processOcr($file, string $fileName, string $ocrMyPdfParameters): OcrResult|ErrorResult {
 		$options = [
 			'multipart' => [
@@ -92,7 +92,7 @@ private function exAppRequest(string $path, ?array $options, string $method, boo
 			$options ?? []
 		);
 		$this->logger->debug('Response received', ['path' => $path, 'response' => $response]);
-		
+
 		if (is_array($response) || ($throwIfResponseCodeNot200 && $response->getStatusCode() !== 200)) {
 			$this->logger->error('Request failed', ['path' => $path, 'response' => $response]);
 			throw new RuntimeException('Request failed');
diff --git a/lib/OcrProcessors/Remote/WorkflowOcrRemoteProcessor.php b/lib/OcrProcessors/Remote/WorkflowOcrRemoteProcessor.php
@@ -46,12 +46,12 @@ public function __construct(
 	) {
 
 	}
-	 
+
 	public function ocrFile(File $file, WorkflowSettings $settings, GlobalSettings $globalSettings): OcrProcessorResult {
 		$ocrMyPdfParameters = $this->commandLineUtils->getCommandlineArgs($settings, $globalSettings);
 		$fileResource = $file->fopen('rb');
 		$fileName = $file->getName();
-		
+
 		$this->logger->debug('Sending OCR request to remote backend');
 		$apiResult = $this->apiClient->processOcr($fileResource, $fileName, $ocrMyPdfParameters);
 		$this->logger->debug('OCR result received', ['apiResult' => $apiResult]);
diff --git a/lib/Operation.php b/lib/Operation.php
@@ -104,15 +104,15 @@ public function onEvent(string $eventName, Event $event, IRuleMatcher $ruleMatch
 		$this->logger->debug('onEvent: ' . $eventName);
 
 		// $node and $argsArray will be passed by reference
-		if (!($match = $this->getMatch($ruleMatcher)) ||
-			!$this->tryGetFile($eventName, $event, $node) ||
-			$this->eventTriggeredByOcrProcess($node) ||
-			!$this->tryGetJobArgs($node, $match['operation'], $argsArray)) {
+		if (!($match = $this->getMatch($ruleMatcher))
+			|| !$this->tryGetFile($eventName, $event, $node)
+			|| $this->eventTriggeredByOcrProcess($node)
+			|| !$this->tryGetJobArgs($node, $match['operation'], $argsArray)) {
 			return;
 		}
-	
+
 		$this->logger->debug('Adding file to jobqueue: ' . json_encode($argsArray));
-	
+
 		$this->jobList->add(ProcessFileJob::class, $argsArray);
 	}
 
@@ -140,7 +140,7 @@ private function tryGetFile(string $eventName, Event $event, ?Node & $node) : bo
 
 	private function tryGetFileFromGenericEvent(string $eventName, GenericEvent $event, ?Node & $node) : bool {
 		$node = $event->getSubject();
-		
+
 		// Some events have two nodes involved
 		$arrayEvents = [
 			'\OCP\Files::postRename',
diff --git a/lib/Service/OcrService.php b/lib/Service/OcrService.php
@@ -155,7 +155,7 @@ public function runOcrProcess(int $fileId, string $uid, WorkflowSettings $settin
 
 			$ocrProcessor = $this->ocrProcessorFactory->create($file->getMimeType());
 			$globalSettings = $this->globalSettingsService->getGlobalSettings();
-			
+
 			try {
 				$result = $ocrProcessor->ocrFile($file, $settings, $globalSettings);
 			} catch (OcrAlreadyDoneException $ex) {
@@ -181,9 +181,9 @@ private function parseArguments($argument) : array {
 			throw new \InvalidArgumentException('Argument is not an array in ' . self::class . ' method \'tryParseArguments\'.');
 		}
 
-		$getArgument = fn ($key) => array_key_exists($key, $argument) ?
-			$argument[$key] :
-			throw new \InvalidArgumentException("Argument key '$key' not found in " . self::class . ' method \'tryParseArguments\'.');
+		$getArgument = fn ($key) => array_key_exists($key, $argument)
+			? $argument[$key]
+			: throw new \InvalidArgumentException("Argument key '$key' not found in " . self::class . ' method \'tryParseArguments\'.');
 
 		$jsonSettings = $getArgument('settings');
 		$settings = new WorkflowSettings($jsonSettings);
@@ -222,7 +222,7 @@ private function getNode(int $fileId) : Node {
 		if (count($nodeArr) === 0) {
 			throw new NotFoundException('Could not process file with id \'' . $fileId . '\'. File was not found');
 		}
-		
+
 		$node = array_shift($nodeArr);
 
 		if (!$node instanceof Node || $node->getType() !== FileInfo::TYPE_FILE) {
@@ -263,7 +263,7 @@ private function processTagsAfterSuccessfulOcr(File $file, WorkflowSettings $set
 	private function createNewFileVersion(string $filePath, string $ocrContent, ?int $fileMtime = null) : void {
 		$dirPath = dirname($filePath);
 		$filename = basename($filePath);
-		
+
 		$this->processingFileAccessor->setCurrentlyProcessedFilePath($filePath);
 
 		try {
diff --git a/lib/Settings/GlobalSettings.php b/lib/Settings/GlobalSettings.php
@@ -37,11 +37,11 @@ class GlobalSettings implements ISettings {
 	public function getForm() : TemplateResponse {
 		return new TemplateResponse(Application::APP_NAME, 'globalSettings', [], 'blank');
 	}
-	
+
 	public function getSection(): string {
 		return 'workflow';
 	}
-	
+
 	public function getPriority(): int {
 		return 75;
 	}
diff --git a/lib/SetupChecks/OcrMyPdfCheck.php b/lib/SetupChecks/OcrMyPdfCheck.php
@@ -53,9 +53,9 @@ public function getName(): string {
 	}
 
 	public function run(): SetupResult {
-		return $this->ocrBackendInfoService->isRemoteBackend() ?
-			$this->runRemoteCheck() :
-			$this->runLocalCheck();
+		return $this->ocrBackendInfoService->isRemoteBackend()
+			? $this->runRemoteCheck()
+			: $this->runLocalCheck();
 	}
 
 	private function runLocalCheck(): SetupResult {
@@ -72,9 +72,9 @@ private function runLocalCheck(): SetupResult {
 
 	private function runRemoteCheck(): SetupResult {
 		try {
-			return $this->apiClient->heartbeat() ?
-				SetupResult::success($this->l10n->t('Workflow OCR Backend is installed.')) :
-				SetupResult::warning($this->l10n->t('Workflow OCR Backend is installed but heartbeat failed.'));
+			return $this->apiClient->heartbeat()
+				? SetupResult::success($this->l10n->t('Workflow OCR Backend is installed.'))
+				: SetupResult::warning($this->l10n->t('Workflow OCR Backend is installed but heartbeat failed.'));
 		} catch (\Exception $e) {
 			$this->logger->error('Error while checking OCRmyPDF backend: ' . $e->getMessage(), [
 				'exception' => $e,
diff --git a/lib/Wrapper/CommandWrapper.php b/lib/Wrapper/CommandWrapper.php
@@ -50,21 +50,21 @@ public function setStdIn(string $stdIn) : ICommand {
 		$this->command->setStdIn($stdIn);
 		return $this;
 	}
-	
+
 	/**
 	 * @inheritdoc
 	 */
 	public function execute() : bool {
 		return (bool)$this->command->execute();
 	}
-	
+
 	/**
 	 * @inheritdoc
 	 */
 	public function getOutput(bool $trim = true) : string {
 		return (string)$this->command->getOutput($trim);
 	}
-	
+
 	/**
 	 * @inheritdoc
 	 */
@@ -78,7 +78,7 @@ public function getError(bool $trim = true) : string {
 	public function getStdErr(bool $trim = true) : string {
 		return (string)$this->command->getStdErr($trim);
 	}
-	
+
 	/**
 	 * @inheritdoc
 	 */
diff --git a/lib/Wrapper/ICommand.php b/lib/Wrapper/ICommand.php
@@ -35,7 +35,7 @@ interface ICommand {
 	 * @return ICommand for method chaining
 	 */
 	public function setCommand(string $command) : ICommand;
-	
+
 	/**
 	 * @param string $stdIn If set, the string will be piped to the
 	 *                      command via standard input. This enables the same functionality as
@@ -45,34 +45,34 @@ public function setCommand(string $command) : ICommand;
 	 * @return ICommand for method chaining
 	 */
 	public function setStdIn(string $stdIn) : ICommand;
-	
+
 	/**
 	 * Execute the command
 	 *
 	 * @return bool whether execution was successful. If `false`, error details
 	 *              can be obtained from getError(), getStdErr() and getExitCode().
 	 */
 	public function execute() : bool;
-	
+
 	/**
 	 * @param bool $trim whether to `trim()` the return value. The default is `true`.
 	 * @return string the command output (stdout). Empty if none.
 	 */
 	public function getOutput(bool $trim = true) : string;
-	
+
 	/**
 	 * @param bool $trim whether to `trim()` the return value. The default is `true`.
 	 * @return string the error message, either stderr or an internal message.
 	 *                Empty string if none.
 	 */
 	public function getError(bool $trim = true) : string;
-	 
+
 	/**
 	 * @param bool $trim whether to `trim()` the return value. The default is `true`.
 	 * @return string the stderr output. Empty if none.
 	 */
 	public function getStdErr(bool $trim = true) : string;
-	
+
 	/**
 	 * @return int|null the exit code or null if command was not executed yet
 	 */
diff --git a/tests/Integration/AppTest.php b/tests/Integration/AppTest.php
@@ -80,7 +80,7 @@ private function runBootstrapRegistrations(bool $lazy) {
 
 		// HACK:: reset registrations and simulate request start
 		$this->invokePrivate($bootstrapCoordinator, 'registrationContext', [null]);
-		
+
 		if ($lazy) {
 			$bootstrapCoordinator->runLazyRegistration(Application::APP_NAME);
 		} else {
diff --git a/tests/Integration/BackendTestBase.php b/tests/Integration/BackendTestBase.php
@@ -136,7 +136,7 @@ protected function addOperation(string $mimeType, string $operationJson = '') {
 	private function deleteOperation() {
 		// Clear managers cache and operations to ensure "deleteOperation" works
 		$reflection = new \ReflectionClass($this->workflowEngineManager);
-		
+
 		$operationsByScopeProperty = $reflection->getProperty('operationsByScope');
 		$operationsByScopeProperty->setAccessible(true);
 		$operationsByScope = $operationsByScopeProperty->getValue($this->workflowEngineManager);
@@ -154,7 +154,7 @@ private function deleteOperation() {
 				// ignore
 			}
 		}
-		
+
 	}
 
 	protected function uploadTestFile(string $testFile) {
@@ -181,7 +181,7 @@ private function deleteTestFilesIfExist() {
 			curl_setopt($ch, CURLOPT_URL, $this->getNextcloudWebdavUrl() . basename($localFile));
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-	
+
 			$this->executeCurl($ch, [404]);
 		}
 		$this->uploadedFiles = [];
diff --git a/tests/Integration/Notification/NotificationTest.php b/tests/Integration/Notification/NotificationTest.php
@@ -61,7 +61,7 @@ public static function setUpBeforeClass() : void {
 
 	protected function setUp() : void {
 		parent::setUp();
-		
+
 		// Use real Notification service to be able to check if notifications get created
 		$this->notificationService = new NotificationService(\OC::$server->get(\OCP\Notification\IManager::class));
 		$this->logger = $this->createMock(LoggerInterface::class);
diff --git a/tests/Unit/BackgroundJobs/ProcessFileJobTest.php b/tests/Unit/BackgroundJobs/ProcessFileJobTest.php
@@ -38,10 +38,10 @@
 class ProcessFileJobTest extends TestCase {
 	/** @var LoggerInterface|MockObject */
 	private $logger;
-	
+
 	/** @var IOcrService|MockObject */
 	private $ocrService;
-	
+
 	/** @var JobList */
 	private $jobList;
 
@@ -107,7 +107,7 @@ public function testCallsOcrService() {
 		$this->ocrService->expects($this->once())
 			->method('runOcrProcessWithJobArgument')
 			->with($this->equalTo($this->argument));
-		
+
 		$this->processFileJob->start($this->jobList);
 	}
 }
diff --git a/tests/Unit/Helper/ProcessingFIleAccessorTest.php b/tests/Unit/Helper/ProcessingFIleAccessorTest.php
@@ -33,7 +33,7 @@ public function testSingleton() {
 
 		$this->assertTrue($o1 === $o2);
 	}
-	
+
 	public function testGetSet() {
 		$o = ProcessingFileAccessor::getInstance();
 		$o ->setCurrentlyProcessedFilePath('/someuser/files/somefile.pdf');
diff --git a/tests/Unit/Listener/RegisterFlowOperationsListenerTest.php b/tests/Unit/Listener/RegisterFlowOperationsListenerTest.php
@@ -41,7 +41,7 @@
 class RegisterFlowOperationsListenerTest extends TestCase {
 	/** @var ContainerInterface|MockObject */
 	private $container;
-	
+
 	public function setUp() : void {
 		parent::setUp();
 		$this->container = $this->createMock(ContainerInterface::class);
@@ -88,7 +88,7 @@ public function testRegistersOperationClassAndScripts_OnRegisterOperationsEvent(
 				$scriptCount++;
 			}
 		}
-		
+
 		$this->assertEquals(2, $scriptCount);
 	}
 
diff --git a/tests/Unit/Notification/NotifierTest.php b/tests/Unit/Notification/NotifierTest.php
diff --git a/tests/Unit/OcrProcessors/Local/PdfOcrProcessorTest.php b/tests/Unit/OcrProcessors/Local/PdfOcrProcessorTest.php
diff --git a/tests/Unit/OperationTest.php b/tests/Unit/OperationTest.php
diff --git a/tests/Unit/Service/OcrBackendInfoServiceTest.php b/tests/Unit/Service/OcrBackendInfoServiceTest.php
diff --git a/tests/Unit/Service/OcrServiceTest.php b/tests/Unit/Service/OcrServiceTest.php

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class TextRecognizedEvent extends Event {`
`44`	`44`	`*/`
`45`	`45`	`public function __construct(string $recognizedText, File $file) {`
`46`	`46`	`parent::__construct();`
`47`		`-`
	`47`	`+`
`48`	`48`	`$this->recognizedText = $recognizedText;`
`49`	`49`	`$this->file = $file;`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,11 +37,11 @@ class GlobalSettings implements ISettings {`
`37`	`37`	`public function getForm() : TemplateResponse {`
`38`	`38`	`return new TemplateResponse(Application::APP_NAME, 'globalSettings', [], 'blank');`
`39`	`39`	`}`
`40`		`-`
	`40`	`+`
`41`	`41`	`public function getSection(): string {`
`42`	`42`	`return 'workflow';`
`43`	`43`	`}`
`44`		`-`
	`44`	`+`
`45`	`45`	`public function getPriority(): int {`
`46`	`46`	`return 75;`
`47`	`47`	`}`