refactor: Use Nextcloud sets for rector

Signed-off-by: Christoph Wurst <[email protected]>
nextcloud · Sep 11, 2024 · da5d783 · da5d783
1 parent 6133774
commit da5d783
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 8 deletions.
diff --git a/rector.php b/rector.php
@@ -12,6 +12,7 @@
 return RectorConfig::configure()
 	->withPaths([
 		__DIR__ . '/lib',
+		__DIR__ . '/templates',
 		__DIR__ . '/tests',
 	])
 	->withSkip([
@@ -24,6 +25,7 @@
 	->withBootstrapFiles([
 		__DIR__ . '/../../lib/composer/autoload.php',
 	])
-	->withRules([
-		\ChristophWurst\Nextcloud\Rector\Rector\OcServerToOcpServerRector::class,
+	->withSets([
+		\ChristophWurst\Nextcloud\Rector\Set\NextcloudSets::NEXTCLOUD_ALL,
+		\ChristophWurst\Nextcloud\Rector\Set\NextcloudSets::NEXTCLOUD_25,
 	]);
diff --git a/templates/index.php b/templates/index.php
@@ -4,7 +4,7 @@
  * SPDX-FileCopyrightText: 2013-2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-script('mail', 'mail');
+\OCP\Util::addScript('mail', 'mail', 'core');
 ?>
 
 <input type="hidden" id="attachment-size-limit" value="<?php p($_['attachment-size-limit']); ?>">

diff --git a/templates/oauth_done.php b/templates/oauth_done.php
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-script(\OCA\Mail\AppInfo\Application::APP_ID, 'oauthpopup');
+\OCP\Util::addScript(\OCA\Mail\AppInfo\Application::APP_ID, 'oauthpopup', 'core');
 
 ?>
 

diff --git a/templates/redirect.php b/templates/redirect.php
@@ -8,7 +8,7 @@
 ?>
 <?php /** @var array $_ */ ?>
 <?php if (isset($_['authorizedRedirect']) && ($_['authorizedRedirect'])): ?>
-	<?php script('mail', 'autoredirect'); ?>
+	<?php \OCP\Util::addScript('mail', 'autoredirect', 'core'); ?>
 	<div class="error">
 		<div class="icon-loading-dark"
 		     style="height: 60px;"></div>

diff --git a/templates/settings-admin.php b/templates/settings-admin.php
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-script(\OCA\Mail\AppInfo\Application::APP_ID, 'settings');
+\OCP\Util::addScript(\OCA\Mail\AppInfo\Application::APP_ID, 'settings', 'core');
 
 ?>
 <div id="mail-admin-settings">

diff --git a/vendor-bin/rector/composer.json b/vendor-bin/rector/composer.json
@@ -3,7 +3,7 @@
 		"sort-packages": true
 	},
     "require-dev": {
-		"christophwurst/nextcloud-rector": "^0.0.4",
+		"christophwurst/nextcloud-rector": "^0.1.2",
 		"rector/rector": "^1.2.4"
 	}
 }
diff --git a/vendor-bin/rector/composer.lock b/vendor-bin/rector/composer.lock
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ @@
      * SPDX-License-Identifier: AGPL-3.0-or-later
      */
-    script(\OCA\Mail\AppInfo\Application::APP_ID, 'oauthpopup');
+    \OCP\Util::addScript(\OCA\Mail\AppInfo\Application::APP_ID, 'oauthpopup', 'core');
     ?>
@@ Expand Down @@