Make dependency to File Versions App optional (#314) (#317)

* Fixes [#307](#307)

Signed-off-by: Robin Windey <ro.windey@gmail.com>

Author: R0Wi

lib/Service/OcrService.php

@@ -59,7 +59,7 @@ class OcrService implements IOcrService {
 	/** @var IGlobalSettingsService */
 	private $globalSettingsService;
 
-	/** @var IVersionManager */
+	/** @var ?IVersionManager */
 	private $versionManager;
 
 	/** @var ISystemTagObjectMapper */
@@ -95,7 +95,7 @@ class OcrService implements IOcrService {
 	public function __construct(
 		IOcrProcessorFactory $ocrProcessorFactory,
 		IGlobalSettingsService $globalSettingsService,
-		IVersionManager $versionManager,
+		?IVersionManager $versionManager,
 		ISystemTagObjectMapper $systemTagObjectMapper,
 		IUserManager $userManager,
 		IFilesystem $filesystem,
@@ -289,6 +289,11 @@ private function createNewFileVersion(string $filePath, string $ocrContent, ?int
 	 * @param string $label The label to set
 	 */
 	private function setFileVersionsLabel(File $file, string $uid, string $label): void {
+		if ($this->versionManager === null) {
+			$this->logger->debug('Skipping setting file version label because file version app is not active');
+			return;
+		}
+
 		$fileMTime = $file->getMTime();
 		$user = $this->userManager->get($uid);
 		$versions = $this->versionManager->getVersionsForFile($user, $file);

tests/Unit/Service/OcrServiceTest.php

@@ -749,6 +749,60 @@ public function testSetsFileVersionsLabelIfKeepOriginalFileVersionIsTrue() {
 		$this->ocrService->runOcrProcess(42, 'usr', $settings);
 	}
 
+	// Related to #307
+	public function testRunOcrProcessWorksWithoutIVersionManager() {
+		$settings = new WorkflowSettings('{"keepOriginalFileVersion": true}');
+		$mimeType = 'application/pdf';
+		$content = 'someFileContent';
+		$ocrContent = 'someOcrProcessedFile';
+		$ocrResult = new OcrProcessorResult($ocrContent, 'pdf', $ocrContent);
+
+		$fileMock = $this->createValidFileMock($mimeType, $content);
+		$this->rootFolderGetById42ReturnValue = [$fileMock];
+
+		$this->ocrProcessor->expects($this->once())
+			->method('ocrFile')
+			->willReturn($ocrResult);
+
+		$viewMock = $this->createMock(IView::class);
+		$this->viewFactory->expects($this->once())
+			->method('create')
+			->willReturn($viewMock);
+
+		$this->eventService->expects($this->once())
+			->method('textRecognized')
+			->with($ocrResult, $fileMock);
+
+		$logged = false;
+		$this->logger->expects($this->atLeast(1))
+			->method('debug')
+			->with($this->callback(function ($message) use (&$logged) {
+				if ($message === 'Skipping setting file version label because file version app is not active') {
+					$logged = true;
+				}
+				return true;
+			}));
+
+		$ocrService = new OcrService(
+			$this->ocrProcessorFactory,
+			$this->globalSettingsService,
+			null, // No IVersionManager
+			$this->systemTagObjectMapper,
+			$this->userManager,
+			$this->filesystem,
+			$this->userSession,
+			$this->rootFolder,
+			$this->eventService,
+			$this->viewFactory,
+			$this->processingFileAccessor,
+			$this->notificationService,
+			$this->logger);
+
+		$ocrService->runOcrProcess(42, 'usr', $settings);
+
+		$this->assertTrue($logged, 'Expected debug log message not found');
+	}
+
 	public static function dataProvider_InvalidNodes() {
 		$folderMockCallable = function (self $testClass) {
 			/** @var MockObject|Node */

tests/psalm-baseline.xml

@@ -287,14 +287,14 @@
       <code><![CDATA[$version]]></code>
       <code><![CDATA[$version]]></code>
       <code><![CDATA[$versionBackend]]></code>
+      <code><![CDATA[?IVersionManager]]></code>
       <code><![CDATA[IMetadataVersion]]></code>
       <code><![CDATA[IMetadataVersionBackend]]></code>
-      <code><![CDATA[IVersionManager]]></code>
       <code><![CDATA[NoUserException]]></code>
     </UndefinedClass>
     <UndefinedDocblockClass>
       <code><![CDATA[$this->versionManager]]></code>
-      <code><![CDATA[IVersionManager]]></code>
+      <code><![CDATA[?IVersionManager]]></code>
     </UndefinedDocblockClass>
   </file>
   <file src="lib/Settings/GlobalSettings.php">