Namespace all core actions and change include to includeOnce

adrianbj · Feb 10, 2024 · 347a770 · 347a770
1 parent 1b4bb36
commit 347a770
Show file tree

Hide file tree

Showing 19 changed files with 35 additions and 35 deletions.
diff --git a/ProcessAdminActions.module.php b/ProcessAdminActions.module.php
@@ -521,14 +521,15 @@ private function getActionPath($actionName) {
     private function includeAndInstantiate($actionName) {
         $actionPath = $this->getActionPath($actionName);
         $ns = $this->wire('files')->getNamespace($actionPath);
+        // if the action is in the root namespace, then we need to compile it
         if($ns === '\\') {
             $actionPath = $this->wire('files')->compile($actionPath);
             $nsClass = '\\' . $actionName;
         }
         else {
             $nsClass = $ns . '\\' . $actionName;
         }
-        $this->wire('files')->include($actionPath);
+        $this->wire('files')->includeOnce($actionPath);
         $this->action = new $nsClass();
     }
 

diff --git a/actions/ConvertFieldsToMultiLanguage.action.php b/actions/ConvertFieldsToMultiLanguage.action.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace ProcessWire;
 
 class ConvertFieldsToMultiLanguage extends ProcessAdminActions {
 

diff --git a/actions/CopyContentToOtherField.action.php b/actions/CopyContentToOtherField.action.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace ProcessWire;
 
 class CopyContentToOtherField extends ProcessAdminActions {
 

diff --git a/actions/CopyFieldContentToOtherPage.action.php b/actions/CopyFieldContentToOtherPage.action.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace ProcessWire;
 
 class CopyFieldContentToOtherPage extends ProcessAdminActions {
 
@@ -59,4 +59,4 @@ protected function executeAction($options) {
 
     }
 
-}
+}
diff --git a/actions/CopyPageTableItemsToOtherPage.action.php b/actions/CopyPageTableItemsToOtherPage.action.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace ProcessWire;
 
 class CopyPageTableItemsToOtherPage extends ProcessAdminActions {
 
@@ -160,4 +160,4 @@ protected function executeAction($options) {
 
     }
 
-}
+}
diff --git a/actions/CopyRepeaterItemsToOtherPage.action.php b/actions/CopyRepeaterItemsToOtherPage.action.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace ProcessWire;
 
 class CopyRepeaterItemsToOtherPage extends ProcessAdminActions {
 
@@ -144,4 +144,4 @@ protected function executeAction($options) {
 
     }
 
-}
+}
diff --git a/actions/CopyTableFieldRowsToOtherPage.action.php b/actions/CopyTableFieldRowsToOtherPage.action.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace ProcessWire;
 
 class CopyTableFieldRowsToOtherPage extends ProcessAdminActions {
 
@@ -136,4 +136,4 @@ protected function executeAction($options) {
 
     }
 
-}
+}
diff --git a/actions/CreateUsersBatcher.action.php b/actions/CreateUsersBatcher.action.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace ProcessWire;
 
 class CreateUsersBatcher extends ProcessAdminActions {
 
@@ -156,4 +156,4 @@ private function isJSON($string){
         return (json_last_error()===JSON_ERROR_NONE);
     }
 
-}
+}
diff --git a/actions/DeleteUnusedFields.action.php b/actions/DeleteUnusedFields.action.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace ProcessWire;
 
 class DeleteUnusedFields extends ProcessAdminActions {
 
@@ -50,4 +50,4 @@ protected function executeAction($options) {
 
     }
 
-}
+}
diff --git a/actions/DeleteUnusedTemplates.action.php b/actions/DeleteUnusedTemplates.action.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace ProcessWire;
 
 class DeleteUnusedTemplates extends ProcessAdminActions {
 

diff --git a/actions/EmailBatcher.action.php b/actions/EmailBatcher.action.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace ProcessWire;
 
 class EmailBatcher extends ProcessAdminActions {
 
@@ -226,4 +226,4 @@ private function replaceWhitespace($str) {
         return $str !== $result ? $this->replaceWhitespace($result) : $result;
     }
 
-}
+}
diff --git a/actions/FieldSetOrSearchAndReplace.action.php b/actions/FieldSetOrSearchAndReplace.action.php
@@ -1,5 +1,4 @@
-<?php
-// this action is not ready for use yet, which is why the filename doesn't have ".action" in it, so it won't be installed
+<?php namespace ProcessWire;
 
 class FieldSetOrSearchAndReplace extends ProcessAdminActions {
 
@@ -185,4 +184,4 @@ protected function executeAction($options) {
 
     }
 
-}
+}
diff --git a/actions/FtpFilesToPage.action.php b/actions/FtpFilesToPage.action.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace ProcessWire;
 
 class FtpFilesToPage extends ProcessAdminActions {
 
@@ -88,4 +88,4 @@ protected function executeAction($options) {
 
     }
 
-}
+}
diff --git a/actions/PageActiveLanguagesBatcher.action.php b/actions/PageActiveLanguagesBatcher.action.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace ProcessWire;
 
 class PageActiveLanguagesBatcher extends ProcessAdminActions {
 
@@ -83,4 +83,4 @@ protected function executeAction($options) {
 
     }
 
-}
+}
diff --git a/actions/PageManipulator.action.php b/actions/PageManipulator.action.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace ProcessWire;
 
 class PageManipulator extends ProcessAdminActions {
 
@@ -121,4 +121,4 @@ protected function executeAction($options) {
 
     }
 
-}
+}
diff --git a/actions/PageTableToRepeaterMatrix.action.php b/actions/PageTableToRepeaterMatrix.action.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace ProcessWire;
 
 class PageTableToRepeaterMatrix extends ProcessAdminActions {
 
@@ -364,4 +364,4 @@ private function getUniqueRepeaterPageName() {
         return str_replace('.', '-', microtime(true)) . '-' . (++$cnt);
     }
 
-}
+}
diff --git a/actions/TemplateFieldsBatcher.action.php b/actions/TemplateFieldsBatcher.action.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace ProcessWire;
 
 class TemplateFieldsBatcher extends ProcessAdminActions {
 
@@ -79,4 +79,4 @@ protected function executeAction($options) {
 
     }
 
-}
+}
diff --git a/actions/TemplateRolesBatcher.action.php b/actions/TemplateRolesBatcher.action.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace ProcessWire;
 
 class TemplateRolesBatcher extends ProcessAdminActions {
 
@@ -130,4 +130,4 @@ protected function executeAction($options) {
 
     }
 
-}
+}
diff --git a/actions/UserRolesPermissionsBatcher.action.php b/actions/UserRolesPermissionsBatcher.action.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace ProcessWire;
 
 class UserRolesPermissionsBatcher extends ProcessAdminActions {
 
@@ -109,4 +109,4 @@ protected function executeAction($options) {
 
     }
 
-}
+}