[Backport stable34] Fix TypeError when saving integer CPU core count in global settings

lib/Controller/GlobalSettingsController.php

@@ -59,8 +59,8 @@ public function getGlobalSettings() : JSONResponse {
 	public function setGlobalSettings(array $globalSettings) : JSONResponse {
 		return $this->tryExecute(function () use ($globalSettings) {
 			$globalSettingsObject = new GlobalSettings();
-			$globalSettingsObject->processorCount = $globalSettings['processorCount'];
-			$globalSettingsObject->timeout = $globalSettings['timeout'] ?? null;
+			$globalSettingsObject->processorCount = isset($globalSettings['processorCount']) ? (int)$globalSettings['processorCount'] : null;
+			$globalSettingsObject->timeout = isset($globalSettings['timeout']) ? (int)$globalSettings['timeout'] : null;
 
 			$this->globalSettingsService->setGlobalSettings($globalSettingsObject);
 			return $this->globalSettingsService->getGlobalSettings();

lib/Migration/Version1034Date20260331194630.php

@@ -0,0 +1,107 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2026 Robin Windey <ro.windey@gmail.com>
+ *
+ *  @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace OCA\WorkflowOcr\Migration;
+
+use Closure;
+use OCA\WorkflowOcr\AppInfo\Application;
+use OCP\DB\ISchemaWrapper;
+use OCP\IAppConfig;
+use OCP\IDBConnection;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+/**
+ * Converts the 'processorCount' and 'timeout' app-config values from the
+ * legacy string type (VALUE_STRING = 4) to the correct integer type
+ * (VALUE_INT = 8).  Nextcloud's IAppConfig refuses to call setValueInt() on
+ * a key that was previously stored via setValueString(), so we must delete the
+ * old rows and re-insert them with the right type.
+ */
+class Version1034Date20260331194630 extends SimpleMigrationStep {
+	/** Integer keys in GlobalSettings that must be migrated. */
+	private const INT_KEYS = ['processorCount', 'timeout'];
+
+	public function __construct(
+		private IDBConnection $db,
+		private IAppConfig $appConfig,
+	) {
+	}
+
+	public function name(): string {
+		return 'convert GlobalSettings integer config values from string to int type';
+	}
+
+	public function description(): string {
+		return 'Deletes processorCount and timeout app-config entries that were '
+			. 'stored as VALUE_STRING and re-inserts them as VALUE_INT so that '
+			. 'IAppConfig::setValueInt() no longer throws a type-conflict error.';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+		foreach (self::INT_KEYS as $key) {
+			$this->migrateKey($key, $output);
+		}
+		return null;
+	}
+
+	private function migrateKey(string $key, IOutput $output): void {
+		// Read the raw string value directly from the DB so we can preserve it.
+		$qb = $this->db->getQueryBuilder();
+		$result = $qb->select('configvalue', 'type')
+			->from('appconfig')
+			->where($qb->expr()->eq('appid', $qb->createNamedParameter(Application::APP_NAME)))
+			->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($key)))
+			->executeQuery();
+
+		$row = $result->fetch();
+		$result->closeCursor();
+
+		if ($row === false) {
+			// Key not yet stored – nothing to migrate.
+			return;
+		}
+
+		if ((int)$row['type'] === IAppConfig::VALUE_INT) {
+			// Already the right type, nothing to do.
+			return;
+		}
+
+		$intValue = is_numeric($row['configvalue']) ? (int)$row['configvalue'] : 0;
+
+		// IAppConfig throws a type-conflict if the stored type differs from the
+		// requested one, so we must remove the old entry before re-inserting.
+		$this->appConfig->deleteKey(Application::APP_NAME, $key);
+		$this->appConfig->setValueInt(Application::APP_NAME, $key, $intValue);
+
+		$output->info(sprintf(
+			"Migrated config key '%s' for app '%s' from string to int (value: %d).",
+			$key,
+			Application::APP_NAME,
+			$intValue,
+		));
+	}
+}

lib/Model/GlobalSettings.php

@@ -27,8 +27,6 @@
 namespace OCA\WorkflowOcr\Model;
 
 class GlobalSettings {
-	/** @var string? */
-	public $processorCount;
-	/** @var string? */
-	public $timeout;
+	public ?int $processorCount = null;
+	public ?int $timeout = null;
 }

lib/OcrProcessors/CommandLineUtils.php

@@ -68,7 +68,7 @@ public function getCommandlineArgs(WorkflowSettings $settings, GlobalSettings $g
 		}
 
 		// Number of CPU's to be used
-		$processorCount = intval($globalSettings->processorCount);
+		$processorCount = $globalSettings->processorCount ?? 0;
 		if ($processorCount > 0) {
 			$args[] = '--jobs ' . $processorCount;
 		}

lib/OcrProcessors/Remote/Client/ApiClient.php

@@ -111,11 +111,8 @@ private function exAppRequest(string $path, ?array $options, string $method, boo
 	 */
 	private function getTimeout(object $settings): int {
 		$timeout = self::DEFAULT_TIMEOUT;
-		if (isset($settings->timeout) && $settings->timeout !== null && $settings->timeout !== '') {
-			$timeoutInt = (int)$settings->timeout;
-			if ($timeoutInt > 0) {
-				$timeout = $timeoutInt;
-			}
+		if ($settings->timeout !== null && $settings->timeout > 0) {
+			$timeout = $settings->timeout;
 		}
 		return $timeout;
 	}

lib/Service/GlobalSettingsService.php

@@ -53,8 +53,15 @@ public function getGlobalSettings() : GlobalSettings {
 
 		foreach ($this->getProperties($settings) as $prop) {
 			$key = $prop->getName();
-			$configValue = $this->config->getValueString(Application::APP_NAME, $key);
-			$settings->$key = $configValue;
+			$type = $prop->getType();
+			if ($type instanceof \ReflectionNamedType && $type->getName() === 'int') {
+				$intValue = $this->config->getValueInt(Application::APP_NAME, $key, 0);
+				// 0 is used as the "not configured" sentinel: none of the integer settings
+				// have a meaningful zero value, so 0 → null (not set).
+				$settings->$key = $intValue > 0 ? $intValue : null;
+			} else {
+				$settings->$key = $this->config->getValueString(Application::APP_NAME, $key);
+			}
 		}
 
 		return $settings;
@@ -69,7 +76,16 @@ public function setGlobalSettings(GlobalSettings $settings) : void {
 		foreach ($this->getProperties($settings) as $prop) {
 			$key = $prop->getName();
 			$value = $settings->$key;
-			$this->config->setValueString(Application::APP_NAME, $key, $value);
+			$type = $prop->getType();
+			$isNullable = $type !== null && $type->allowsNull();
+
+			if ($isNullable && $value === null) {
+				$this->config->deleteKey(Application::APP_NAME, $key);
+			} elseif ($type instanceof \ReflectionNamedType && $type->getName() === 'int') {
+				$this->config->setValueInt(Application::APP_NAME, $key, (int)$value);
+			} else {
+				$this->config->setValueString(Application::APP_NAME, $key, (string)($value ?? ''));
+			}
 		}
 	}
 

psalm.xml

@@ -12,6 +12,7 @@
 		<directory name="lib" />
 		<ignoreFiles>
 			<directory name="vendor" />
+			<directory name="lib/Migration" />
 		</ignoreFiles>
 	</projectFiles>
 	<extraFiles>

src/components/GlobalSettings.vue

@@ -34,10 +34,10 @@
 				</div>
 				<div class="div-table-col">
 					<input
-						v-model="settings.processorCount"
+						:value="settings.processorCount"
 						name="processorCount"
 						type="number"
-						@input="save">
+						@input="settings.processorCount = Number($event.target.value) || null; save()">
 				</div>
 			</div>
 			<div class="div-table-row">
@@ -50,11 +50,11 @@
 				</div>
 				<div class="div-table-col">
 					<input
-						v-model="settings.timeout"
+						:value="settings.timeout"
 						name="timeout"
 						type="number"
 						min="1"
-						@input="save">
+						@input="settings.timeout = Number($event.target.value) || null; save()">
 				</div>
 			</div>
 		</NcSettingsSection>

src/test/components/GlobalSettings.spec.js

@@ -49,7 +49,7 @@ describe('Init tests', () => {
 
 describe('Interaction tests', () => {
 	test('Should update settings when processorCount is changed', async () => {
-		const initialMockSettings = { processorCount: '2' }
+		const initialMockSettings = { processorCount: 2 }
 		getGlobalSettings.mockResolvedValueOnce(initialMockSettings)
 
 		const afterSaveMockSettings = { processorCount: 42 }
@@ -62,16 +62,37 @@ describe('Interaction tests', () => {
 		processorCount.element.value = '42'
 		await processorCount.trigger('input')
 
-		// v-model on type="number" input converts to number
+		// Inline @input handler converts to Number and falls back to null
 		expect(wrapper.vm.settings.processorCount).toBe(42)
 		expect(setGlobalSettings).toHaveBeenCalledTimes(1)
 		expect(setGlobalSettings).toHaveBeenCalledWith(expect.objectContaining({
 			processorCount: 42,
 		}))
 	})
 
+	test('Should convert empty input to null', async () => {
+		const initialMockSettings = { processorCount: 2 }
+		getGlobalSettings.mockResolvedValueOnce(initialMockSettings)
+
+		const afterSaveMockSettings = { processorCount: null }
+		setGlobalSettings.mockResolvedValueOnce(afterSaveMockSettings)
+
+		const wrapper = mount(GlobalSettings, mountOptions)
+		await new Promise(process.nextTick)
+
+		const processorCount = wrapper.find('input[name="processorCount"]')
+		processorCount.element.value = ''
+		await processorCount.trigger('input')
+
+		expect(wrapper.vm.settings.processorCount).toBeNull()
+		expect(setGlobalSettings).toHaveBeenCalledTimes(1)
+		expect(setGlobalSettings).toHaveBeenCalledWith(expect.objectContaining({
+			processorCount: null,
+		}))
+	})
+
 	test('Should show error when save fails', async () => {
-		const initialMockSettings = { processorCount: '2' }
+		const initialMockSettings = { processorCount: 2 }
 		getGlobalSettings.mockResolvedValueOnce(initialMockSettings)
 
 		setGlobalSettings.mockRejectedValueOnce(new Error('save-failed'))

src/test/service/globalSettingsService.spec.js

@@ -19,14 +19,14 @@ test('getGlobalSettings returns correct data from server', async () => {
 })
 
 test('setGlobalSettings sends correct data to server', async () => {
-	const request = { data: { processorCount: 42 } }
-	const mockedResponse = { data: { processorCount: '42' } }
+	const request = { processorCount: 42 }
+	const mockedResponse = { data: { processorCount: 42 } }
 
 	axios.put.mockResolvedValueOnce(mockedResponse)
 
 	const result = await setGlobalSettings(request)
 
-	expect(result.processorCount).toBe('42')
+	expect(result.processorCount).toBe(42)
 	expect(axios.put).toHaveBeenCalledTimes(1)
 	expect(axios.put).toHaveBeenCalledWith('/apps/workflow_ocr/globalSettings', { globalSettings: request })
 })

tests/Unit/Controller/GlobalSettingsControllerTest.php

@@ -120,4 +120,19 @@ public function testSetSettingsWithoutTimeout() {
 
 		$this->controller->setGlobalSettings($settings);
 	}
+
+	public function testSetSettingsPassesNullValues() {
+		$settings = [
+			'processorCount' => null,
+			'timeout' => null,
+		];
+
+		$this->globalSettingsService->expects($this->once())
+			->method('setGlobalSettings')
+			->with($this->callback(function (GlobalSettings $settings) {
+				return $settings->processorCount === null && $settings->timeout === null;
+			}));
+
+		$this->controller->setGlobalSettings($settings);
+	}
 }

tests/Unit/OcrProcessors/Remote/Client/ApiClientTest.php

@@ -126,7 +126,7 @@ public function testHeartbeatFailure(): void {
 
 	public function testProcessOcrUsesConfiguredTimeout(): void {
 		$settings = new GlobalSettings();
-		$settings->timeout = '120';
+		$settings->timeout = 120;
 
 		$globalSettingsService = $this->createMock(IGlobalSettingsService::class);
 		$globalSettingsService->method('getGlobalSettings')->willReturn($settings);
@@ -213,19 +213,19 @@ public function testGetTimeoutParsesValuesCorrectly(): void {
 		$method->setAccessible(true);
 
 		$settings = new GlobalSettings();
-		$settings->timeout = '';
+		$settings->timeout = null;
 		$this->assertEquals(60, $method->invoke($realClient, $settings));
 
-		$settings->timeout = '120';
+		$settings->timeout = 120;
 		$this->assertEquals(120, $method->invoke($realClient, $settings));
 
-		$settings->timeout = '0';
+		$settings->timeout = 0;
 		$this->assertEquals(60, $method->invoke($realClient, $settings));
 
-		$settings->timeout = '-10';
+		$settings->timeout = -10;
 		$this->assertEquals(60, $method->invoke($realClient, $settings));
 
-		$settings->timeout = '3600';
+		$settings->timeout = 3600;
 		$this->assertEquals(3600, $method->invoke($realClient, $settings));
 	}
 }