Skip to content
Permalink
Browse files

Adjust method signatures to match parent

  • Loading branch information...
splitbrain committed Feb 3, 2016
1 parent 39e902b commit ef9d502905a575973ee0ee25684550c206834260
Showing with 11 additions and 11 deletions.
  1. +1 −1 action.php
  2. +2 −2 syntax/entry.php
  3. +2 −2 syntax/info.php
  4. +1 −1 syntax/list.php
  5. +2 −2 syntax/nodata.php
  6. +2 −2 syntax/select.php
  7. +1 −1 syntax/table.php
@@ -21,7 +21,7 @@ class action_plugin_strata extends DokuWiki_Action_Plugin {
*
* @param controller object the controller to register with
*/
public function register(Doku_Event_Handler &$controller) {
public function register(Doku_Event_Handler $controller) {
$controller->register_hook('IO_WIKIPAGE_WRITE', 'BEFORE', $this, '_io_page_write');
$controller->register_hook('PARSER_METADATA_RENDER', 'BEFORE', $this, '_parser_metadata_render_before');
$controller->register_hook('STRATA_PREVIEW_METADATA_RENDER', 'BEFORE', $this, '_parser_metadata_render_before');
@@ -38,7 +38,7 @@ function connectTo($mode) {
}
}
function handle($match, $state, $pos, &$handler) {
function handle($match, $state, $pos, Doku_Handler $handler) {
$result = array(
'entry'=>'',
'data'=> array(
@@ -239,7 +239,7 @@ protected function getPositions($data) {
return array($currentPosition, $previousPosition, $nextPosition);
}
function render($mode, &$R, $data) {
function render($mode, Doku_Renderer $R, $data) {
global $ID;
if($data == array()) {
@@ -38,7 +38,7 @@ public function connectTo($mode) {
$this->Lexer->addSpecialPattern('~~INFO:strataaggregates~~',$mode,'plugin_strata_info');
}
public function handle($match, $state, $pos, &$handler){
public function handle($match, $state, $pos, Doku_Handler $handler){
$data = array();
preg_match('/~~INFO:strata(type|aggregate)s~~/',$match, $captures);
list(,$kind) = $captures;
@@ -72,7 +72,7 @@ function _compareNames($a, $b) {
return strcmp($a['name'], $b['name']);
}
public function render($mode, &$R, $data) {
public function render($mode, Doku_Renderer $R, $data) {
if($mode == 'xhtml') {
list($kind, $items) = $data;
@@ -20,7 +20,7 @@ function handleHeader($header, &$result, &$typemap) {
return preg_replace('/(^<list)|( *>$)/','',$header);
}
function render($mode, &$R, $data) {
function render($mode, Doku_Renderer $R, $data) {
if($data == array() || isset($data['error'])) {
if($mode == 'xhtml') {
$R->listu_open();
@@ -34,11 +34,11 @@ public function connectTo($mode) {
$this->Lexer->addSpecialPattern('~~NODATA~~',$mode,'plugin_strata_nodata');
}
public function handle($match, $state, $pos, &$handler){
public function handle($match, $state, $pos, Doku_Handler $handler){
return array();
}
public function render($mode, &$R, $data) {
public function render($mode, Doku_Renderer $R, $data) {
if($mode == 'metadata') {
$R->info['data'] = false;
return true;
@@ -63,7 +63,7 @@ function getUISettingUI($hasUIBlock) {
return array('choices' => array('none' => array('none', 'no', 'n'), 'generic' => array('generic', 'g')), 'default' => ($hasUIBlock ? 'generic' : 'none'));
}
function handle($match, $state, $pos, &$handler) {
function handle($match, $state, $pos, Doku_Handler $handler) {
try {
$result = array();
$typemap = array();
@@ -275,7 +275,7 @@ function prepareQuery($query) {
* @param R the renderer
* @param data the custom data from the handle phase
*/
function render($mode, &$R, $data) {
function render($mode, Doku_Renderer $R, $data) {
return false;
}
@@ -24,7 +24,7 @@ function handleHeader($header, &$result, &$typemap) {
return preg_replace('/(^<table)|( *>$)/','',$header);
}
function render($mode, &$R, $data) {
function render($mode, Doku_Renderer $R, $data) {
if($data == array() || isset($data['error'])) {
if($mode == 'xhtml') {
$R->table_open();

0 comments on commit ef9d502

Please sign in to comment.
You can’t perform that action at this time.