Merge pull request #21 from splitbrain-forks/php7-signature

Adjust method signatures to match parent
MrBertie · Jan 26, 2016 · 9af50a7 · 9af50a7
2 parents 504bd34 + e9e7188
commit 9af50a7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/action/indexer.php b/action/indexer.php
@@ -17,7 +17,7 @@ class action_plugin_subjectindex_indexer extends DokuWiki_Action_Plugin {
     /**
      * Register its handlers with the DokuWiki's event controller
      */
-    function register(&$controller) {
+    function register(Doku_Event_Handler $controller) {
         $controller->register_hook('INDEXER_PAGE_ADD', 'AFTER', $this, 'handle');
     }
 

diff --git a/syntax/entry.php b/syntax/entry.php
@@ -56,7 +56,7 @@ function connectTo($mode) {
 	}
 
 
-	function handle($match, $state, $pos, &$handler) {
+	function handle($match, $state, $pos, Doku_Handler $handler) {
 
         if ($this->matcher->match($match) === true) {
             $item          = $this->matcher->first;
@@ -82,7 +82,7 @@ private function _remove_ord($text) {
 
     // *************************************
 
-	function render($mode, &$renderer, $data) {
+	function render($mode, Doku_Renderer $renderer, $data) {
 
         if ($mode == 'xhtml') {
             // just re-display a failed match

diff --git a/syntax/ignore.php b/syntax/ignore.php
@@ -42,13 +42,13 @@ function connectTo($mode) {
 	}
 
 
-	function handle($match, $state, $pos, &$handler) {
+	function handle($match, $state, $pos, Doku_Handler $handler) {
        // For use by indexer only in raw wiki text, not for display
         return $match;
 	}
 
 
-	function render($mode, &$renderer, $data) {
+	function render($mode, Doku_Renderer $renderer, $data) {
         if ($mode == 'xhtml') {
             $renderer->doc .= '';
         } else {

diff --git a/syntax/index.php b/syntax/index.php
@@ -42,7 +42,7 @@ function connectTo($mode) {
     }
 
 
-    function handle($match, $state, $pos, &$handler) {
+    function handle($match, $state, $pos, Doku_Handler $handler) {
         global $ID;
 
         $match = substr($match, 15, -2); // strip "{{subjectindex>...}}" markup
@@ -119,7 +119,7 @@ function handle($match, $state, $pos, &$handler) {
     }
 
 
-    function render($mode, &$renderer, $opt) {
+    function render($mode, Doku_Renderer $renderer, $opt) {
         if ($mode == 'xhtml') {
             $renderer->info['cache'] = false;