Merge pull request #1 from cosmocode/master

fix method signatures. Thanks to Andi.
GJRobert · Apr 21, 2019 · 0e208e5 · 0e208e5
2 parents 656b32b + bfcf3e4
commit 0e208e5
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/action.php b/action.php
@@ -13,15 +13,15 @@ class action_plugin_formatplus2 extends DokuWiki_Action_Plugin {
   /**
    * register the eventhandlers
    */
-  function register(&$contr){
+  function register(Doku_Event_Handler $contr){
     $contr->register_hook('TOOLBAR_DEFINE', 'AFTER', $this, 'toolbar_event', array());
   }
 
   /**
    *
    * @author  Tom N Harris    <tnharris@whoopdedo.org>
    */
-  function toolbar_event(&$event, $param){
+  function toolbar_event(Doku_Event $event, $param){
     $disabled = explode(',',$this->getConf('disable_syntax'));
     $disabled = array_map('trim',$disabled);
     $buttons = array();

diff --git a/formatting.php b/formatting.php
@@ -95,7 +95,7 @@ function postConnect() {
       $this->Lexer->addExitPattern($this->formatting['close'], 'plugin_formatplus2_'.$this->getPluginComponent());
   }
 
-  function handle($match, $state, $pos, &$handler){
+  function handle($match, $state, $pos, Doku_Handler $handler){
     $formatting = $this->_getFormatting();
     if (empty($formatting)) return array(DOKU_LEXER_UNMATCHED,$match);
     if ($state != DOKU_LEXER_UNMATCHED) {
@@ -108,7 +108,7 @@ function handle($match, $state, $pos, &$handler){
     return array($state,$output);
   }
 
-  function render($format, &$renderer, $data) {
+  function render($format, Doku_Renderer $renderer, $data) {
     list($state,$output) = $data;
     if ($format == 'xhtml'){
       switch ($state) {

diff --git a/syntax/.quoteplus.php.kate-swp b/syntax/.quoteplus.php.kate-swp
diff --git a/syntax/blockdeleteplus.php b/syntax/blockdeleteplus.php
@@ -63,7 +63,7 @@ function postConnect() {
     }
   }
 
-  function handle($match, $state, $pos, &$handler){
+  function handle($match, $state, $pos, Doku_Handler $handler){
     switch ($state) {
       case DOKU_LEXER_ENTER:
         $match = substr($match,4,-1);
@@ -93,7 +93,7 @@ function handle($match, $state, $pos, &$handler){
     return array($state,$output);
   }
 
-  function render($format, &$renderer, $data) {
+  function render($format, Doku_Renderer $renderer, $data) {
     list($state,$output) = $data;
     if (substr($format,0,5) == 'xhtml'){
       switch ($state) {

diff --git a/syntax/blockinsertplus.php b/syntax/blockinsertplus.php
@@ -58,7 +58,7 @@ function postConnect() {
     }
   }
 
-  function handle($match, $state, $pos, &$handler){
+  function handle($match, $state, $pos, Doku_Handler $handler){
     switch ($state) {
       case DOKU_LEXER_ENTER:
         $match = substr($match,4,-1);
@@ -88,7 +88,7 @@ function handle($match, $state, $pos, &$handler){
     return array($state,$output);
   }
 
-  function render($format, &$renderer, $data) {
+  function render($format, Doku_Renderer $renderer, $data) {
     list($state,$output) = $data;
     if (substr($format,0,5) == 'xhtml'){
       switch ($state) {

diff --git a/syntax/blockquoteplus.php b/syntax/blockquoteplus.php
@@ -57,7 +57,7 @@ function postConnect() {
     }
   }
 
-  function handle($match, $state, $pos, &$handler){
+  function handle($match, $state, $pos, Doku_Handler $handler){
     switch ($state) {
       case DOKU_LEXER_ENTER:
         $output = trim(substr($match,6,-1));
@@ -72,7 +72,7 @@ function handle($match, $state, $pos, &$handler){
     return array($state,$output);
   }
 
-  function render($format, &$renderer, $data) {
+  function render($format, Doku_Renderer $renderer, $data) {
     list($state,$output) = $data;
     if (substr($format,0,5) == 'xhtml'){
       switch ($state) {

diff --git a/syntax/quoteplus.php b/syntax/quoteplus.php
@@ -49,7 +49,7 @@ function postConnect() {
     }
   }
 
-  function handle($match, $state, $pos, &$handler){
+  function handle($match, $state, $pos, Doku_Handler $handler){
     switch ($state) {
       case DOKU_LEXER_ENTER:
         if (substr($match,2,1) == '=')
@@ -67,7 +67,7 @@ function handle($match, $state, $pos, &$handler){
     return array($state,$output);
   }
 
-  function render($format, &$renderer, $data) {
+  function render($format, Doku_Renderer $renderer, $data) {
     list($state,$output) = $data;
     if ($format == 'xhtml'){
       switch ($state) {