fixup! refactor(config): replace IConfig with IAppConfig for improved type safety and clarity

Signed-off-by: Christian Hartmann <chris-hartmann@gmx.de>

Author: Chartman123

lib/Controller/ConfigController.php

@@ -72,13 +72,15 @@ public function updateAppConfig(string $configKey, mixed $configValue): DataResp
 				} catch (\InvalidArgumentException $e) {
 					return new DataResponse('Invalid value for ' . $configKey, Http::STATUS_BAD_REQUEST);
 				}
+				break;
 
 			case Constants::CONFIG_KEY_CREATIONALLOWEDGROUPS:
 				try {
 					$this->appConfig->setAppValueArray($configKey, $configValue);
 				} catch (\InvalidArgumentException $e) {
 					return new DataResponse('Invalid value for ' . $configKey, Http::STATUS_BAD_REQUEST);
 				}
+				break;
 		}
 
 		return new DataResponse();

tests/Integration/Api/RespectAdminSettingsTest.php

@@ -8,9 +8,10 @@
 namespace OCA\Forms\Tests\Integration\Api;
 
 use GuzzleHttp\Client;
+use OCA\Forms\AppInfo\Application;
 use OCA\Forms\Constants;
 use OCA\Forms\Tests\Integration\IntegrationBase;
-use OCP\AppFramework\Services\IAppConfig;
+use OCP\IAppConfig;
 
 /**
  * This tests that the API respects all admin settings
@@ -223,7 +224,7 @@ public function testForbidUpdate(array $accessValue, array $adminConfigKeys): vo
 		$config = \OCP\Server::get(IAppConfig::class);
 		foreach ($adminConfigKeys as $key => $value) {
 			if (is_array($value)) {
-				$config->setAppValueArray($key, $value);
+				$config->setAppValueArray(Application::APP_ID, $key, $value);
 			} else {
 				$bool = is_bool($value) ? $value : filter_var($value, FILTER_VALIDATE_BOOLEAN);
 				$config->setAppValueBool($key, $bool);
@@ -326,7 +327,7 @@ public function testListFormsAllowed(): void {
 	 */
 	public function testListFormsNoAdminPermission(): void {
 		// Disable global access
-		\OCP\Server::get(IAppConfig::class)->setAppValueBool(Constants::CONFIG_KEY_ALLOWPERMITALL, false);
+		\OCP\Server::get(IAppConfig::class)->setAppValueBool(Application::APP_ID, Constants::CONFIG_KEY_ALLOWPERMITALL, false);
 
 		$resp = $this->http->request(
 			'GET',

tests/Integration/DB/SharedFormsTest.php

@@ -8,10 +8,11 @@
  */
 namespace OCA\Forms\Tests\Integration\Db;
 
+use OCA\Forms\AppInfo\Application;
 use OCA\Forms\Constants;
 use OCA\Forms\Db\FormMapper;
 use OCA\Forms\Tests\Integration\IntegrationBase;
-use OCP\AppFramework\Services\IAppConfig;
+use OCP\IAppConfig;
 
 /**
  * @group DB
@@ -182,7 +183,7 @@ public function testShowNoSharedFormsIfDisabled(array $configValues) {
 		$config = \OCP\Server::get(IAppConfig::class);
 		foreach ($configValues as $key => $value) {
 			if (is_array($value)) {
-				$config->setAppValueArray($key, $value);
+				$config->setAppValueArray(Application::APP_ID, $key, $value);
 			} else {
 				$bool = is_bool($value) ? $value : filter_var($value, FILTER_VALIDATE_BOOLEAN);
 				$config->setAppValueBool($key, $bool);
@@ -204,7 +205,7 @@ public function testShowNoSharedFormsIfDisabled(array $configValues) {
 	 */
 	public function testAllowPublicAccessOnDeniedPublicVisibility(): void {
 		$config = \OCP\Server::get(IAppConfig::class);
-		$config->setAppValueBool(Constants::CONFIG_KEY_ALLOWSHOWTOALL, false);
+		$config->setAppValueBool(Application::APP_ID, Constants::CONFIG_KEY_ALLOWSHOWTOALL, false);
 
 		$formMapper = \OCP\Server::get(FormMapper::class);
 		$forms = $formMapper->findSharedForms('user1', filterShown: false);
@@ -223,7 +224,7 @@ public function testShowNoSharedFormsAccessIfDisabled(array $configValues): void
 		$config = \OCP\Server::get(IAppConfig::class);
 		foreach ($configValues as $key => $value) {
 			if (is_array($value)) {
-				$config->setAppValueArray($key, $value);
+				$config->setAppValueArray(Application::APP_ID, $key, $value);
 			} else {
 				$bool = is_bool($value) ? $value : filter_var($value, FILTER_VALIDATE_BOOLEAN);
 				$config->setAppValueBool($key, $bool);

tests/Integration/IntegrationBase.php

@@ -7,9 +7,10 @@
  */
 namespace OCA\Forms\Tests\Integration;
 
+use OCA\Forms\AppInfo\Application;
 use OCA\Forms\Constants;
-use OCP\AppFramework\Services\IAppConfig;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IAppConfig;
 use OCP\IDBConnection;
 use OCP\IUserManager;
 use Test\TestCase;
@@ -18,7 +19,8 @@
  * @group DB
  */
 class IntegrationBase extends TestCase {
-	protected array $testForms;
+	/** @var Array */
+	protected $testForms;
 
 	/**
 	 * Users that are needed by this test case
@@ -33,9 +35,9 @@ class IntegrationBase extends TestCase {
 	public function setUp(): void {
 		parent::setUp();
 
-		$appConfig = \OCP\AppFramework\Services::get(IAppConfig::class);
+		$config = \OCP\Server::get(IAppConfig::class);
 		foreach (Constants::CONFIG_KEYS as $key) {
-			$appConfig->deleteAppValue($key);
+			$config->deleteKey(Application::APP_ID, $key);
 		}
 
 		$userManager = \OCP\Server::get(IUserManager::class);

tests/Unit/Service/ConfigServiceTest.php

@@ -182,20 +182,20 @@ public static function dataCanCreateForms() {
 		return [
 			'notRestriced' => [
 				'config' => [
-					'restrictCreation' => 'false',
+					'restrictCreation' => false,
 				],
 				'expected' => true
 			],
 			'restrictedGroupAllowed' => [
 				'config' => [
-					'restrictCreation' => 'true',
+					'restrictCreation' => true,
 					'creationAllowedGroups' => '["usersGroup","notUsersGroup"]'
 				],
 				'expected' => true
 			],
 			'restrictedNotInGroup' => [
 				'config' => [
-					'restrictCreation' => 'true',
+					'restrictCreation' => true,
 					'creationAllowedGroups' => '["notUsersGroup"]'
 				],
 				'expected' => false