Merge pull request #83 from nextcloud-libraries/techdebt/noid/abstract-injection-replacement

feat(injected-method): Replace IMailer::validateMailAddress

Author: nickvergessen

config/nextcloud-29/nextcloud-29-deprecations.php

@@ -2,11 +2,28 @@
 
 declare(strict_types=1);
 
-use Nextcloud\Rector\Rector\ReplaceIConfigWithIAppConfigRector;
+use Nextcloud\Rector\Rector\ReplaceInjectedMethodCallRector;
 use Nextcloud\Rector\Set\NextcloudSets;
+use Nextcloud\Rector\ValueObject\ReplaceInjectedMethodCall;
 use Rector\Config\RectorConfig;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->sets([NextcloudSets::NEXTCLOUD_27]);
-    $rectorConfig->rule(ReplaceIConfigWithIAppConfigRector::class);
+    $rectorConfig->ruleWithConfiguration(
+        ReplaceInjectedMethodCallRector::class,
+        [
+            new ReplaceInjectedMethodCall(
+                'OCP\IConfig',
+                'OCP\IAppConfig',
+                'appConfig',
+                [
+                    'getAppValue' => 'getValue',
+                    'getAppKeys' => 'getKeys',
+                    'setAppValue' => 'setValue',
+                    'deleteAppValue' => 'deleteKey',
+                    'deleteAppValues' => 'deleteApp',
+                ],
+            ),
+        ],
+    );
 };

config/nextcloud-32/nextcloud-32-deprecations.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+use Nextcloud\Rector\Rector\ReplaceInjectedMethodCallRector;
+use Nextcloud\Rector\Set\NextcloudSets;
+use Nextcloud\Rector\ValueObject\ReplaceInjectedMethodCall;
+use Rector\Config\RectorConfig;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->sets([NextcloudSets::NEXTCLOUD_29]);
+    $rectorConfig->ruleWithConfiguration(
+        ReplaceInjectedMethodCallRector::class,
+        [
+            new ReplaceInjectedMethodCall(
+                'OCP\Mail\IMailer',
+                'OCP\Mail\IEmailValidator',
+                'emailValidator',
+                [
+                    'validateMailAddress' => 'isValid',
+                ],
+            ),
+        ],
+    );
+};

config/nextcloud-33/nextcloud-33-deprecations.php

@@ -4,15 +4,36 @@
 
 use Nextcloud\Rector\Rector\AnnotationToAttributeRector;
 use Nextcloud\Rector\Rector\ReplaceFetchAllMethodCallRector;
-use Nextcloud\Rector\Rector\ReplaceIConfigWithIUserConfigRector;
+use Nextcloud\Rector\Rector\ReplaceInjectedMethodCallRector;
 use Nextcloud\Rector\Set\NextcloudSets;
+use Nextcloud\Rector\ValueObject\ReplaceInjectedMethodCall;
 use Rector\Config\RectorConfig;
 use Rector\Php80\ValueObject\AnnotationToAttribute;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->sets([NextcloudSets::NEXTCLOUD_29]);
+    $rectorConfig->sets([NextcloudSets::NEXTCLOUD_32]);
     $rectorConfig->rule(ReplaceFetchAllMethodCallRector::class);
-    $rectorConfig->rule(ReplaceIConfigWithIUserConfigRector::class);
+    $rectorConfig->ruleWithConfiguration(
+        ReplaceInjectedMethodCallRector::class,
+        [
+            new ReplaceInjectedMethodCall(
+                'OCP\IConfig',
+                'OCP\IUserConfig',
+                'userConfig',
+                [
+                    'getAllUserValues' => 'getAllValues',
+                    'getUserKeys' => 'getKeys',
+                    'getUserValue' => 'getValueString',
+                    'getUserValueForUsers' => 'getValuesByUsers',
+                    'getUsersForUserValue' => 'searchUsersByValueString',
+                    'setUserValue' => 'setValueString',
+                    'deleteUserValue' => 'deleteUserConfig',
+                    'deleteAllUserValues' => 'deleteAllUserConfig',
+                    'deleteAppFromAllUsers' => 'deleteApp',
+                ],
+            ),
+        ],
+    );
     $rectorConfig->ruleWithConfiguration(
         AnnotationToAttributeRector::class,
         [