moved plugin controller to Extension namespace

dokuwiki · Jun 15, 2018 · bf9f56c · bf9f56c
1 parent 08c53d8
commit bf9f56c
Show file tree

Hide file tree

Showing 14 changed files with 127 additions and 91 deletions.
diff --git a/_test/core/DokuWikiTest.php b/_test/core/DokuWikiTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use dokuwiki\Extension\PluginController;
 use dokuwiki\Extension\Event;
 use dokuwiki\Extension\EventHandler;
 
@@ -107,7 +108,7 @@ public function setUp() {
 
         // reset loaded plugins
         global $plugin_controller_class, $plugin_controller;
-        /** @var Doku_Plugin_Controller $plugin_controller */
+        /** @var PluginController $plugin_controller */
         $plugin_controller = new $plugin_controller_class();
 
         // disable all non-default plugins

diff --git a/_test/tests/inc/remote.test.php b/_test/tests/inc/remote.test.php
@@ -148,7 +148,7 @@ function setUp() {
         parent::setUp();
 
         // mock plugin controller to return our test plugins
-        $pluginManager = $this->createMock('Doku_Plugin_Controller');
+        $pluginManager = $this->createMock('dokuwiki\Extension\PluginController');
         $pluginManager->method('getList')->willReturn(array('testplugin', 'testplugin2'));
         $pluginManager->method('load')->willReturnCallback(
             function($type, $plugin) {

diff --git a/bin/plugin.php b/bin/plugin.php
@@ -1,7 +1,7 @@
 #!/usr/bin/php
 <?php
 
-use dokuwiki\Extension\CLIPlugin;
+use dokuwiki\Extension\PluginController;
 use splitbrain\phpcli\CLI;
 use splitbrain\phpcli\Colors;
 use splitbrain\phpcli\Options;
@@ -52,7 +52,7 @@ protected function main(Options $options) {
      * List available plugins
      */
     protected function listPlugins() {
-        /** @var Doku_Plugin_Controller $plugin_controller */
+        /** @var PluginController $plugin_controller */
         global $plugin_controller;
 
         echo "\n";