Merge pull request #81 from nextcloud-libraries/bugfix/noid/samples

test(iappconfig): Add more tests with IAppConfig already imported

Author: nickvergessen

src/Rector/ReplaceIConfigWithIAppConfigRector.php

@@ -191,12 +191,9 @@ function (Node $subNode) use ($propertyNames, $deprecatedMethods, &$calls): ?Nod
                     if (!$this->isName($propertyFetch->var, 'this')) {
                         return null;
                     }
-                    foreach ($propertyNames as $propertyName) {
-                        if ($this->isName($propertyFetch->name, $propertyName)) {
-                            $calls[] = $subNode;
 
-                            break;
-                        }
+                    if ($this->isNames($propertyFetch->name, $propertyNames)) {
+                        $calls[] = $subNode;
                     }
 
                     return null;

tests/Rector/ReplaceIConfigWithIAppConfigRector/Fixture/test_fixture_double.php.inc

@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace Nextcloud\Rector\Test\Rector\ReplaceIConfigWithIAppConfigRector\Fixture;
+
+use OCP\IAppConfig;
+use OCP\IConfig;
+
+class SomeClass
+{
+    public function __construct(private IConfig $config, private IAppConfig $appConfig)
+    {
+    }
+
+    public function run(): void
+    {
+        $this->config->getAppValue('myapp', 'mykey');
+        $this->config->getAppValue('myapp', 'mykey', 'default');
+        $this->config->getAppKeys('myapp');
+        $this->config->setAppValue('myapp', 'mykey', 'value');
+        $this->config->deleteAppValue('myapp', 'mykey');
+        $this->config->deleteAppValues('myapp');
+    }
+}
+
+?>
+-----
+<?php
+
+/*
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace Nextcloud\Rector\Test\Rector\ReplaceIConfigWithIAppConfigRector\Fixture;
+
+use OCP\IAppConfig;
+use OCP\IConfig;
+
+class SomeClass
+{
+    public function __construct(private IConfig $config, private IAppConfig $appConfig)
+    {
+    }
+
+    public function run(): void
+    {
+        $this->appConfig->getValue('myapp', 'mykey');
+        $this->appConfig->getValue('myapp', 'mykey', 'default');
+        $this->appConfig->getKeys('myapp');
+        $this->appConfig->setValue('myapp', 'mykey', 'value');
+        $this->appConfig->deleteKey('myapp', 'mykey');
+        $this->appConfig->deleteApp('myapp');
+    }
+}
+
+?>

tests/Rector/ReplaceIConfigWithIAppConfigRector/Fixture/test_fixture_service.php.inc

@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace Nextcloud\Rector\Test\Rector\ReplaceIConfigWithIAppConfigRector\Fixture;
+
+use OCP\AppFramework\Services\IAppConfig;
+use OCP\IConfig;
+
+class SomeClass
+{
+    public function __construct(private IConfig $config, private IAppConfig $appConfig)
+    {
+    }
+
+    public function run(): void
+    {
+        $this->config->getAppValue('myapp', 'mykey');
+        $this->config->getAppValue('myapp', 'mykey', 'default');
+        $this->config->getAppKeys('myapp');
+        $this->config->setAppValue('myapp', 'mykey', 'value');
+        $this->config->deleteAppValue('myapp', 'mykey');
+        $this->config->deleteAppValues('myapp');
+    }
+}
+
+?>
+-----
+<?php
+
+/*
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace Nextcloud\Rector\Test\Rector\ReplaceIConfigWithIAppConfigRector\Fixture;
+
+use OCP\AppFramework\Services\IAppConfig;
+use OCP\IConfig;
+
+class SomeClass
+{
+    public function __construct(private IConfig $config, private IAppConfig $appConfig, private \OCP\IAppConfig $appConfig2)
+    {
+    }
+
+    public function run(): void
+    {
+        $this->appConfig2->getValue('myapp', 'mykey');
+        $this->appConfig2->getValue('myapp', 'mykey', 'default');
+        $this->appConfig2->getKeys('myapp');
+        $this->appConfig2->setValue('myapp', 'mykey', 'value');
+        $this->appConfig2->deleteKey('myapp', 'mykey');
+        $this->appConfig2->deleteApp('myapp');
+    }
+}
+
+?>