summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-03-11 20:47:13 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-03-11 20:47:13 +0900
commit946ef22d57af0e77310c1114998078c8002a7e17 (patch)
treef32bbe2e9418c9edee0fe69bf672d50d868657f3
parentefec8082aa320c275d22f5c97e8074b4e8e1769f (diff)
fix a bunch of php 7 warnings that fill our php error logs
"PHP Warning: Declaration of action_plugin_anewssystem::register(Doku_Event_Handler &$controller) should be compatible with DokuWiki_Action_Plugin::register(Doku_Event_Handler $controller) in /srv/web/enlightenment.org/public_html/lib/plugins/anewssystem/action.php on line 0" these ones...
-rw-r--r--public_html/lib/plugins/anewssystem/action.php4
-rw-r--r--public_html/lib/plugins/anewssystem/syntax.php6
-rw-r--r--public_html/lib/plugins/clear/syntax.php6
-rw-r--r--public_html/lib/plugins/codelink/syntax.php4
-rw-r--r--public_html/lib/plugins/const/syntax.php4
-rw-r--r--public_html/lib/plugins/html5video/syntax/video.php4
-rw-r--r--public_html/lib/plugins/itemtable/syntax.php6
7 files changed, 17 insertions, 17 deletions
diff --git a/public_html/lib/plugins/anewssystem/action.php b/public_html/lib/plugins/anewssystem/action.php
index 1137e0a1..e60f54a1 100644
--- a/public_html/lib/plugins/anewssystem/action.php
+++ b/public_html/lib/plugins/anewssystem/action.php
@@ -33,7 +33,7 @@ class action_plugin_anewssystem extends DokuWiki_Action_Plugin {
33/****************************************************************************** 33/******************************************************************************
34** Register its handlers with the dokuwiki's event controller 34** Register its handlers with the dokuwiki's event controller
35*/ 35*/
36 function register(Doku_Event_Handler &$controller) { 36 function register(Doku_Event_Handler $controller) {
37 $controller->register_hook('ACTION_ACT_PREPROCESS', 'BEFORE', $this, '_handle_act', array()); 37 $controller->register_hook('ACTION_ACT_PREPROCESS', 'BEFORE', $this, '_handle_act', array());
38 $controller->register_hook('TPL_ACT_UNKNOWN', 'BEFORE', $this, 'output', array()); 38 $controller->register_hook('TPL_ACT_UNKNOWN', 'BEFORE', $this, 'output', array());
39 } 39 }
@@ -231,4 +231,4 @@ class action_plugin_anewssystem extends DokuWiki_Action_Plugin {
231 $event->preventDefault(); 231 $event->preventDefault();
232 } 232 }
233/******************************************************************************/ 233/******************************************************************************/
234} \ No newline at end of file 234}
diff --git a/public_html/lib/plugins/anewssystem/syntax.php b/public_html/lib/plugins/anewssystem/syntax.php
index 01bcd081..1d695e15 100644
--- a/public_html/lib/plugins/anewssystem/syntax.php
+++ b/public_html/lib/plugins/anewssystem/syntax.php
@@ -43,7 +43,7 @@ class syntax_plugin_anewssystem extends DokuWiki_Syntax_Plugin {
43/******************************************************************************/ 43/******************************************************************************/
44/* handle the match 44/* handle the match
45*/ 45*/
46 function handle($match, $state, $pos,Doku_Handler &$handler) { 46 function handle($match, $state, $pos,Doku_Handler $handler) {
47 global $ID, $conf; 47 global $ID, $conf;
48 $match = substr($match,strlen('{{anss>'),-2); //strip markup from start and end 48 $match = substr($match,strlen('{{anss>'),-2); //strip markup from start and end
49 49
@@ -71,7 +71,7 @@ class syntax_plugin_anewssystem extends DokuWiki_Syntax_Plugin {
71/* render output 71/* render output
72* @author Taggic <taggic@t-online.de> 72* @author Taggic <taggic@t-online.de>
73*/ 73*/
74 function render($mode,Doku_Renderer &$renderer, $ans_conf) { 74 function render($mode,Doku_Renderer $renderer, $ans_conf) {
75 global $ID, $conf; 75 global $ID, $conf;
76 $xhtml_renderer = new Doku_Renderer_xhtml(); 76 $xhtml_renderer = new Doku_Renderer_xhtml();
77 $records = file(DOKU_PLUGIN.'anewssystem/tpl/newstemplate_'.$conf['lang'].'.txt'); 77 $records = file(DOKU_PLUGIN.'anewssystem/tpl/newstemplate_'.$conf['lang'].'.txt');
@@ -1559,4 +1559,4 @@ class syntax_plugin_anewssystem extends DokuWiki_Syntax_Plugin {
1559 return $news_edit_tb; 1559 return $news_edit_tb;
1560 } 1560 }
1561} 1561}
1562?> \ No newline at end of file 1562?>
diff --git a/public_html/lib/plugins/clear/syntax.php b/public_html/lib/plugins/clear/syntax.php
index d76471e7..f1de38dd 100644
--- a/public_html/lib/plugins/clear/syntax.php
+++ b/public_html/lib/plugins/clear/syntax.php
@@ -27,9 +27,9 @@ class syntax_plugin_clear extends DokuWiki_Syntax_Plugin {
27 function connectTo($mode) { 27 function connectTo($mode) {
28 $this->Lexer->addSpecialPattern('<clear/>',$mode,'plugin_clear'); 28 $this->Lexer->addSpecialPattern('<clear/>',$mode,'plugin_clear');
29 } 29 }
30 function handle($match, $state, $pos, &$handler){ return array($match, $state, $pos); } 30 function handle($match, $state, $pos, $handler){ return array($match, $state, $pos); }
31 function render($mode, &$renderer, $data) { 31 function render($mode, $renderer, $data) {
32 if($mode == 'xhtml'){ 32 if($mode == 'xhtml'){
33 $renderer->doc .= "<div style='clear:both;'></div>"; 33 $renderer->doc .= "<div style='clear:both;'></div>";
34 return true; 34 return true;
35 } 35 }
diff --git a/public_html/lib/plugins/codelink/syntax.php b/public_html/lib/plugins/codelink/syntax.php
index 0d6ac1ba..55699a5c 100644
--- a/public_html/lib/plugins/codelink/syntax.php
+++ b/public_html/lib/plugins/codelink/syntax.php
@@ -87,7 +87,7 @@ class syntax_plugin_codelink extends DokuWiki_Syntax_Plugin {
87 * @param Doku_Handler $handler The handler 87 * @param Doku_Handler $handler The handler
88 * @return array Data for the renderer 88 * @return array Data for the renderer
89 */ 89 */
90 public function handle($match, $state, $pos, Doku_Handler &$handler){ 90 public function handle($match, $state, $pos, Doku_Handler $handler){
91 $data = array(); 91 $data = array();
92 92
93 if (preg_match('/^~~CODE-/', $match)) { 93 if (preg_match('/^~~CODE-/', $match)) {
@@ -133,7 +133,7 @@ class syntax_plugin_codelink extends DokuWiki_Syntax_Plugin {
133 * @param array $data The data from the handler() function 133 * @param array $data The data from the handler() function
134 * @return bool If rendering was successful. 134 * @return bool If rendering was successful.
135 */ 135 */
136 public function render($mode, Doku_Renderer &$renderer, $data) { 136 public function render($mode, Doku_Renderer $renderer, $data) {
137 if ($mode != 'xhtml') return false; 137 if ($mode != 'xhtml') return false;
138 $renderer->doc .= $data[0]; 138 $renderer->doc .= $data[0];
139 return true; 139 return true;
diff --git a/public_html/lib/plugins/const/syntax.php b/public_html/lib/plugins/const/syntax.php
index 69e28df8..2162699f 100644
--- a/public_html/lib/plugins/const/syntax.php
+++ b/public_html/lib/plugins/const/syntax.php
@@ -26,11 +26,11 @@ class syntax_plugin_const extends DokuWiki_Syntax_Plugin {
26 $this->Lexer->addSpecialPattern('<const[^>]*>[^<]*</const>',$mode,'plugin_const'); 26 $this->Lexer->addSpecialPattern('<const[^>]*>[^<]*</const>',$mode,'plugin_const');
27 } 27 }
28 28
29 function handle($match, $state, $pos, Doku_Handler &$handler) { 29 function handle($match, $state, $pos, Doku_Handler $handler) {
30 return array($match, $state, $pos); 30 return array($match, $state, $pos);
31 } 31 }
32 32
33 function render($mode, Doku_Renderer &$renderer, $data) { 33 function render($mode, Doku_Renderer $renderer, $data) {
34 // $data is what the function handle return'ed. 34 // $data is what the function handle return'ed.
35 if($mode == 'xhtml'){ 35 if($mode == 'xhtml'){
36 $renderer->doc .=""; 36 $renderer->doc .="";
diff --git a/public_html/lib/plugins/html5video/syntax/video.php b/public_html/lib/plugins/html5video/syntax/video.php
index ff783007..22803893 100644
--- a/public_html/lib/plugins/html5video/syntax/video.php
+++ b/public_html/lib/plugins/html5video/syntax/video.php
@@ -43,7 +43,7 @@ class syntax_plugin_html5video_video extends DokuWiki_Syntax_Plugin {
43 $this->Lexer->addSpecialPattern('\{\{[^}]*(?:(?:webm)|(?:ogv)|(?:mp4))(?:\|(?:\d{2,4}x\d{2,4})?(?:\|(?:loop)?,?(?:autoplay)?(?:,loop)?)?)? ?\}\}',$mode,'plugin_html5video_video'); 43 $this->Lexer->addSpecialPattern('\{\{[^}]*(?:(?:webm)|(?:ogv)|(?:mp4))(?:\|(?:\d{2,4}x\d{2,4})?(?:\|(?:loop)?,?(?:autoplay)?(?:,loop)?)?)? ?\}\}',$mode,'plugin_html5video_video');
44 } 44 }
45 45
46 public function handle($match, $state, $pos, &$handler){ 46 public function handle($match, $state, $pos, $handler){
47 $params = substr($match, strlen('{{'), - strlen('}}')); //Strip markup 47 $params = substr($match, strlen('{{'), - strlen('}}')); //Strip markup
48 if(strpos($params, ' ') === 0) { // Space as first character 48 if(strpos($params, ' ') === 0) { // Space as first character
49 if(substr_compare($params, ' ', -1, 1) === 0) { // Space a front and back = centered 49 if(substr_compare($params, ' ', -1, 1) === 0) { // Space a front and back = centered
@@ -65,7 +65,7 @@ class syntax_plugin_html5video_video extends DokuWiki_Syntax_Plugin {
65 return array(state, explode('|', $params)); 65 return array(state, explode('|', $params));
66 } 66 }
67 67
68 public function render($mode, &$renderer, $data) { 68 public function render($mode, $renderer, $data) {
69 if($mode != 'xhtml') return false; 69 if($mode != 'xhtml') return false;
70 70
71 list($state, $params) = $data; 71 list($state, $params) = $data;
diff --git a/public_html/lib/plugins/itemtable/syntax.php b/public_html/lib/plugins/itemtable/syntax.php
index c78febd2..a07981fe 100644
--- a/public_html/lib/plugins/itemtable/syntax.php
+++ b/public_html/lib/plugins/itemtable/syntax.php
@@ -47,7 +47,7 @@ class syntax_plugin_itemtable extends DokuWiki_Syntax_Plugin {
47 /** 47 /**
48 * Handle the match 48 * Handle the match
49 */ 49 */
50 function handle($match, $state, $pos, &$handler){ 50 function handle($match, $state, $pos, $handler){
51 switch ($state) { 51 switch ($state) {
52 case DOKU_LEXER_ENTER : 52 case DOKU_LEXER_ENTER :
53 return array($state, substr($match, 10, -1) ); 53 return array($state, substr($match, 10, -1) );
@@ -177,7 +177,7 @@ class syntax_plugin_itemtable extends DokuWiki_Syntax_Plugin {
177 return $res; 177 return $res;
178 } 178 }
179 179
180 function render($mode, &$renderer, $data) { 180 function render($mode, $renderer, $data) {
181 // This will only render in xhtml 181 // This will only render in xhtml
182 if($mode == 'xhtml'){ 182 if($mode == 'xhtml'){
183 list($state, $match) = $data; 183 list($state, $match) = $data;
@@ -224,4 +224,4 @@ class syntax_plugin_itemtable extends DokuWiki_Syntax_Plugin {
224 } 224 }
225 return false; 225 return false;
226 } 226 }
227} \ No newline at end of file 227}