Apply rector renames

27 files changed, 87 insertions, 49 deletions

diff --git a/lib/plugins/acl/action.php b/lib/plugins/acl/action.php
index 61e9c8ac6..c50605095 100644
--- a/lib/plugins/acl/action.php
+++ b/lib/plugins/acl/action.php
@@ -1,15 +1,18 @@
 <?php
+
+use dokuwiki\Extension\ActionPlugin;
+use dokuwiki\Extension\EventHandler;
+use dokuwiki\Extension\Event;
 /**
  * AJAX call handler for ACL plugin
  *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author     Andreas Gohr <andi@splitbrain.org>
  */
-
 /**
  * Register handler
  */
-class action_plugin_acl extends DokuWiki_Action_Plugin
+class action_plugin_acl extends ActionPlugin
 {
 
     /**
@@ -18,7 +21,7 @@ class action_plugin_acl extends DokuWiki_Action_Plugin
      * @param Doku_Event_Handler $controller DokuWiki's event controller object
      * @return void
      */
-    public function register(Doku_Event_Handler $controller)
+    public function register(EventHandler $controller)
     {
 
         $controller->register_hook('AJAX_CALL_UNKNOWN', 'BEFORE', $this, 'handleAjaxCallAcl');
@@ -31,7 +34,7 @@ class action_plugin_acl extends DokuWiki_Action_Plugin
      * @param mixed $param  empty
      * @return void
      */
-    public function handleAjaxCallAcl(Doku_Event $event, $param)
+    public function handleAjaxCallAcl(Event $event, $param)
     {
         if ($event->data !== 'plugin_acl') {
             return;
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index bde20dd6b..4213c4e53 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -1,4 +1,5 @@
 <?php
+use dokuwiki\Extension\AdminPlugin;
 use dokuwiki\Utf8\Sort;
 
 /**
@@ -14,7 +15,7 @@ use dokuwiki\Utf8\Sort;
  * All DokuWiki plugins to extend the admin function
  * need to inherit from this class
  */
-class admin_plugin_acl extends DokuWiki_Admin_Plugin
+class admin_plugin_acl extends AdminPlugin
 {
     public $acl;
     protected $ns;
diff --git a/lib/plugins/acl/remote.php b/lib/plugins/acl/remote.php
index 1f7e0055f..ccf8f312c 100644
--- a/lib/plugins/acl/remote.php
+++ b/lib/plugins/acl/remote.php
@@ -1,11 +1,12 @@
 <?php
 
+use dokuwiki\Extension\RemotePlugin;
 use dokuwiki\Remote\AccessDeniedException;
 
 /**
  * Class remote_plugin_acl
  */
-class remote_plugin_acl extends DokuWiki_Remote_Plugin
+class remote_plugin_acl extends RemotePlugin
 {
 
     /**
diff --git a/lib/plugins/authad/action.php b/lib/plugins/authad/action.php
index 671138a98..3be34013b 100644
--- a/lib/plugins/authad/action.php
+++ b/lib/plugins/authad/action.php
@@ -1,4 +1,7 @@
 <?php
+use dokuwiki\Extension\ActionPlugin;
+use dokuwiki\Extension\EventHandler;
+use dokuwiki\Extension\Event;
 /**
  * DokuWiki Plugin addomain (Action Component)
  *
@@ -9,13 +12,13 @@
 /**
  * Class action_plugin_addomain
  */
-class action_plugin_authad extends DokuWiki_Action_Plugin
+class action_plugin_authad extends ActionPlugin
 {
 
     /**
      * Registers a callback function for a given event
      */
-    public function register(Doku_Event_Handler $controller)
+    public function register(EventHandler $controller)
     {
         $controller->register_hook('AUTH_LOGIN_CHECK', 'BEFORE', $this, 'handleAuthLoginCheck');
         $controller->register_hook('FORM_LOGIN_OUTPUT', 'BEFORE', $this, 'handleFormLoginOutput');
@@ -27,7 +30,7 @@ class action_plugin_authad extends DokuWiki_Action_Plugin
      * @param Doku_Event $event
      * @param array      $param
      */
-    public function handleAuthLoginCheck(Doku_Event $event, $param)
+    public function handleAuthLoginCheck(Event $event, $param)
     {
         global $INPUT;
 
@@ -52,7 +55,7 @@ class action_plugin_authad extends DokuWiki_Action_Plugin
      * @param Doku_Event $event
      * @param array      $param
      */
-    public function handleFormLoginOutput(Doku_Event $event, $param)
+    public function handleFormLoginOutput(Event $event, $param)
     {
         global $INPUT;
         /** @var auth_plugin_authad $auth */
diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php
index 057cd58dd..3b1a4a131 100644
--- a/lib/plugins/authad/auth.php
+++ b/lib/plugins/authad/auth.php
@@ -1,4 +1,5 @@
 <?php
+use dokuwiki\Extension\AuthPlugin;
 use dokuwiki\Utf8\Clean;
 use dokuwiki\Utf8\PhpString;
 use dokuwiki\Utf8\Sort;
@@ -40,7 +41,7 @@ use dokuwiki\Logger;
  * @author  Andreas Gohr <andi@splitbrain.org>
  * @author  Jan Schumann <js@schumann-it.com>
  */
-class auth_plugin_authad extends DokuWiki_Auth_Plugin
+class auth_plugin_authad extends AuthPlugin
 {
 
     /**
diff --git a/lib/plugins/authldap/auth.php b/lib/plugins/authldap/auth.php
index 8649d38b2..200ca4d11 100644
--- a/lib/plugins/authldap/auth.php
+++ b/lib/plugins/authldap/auth.php
@@ -1,4 +1,5 @@
 <?php
+use dokuwiki\Extension\AuthPlugin;
 use dokuwiki\PassHash;
 use dokuwiki\Utf8\Sort;
 
@@ -10,7 +11,7 @@ use dokuwiki\Utf8\Sort;
  * @author    Chris Smith <chris@jalakaic.co.uk>
  * @author    Jan Schumann <js@schumann-it.com>
  */
-class auth_plugin_authldap extends DokuWiki_Auth_Plugin
+class auth_plugin_authldap extends AuthPlugin
 {
     /* @var resource $con holds the LDAP connection */
     protected $con;
diff --git a/lib/plugins/authpdo/auth.php b/lib/plugins/authpdo/auth.php
index 4e194ab34..df5adc0a3 100644
--- a/lib/plugins/authpdo/auth.php
+++ b/lib/plugins/authpdo/auth.php
@@ -1,4 +1,5 @@
 <?php
+use dokuwiki\Extension\AuthPlugin;
 use dokuwiki\PassHash;
 use dokuwiki\Utf8\Sort;
 
@@ -12,7 +13,7 @@ use dokuwiki\Utf8\Sort;
 /**
  * Class auth_plugin_authpdo
  */
-class auth_plugin_authpdo extends DokuWiki_Auth_Plugin
+class auth_plugin_authpdo extends AuthPlugin
 {
 
     /** @var PDO */
diff --git a/lib/plugins/authplain/auth.php b/lib/plugins/authplain/auth.php
index 8cfe35115..14e5ce716 100644
--- a/lib/plugins/authplain/auth.php
+++ b/lib/plugins/authplain/auth.php
@@ -1,5 +1,6 @@
 <?php
 
+use dokuwiki\Extension\AuthPlugin;
 use dokuwiki\Logger;
 use dokuwiki\Utf8\Sort;
 
@@ -11,7 +12,7 @@ use dokuwiki\Utf8\Sort;
  * @author     Chris Smith <chris@jalakai.co.uk>
  * @author     Jan Schumann <js@schumann-it.com>
  */
-class auth_plugin_authplain extends DokuWiki_Auth_Plugin
+class auth_plugin_authplain extends AuthPlugin
 {
     /** @var array user cache */
     protected $users;
diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php
index 72956c718..beef981e1 100644
--- a/lib/plugins/config/admin.php
+++ b/lib/plugins/config/admin.php
@@ -6,7 +6,7 @@
  * @author     Christopher Smith <chris@jalakai.co.uk>
  * @author     Ben Coburn <btcoburn@silicodon.net>
  */
-
+use dokuwiki\Extension\AdminPlugin;
 use dokuwiki\plugin\config\core\Configuration;
 use dokuwiki\plugin\config\core\Setting\Setting;
 use dokuwiki\plugin\config\core\Setting\SettingFieldset;
@@ -16,7 +16,7 @@ use dokuwiki\plugin\config\core\Setting\SettingHidden;
  * All DokuWiki plugins to extend the admin function
  * need to inherit from this class
  */
-class admin_plugin_config extends DokuWiki_Admin_Plugin {
+class admin_plugin_config extends AdminPlugin {
 
     protected const IMGDIR = DOKU_BASE . 'lib/plugins/config/images/';
 
diff --git a/lib/plugins/extension/action.php b/lib/plugins/extension/action.php
index b399e1d5f..e4ae03c07 100644
--- a/lib/plugins/extension/action.php
+++ b/lib/plugins/extension/action.php
@@ -1,11 +1,14 @@
 <?php
+
+use dokuwiki\Extension\ActionPlugin;
+use dokuwiki\Extension\EventHandler;
+use dokuwiki\Extension\Event;
 /** DokuWiki Plugin extension (Action Component)
  *
  * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
  * @author  Andreas Gohr <andi@splitbrain.org>
  */
-
-class action_plugin_extension extends DokuWiki_Action_Plugin
+class action_plugin_extension extends ActionPlugin
 {
 
     /**
@@ -14,7 +17,7 @@ class action_plugin_extension extends DokuWiki_Action_Plugin
      * @param Doku_Event_Handler $controller DokuWiki's event controller object
      * @return void
      */
-    public function register(Doku_Event_Handler $controller)
+    public function register(EventHandler $controller)
     {
         $controller->register_hook('AJAX_CALL_UNKNOWN', 'BEFORE', $this, 'info');
     }
@@ -25,7 +28,7 @@ class action_plugin_extension extends DokuWiki_Action_Plugin
      * @param Doku_Event $event
      * @param            $param
      */
-    public function info(Doku_Event $event, $param)
+    public function info(Event $event, $param)
     {
         global $USERINFO;
         global $INPUT;
diff --git a/lib/plugins/extension/admin.php b/lib/plugins/extension/admin.php
index 1a8cb5b64..c81364b0f 100644
--- a/lib/plugins/extension/admin.php
+++ b/lib/plugins/extension/admin.php
@@ -1,4 +1,5 @@
 <?php
+use dokuwiki\Extension\AdminPlugin;
 /**
  * DokuWiki Plugin extension (Admin Component)
  *
@@ -9,7 +10,7 @@
 /**
  * Admin part of the extension manager
  */
-class admin_plugin_extension extends DokuWiki_Admin_Plugin
+class admin_plugin_extension extends AdminPlugin
 {
     protected $infoFor;
     /** @var  helper_plugin_extension_gui */
diff --git a/lib/plugins/extension/cli.php b/lib/plugins/extension/cli.php
index 9861b1ca3..60854a26f 100644
--- a/lib/plugins/extension/cli.php
+++ b/lib/plugins/extension/cli.php
@@ -1,5 +1,6 @@
 <?php
 
+use dokuwiki\Extension\CLIPlugin;
 use splitbrain\phpcli\Options;
 use splitbrain\phpcli\TableFormatter;
 use splitbrain\phpcli\Colors;
@@ -12,7 +13,7 @@ use splitbrain\phpcli\Colors;
  * @license GPL2
  * @author Andreas Gohr <andi@splitbrain.org>
  */
-class cli_plugin_extension extends DokuWiki_CLI_Plugin
+class cli_plugin_extension extends CLIPlugin
 {
     /** @inheritdoc */
     protected function setup(Options $options)
diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 1ce1c2dfa..1713b53e3 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -5,6 +5,7 @@
  * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
  * @author  Michael Hamann <michael@content-space.de>
  */
+use dokuwiki\Extension\Plugin;
 use dokuwiki\Extension\PluginInterface;
 use dokuwiki\Utf8\PhpString;
 use splitbrain\PHPArchive\Tar;
@@ -16,7 +17,7 @@ use dokuwiki\Extension\PluginController;
 /**
  * Class helper_plugin_extension_extension represents a single extension (plugin or template)
  */
-class helper_plugin_extension_extension extends DokuWiki_Plugin
+class helper_plugin_extension_extension extends Plugin
 {
     private $id;
     private $base;
diff --git a/lib/plugins/extension/helper/gui.php b/lib/plugins/extension/helper/gui.php
index 1391774ef..2a0e4f034 100644
--- a/lib/plugins/extension/helper/gui.php
+++ b/lib/plugins/extension/helper/gui.php
@@ -5,13 +5,13 @@
  * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
  * @author  Andreas Gohr <andi@splitbrain.org>
  */
-
+use dokuwiki\Extension\Plugin;
 use dokuwiki\Form\Form;
 
 /**
  * Class helper_plugin_extension_list takes care of the overall GUI
  */
-class helper_plugin_extension_gui extends DokuWiki_Plugin
+class helper_plugin_extension_gui extends Plugin
 {
     protected $tabs = ['plugins', 'templates', 'search', 'install'];
 
diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index 9ec1123ad..cd65c7c1c 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -1,15 +1,16 @@
 <?php
+
+use dokuwiki\Extension\Plugin;
 /**
  * DokuWiki Plugin extension (Helper Component)
  *
  * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
  * @author  Michael Hamann <michael@content-space.de>
  */
-
 /**
  * Class helper_plugin_extension_list takes care of creating a HTML list of extensions
  */
-class helper_plugin_extension_list extends DokuWiki_Plugin
+class helper_plugin_extension_list extends Plugin
 {
     protected $form = '';
     /** @var  helper_plugin_extension_gui */
diff --git a/lib/plugins/extension/helper/repository.php b/lib/plugins/extension/helper/repository.php
index 24b19a331..1cbd3641a 100644
--- a/lib/plugins/extension/helper/repository.php
+++ b/lib/plugins/extension/helper/repository.php
@@ -5,7 +5,7 @@
  * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
  * @author  Michael Hamann <michael@content-space.de>
  */
-
+use dokuwiki\Extension\Plugin;
 use dokuwiki\Cache\Cache;
 use dokuwiki\HTTP\DokuHTTPClient;
 use dokuwiki\Extension\PluginController;
@@ -13,7 +13,7 @@ use dokuwiki\Extension\PluginController;
 /**
  * Class helper_plugin_extension_repository provides access to the extension repository on dokuwiki.org
  */
-class helper_plugin_extension_repository extends DokuWiki_Plugin
+class helper_plugin_extension_repository extends Plugin
 {
 
     public const EXTENSION_REPOSITORY_API = 'https://www.dokuwiki.org/lib/plugins/pluginrepo/api.php';
diff --git a/lib/plugins/info/syntax.php b/lib/plugins/info/syntax.php
index 4e8633b0f..f34310920 100644
--- a/lib/plugins/info/syntax.php
+++ b/lib/plugins/info/syntax.php
@@ -1,5 +1,6 @@
 <?php
 
+use dokuwiki\Extension\SyntaxPlugin;
 use dokuwiki\Extension\PluginInterface;
 /**
  * Info Plugin: Displays information about various DokuWiki internals
@@ -8,7 +9,7 @@ use dokuwiki\Extension\PluginInterface;
  * @author     Andreas Gohr <andi@splitbrain.org>
  * @author     Esther Brunner <wikidesign@gmail.com>
  */
-class syntax_plugin_info extends DokuWiki_Syntax_Plugin
+class syntax_plugin_info extends SyntaxPlugin
 {
 
     /**
diff --git a/lib/plugins/logviewer/admin.php b/lib/plugins/logviewer/admin.php
index 6b56e8d36..15883c6b5 100644
--- a/lib/plugins/logviewer/admin.php
+++ b/lib/plugins/logviewer/admin.php
@@ -1,5 +1,6 @@
 <?php
 
+use dokuwiki\Extension\AdminPlugin;
 use dokuwiki\Form\Form;
 use dokuwiki\Logger;
 
@@ -9,7 +10,7 @@ use dokuwiki\Logger;
  * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
  * @author  Andreas Gohr <andi@splitbrain.org>
  */
-class admin_plugin_logviewer extends DokuWiki_Admin_Plugin
+class admin_plugin_logviewer extends AdminPlugin
 {
     protected const MAX_READ_SIZE = 1_048_576; // 1 MB
 
diff --git a/lib/plugins/popularity/action.php b/lib/plugins/popularity/action.php
index a511a5e9e..2df66299d 100644
--- a/lib/plugins/popularity/action.php
+++ b/lib/plugins/popularity/action.php
@@ -1,11 +1,14 @@
 <?php
+
+use dokuwiki\Extension\ActionPlugin;
+use dokuwiki\Extension\EventHandler;
+use dokuwiki\Extension\Event;
 /**
  * Popularity Feedback Plugin
  *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  */
-
-class action_plugin_popularity extends DokuWiki_Action_Plugin
+class action_plugin_popularity extends ActionPlugin
 {
 
     /**
@@ -19,7 +22,7 @@ class action_plugin_popularity extends DokuWiki_Action_Plugin
     }
 
     /** @inheritdoc */
-    public function register(Doku_Event_Handler $controller)
+    public function register(EventHandler $controller)
     {
         $controller->register_hook('INDEXER_TASKS_RUN', 'AFTER', $this, 'autosubmit', []);
     }
@@ -30,7 +33,7 @@ class action_plugin_popularity extends DokuWiki_Action_Plugin
      * @param Doku_Event $event
      * @param $param
      */
-    public function autosubmit(Doku_Event &$event, $param)
+    public function autosubmit(Event &$event, $param)
     {
         //Do we have to send the data now
         if (!$this->helper->isAutosubmitEnabled() || $this->isTooEarlyToSubmit()) {
diff --git a/lib/plugins/popularity/admin.php b/lib/plugins/popularity/admin.php
index 81e35b77e..c0e66655a 100644
--- a/lib/plugins/popularity/admin.php
+++ b/lib/plugins/popularity/admin.php
@@ -1,11 +1,13 @@
 <?php
+
+use dokuwiki\Extension\AdminPlugin;
 /**
  * Popularity Feedback Plugin
  *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author     Andreas Gohr <andi@splitbrain.org>
  */
-class admin_plugin_popularity extends DokuWiki_Admin_Plugin
+class admin_plugin_popularity extends AdminPlugin
 {
 
     /** @var helper_plugin_popularity */
diff --git a/lib/plugins/revert/admin.php b/lib/plugins/revert/admin.php
index ad681b393..03777e46f 100644
--- a/lib/plugins/revert/admin.php
+++ b/lib/plugins/revert/admin.php
@@ -1,12 +1,13 @@
 <?php
 
+use dokuwiki\Extension\AdminPlugin;
 use dokuwiki\ChangeLog\PageChangeLog;
 
 /**
  * All DokuWiki plugins to extend the admin function
  * need to inherit from this class
  */
-class admin_plugin_revert extends DokuWiki_Admin_Plugin
+class admin_plugin_revert extends AdminPlugin
 {
     protected $cmd;
     // some vars which might need tuning later
diff --git a/lib/plugins/safefnrecode/action.php b/lib/plugins/safefnrecode/action.php
index 952d95c90..5a12dcb09 100644
--- a/lib/plugins/safefnrecode/action.php
+++ b/lib/plugins/safefnrecode/action.php
@@ -1,16 +1,19 @@
 <?php
+
+use dokuwiki\Extension\ActionPlugin;
+use dokuwiki\Extension\EventHandler;
+use dokuwiki\Extension\Event;
 /**
  * DokuWiki Plugin safefnrecode (Action Component)
  *
  * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
  * @author  Andreas Gohr <andi@splitbrain.org>
  */
-
-class action_plugin_safefnrecode extends DokuWiki_Action_Plugin
+class action_plugin_safefnrecode extends ActionPlugin
 {
 
     /** @inheritdoc */
-    public function register(Doku_Event_Handler $controller)
+    public function register(EventHandler $controller)
     {
         $controller->register_hook('INDEXER_TASKS_RUN', 'BEFORE', $this, 'handleIndexerTasksRun');
     }
@@ -21,7 +24,7 @@ class action_plugin_safefnrecode extends DokuWiki_Action_Plugin
      * @param Doku_Event $event
      * @param $param
      */
-    public function handleIndexerTasksRun(Doku_Event $event, $param)
+    public function handleIndexerTasksRun(Event $event, $param)
     {
         global $conf;
         if ($conf['fnencode'] != 'safe') return;
diff --git a/lib/plugins/styling/action.php b/lib/plugins/styling/action.php
index 46245ca75..ee03fa751 100644
--- a/lib/plugins/styling/action.php
+++ b/lib/plugins/styling/action.php
@@ -1,11 +1,14 @@
 <?php
+use dokuwiki\Extension\ActionPlugin;
+use dokuwiki\Extension\EventHandler;
+use dokuwiki\Extension\Event;
 /**
  * DokuWiki Plugin styling (Action Component)
  *
  * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
  * @author  Andreas Gohr <andi@splitbrain.org>
  */
-class action_plugin_styling extends DokuWiki_Action_Plugin
+class action_plugin_styling extends ActionPlugin
 {
 
     /**
@@ -14,7 +17,7 @@ class action_plugin_styling extends DokuWiki_Action_Plugin
      * @param Doku_Event_Handler $controller DokuWiki's event controller object
      * @return void
      */
-    public function register(Doku_Event_Handler $controller)
+    public function register(EventHandler $controller)
     {
         $controller->register_hook('TPL_METAHEADER_OUTPUT', 'BEFORE', $this, 'handleHeader');
     }
@@ -27,7 +30,7 @@ class action_plugin_styling extends DokuWiki_Action_Plugin
      *                           handler was registered]
      * @return void
      */
-    public function handleHeader(Doku_Event &$event, $param)
+    public function handleHeader(Event &$event, $param)
     {
         global $ACT;
         global $INPUT;
diff --git a/lib/plugins/styling/admin.php b/lib/plugins/styling/admin.php
index 2e938b291..a25541399 100644
--- a/lib/plugins/styling/admin.php
+++ b/lib/plugins/styling/admin.php
@@ -1,4 +1,5 @@
 <?php
+use dokuwiki\Extension\AdminPlugin;
 use dokuwiki\StyleUtils;
 /**
  * DokuWiki Plugin styling (Admin Component)
@@ -6,7 +7,7 @@ use dokuwiki\StyleUtils;
  * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
  * @author  Andreas Gohr <andi@splitbrain.org>
  */
-class admin_plugin_styling extends DokuWiki_Admin_Plugin
+class admin_plugin_styling extends AdminPlugin
 {
 
     public $ispopup = false;
diff --git a/lib/plugins/testing/action.php b/lib/plugins/testing/action.php
index 965b55e3c..b98d8bb63 100644
--- a/lib/plugins/testing/action.php
+++ b/lib/plugins/testing/action.php
@@ -1,5 +1,7 @@
 <?php
 
+use dokuwiki\Extension\ActionPlugin;
+use dokuwiki\Extension\EventHandler;
 use dokuwiki\Extension\Event;
 
 /**
@@ -9,10 +11,10 @@ use dokuwiki\Extension\Event;
  *
  * @author Tobias Sarnowski <tobias@trustedco.de>
  */
-class action_plugin_testing extends DokuWiki_Action_Plugin {
+class action_plugin_testing extends ActionPlugin {
 
     /** @inheritdoc */
-    public function register(Doku_Event_Handler $controller) {
+    public function register(EventHandler $controller) {
         $controller->register_hook('DOKUWIKI_STARTED', 'AFTER', $this, 'dokuwikiStarted');
     }
 
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index d0354b046..ae5b3cf26 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -1,5 +1,6 @@
 <?php
 
+use dokuwiki\Extension\AdminPlugin;
 use dokuwiki\Utf8\Clean;
 /*
  *  User Manager
@@ -16,7 +17,7 @@ use dokuwiki\Utf8\Clean;
  * All DokuWiki plugins to extend the admin function
  * need to inherit from this class
  */
-class admin_plugin_usermanager extends DokuWiki_Admin_Plugin
+class admin_plugin_usermanager extends AdminPlugin
 {
     protected const IMAGE_DIR = DOKU_BASE.'lib/plugins/usermanager/images/';
 
diff --git a/lib/plugins/usermanager/cli.php b/lib/plugins/usermanager/cli.php
index 152e26ca0..b76c4f962 100644
--- a/lib/plugins/usermanager/cli.php
+++ b/lib/plugins/usermanager/cli.php
@@ -1,5 +1,6 @@
 <?php
 
+use dokuwiki\Extension\CLIPlugin;
 use dokuwiki\Extension\AuthPlugin;
 use splitbrain\phpcli\Options;
 use splitbrain\phpcli\TableFormatter;
@@ -12,7 +13,7 @@ use splitbrain\phpcli\TableFormatter;
  * @license GPL2
  * @author Karsten Kosmala <karsten.kosmala@gmail.com>
  */
-class cli_plugin_usermanager extends DokuWiki_CLI_Plugin
+class cli_plugin_usermanager extends CLIPlugin
 {
     public function __construct()
     {