From 3101d80a978f3c32e2b9a0569985ce1f33f3cd25 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 14 Dec 2023 10:17:25 +0100 Subject: [PATCH] automatic code style fixes --- action.php | 16 ++++++++++------ syntax.php | 32 ++++++++++++++++---------------- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/action.php b/action.php index c184667..4269ff1 100644 --- a/action.php +++ b/action.php @@ -1,5 +1,9 @@ register_hook('PARSER_CACHE_USE', 'BEFORE', $this, 'beforeParserCacheUse'); } /** * Handle PARSER_CACHE_USE:BEFORE event - * @param Doku_Event $event + * @param Event $event */ public function beforeParserCacheUse($event) { @@ -45,10 +49,10 @@ protected function addDependencies($cache, $depends) { // Prevent "Warning: in_array() expects parameter 2 to be array, null given" if (!is_array($cache->depends)) { - $cache->depends = array(); + $cache->depends = []; } if (!array_key_exists('files', $cache->depends)) { - $cache->depends['files'] = array(); + $cache->depends['files'] = []; } foreach ($depends as $file) { diff --git a/syntax.php b/syntax.php index c9c5bdb..24cfd5b 100755 --- a/syntax.php +++ b/syntax.php @@ -1,4 +1,7 @@ * @author Mykola Ostrovskyy */ - /** * Class syntax_plugin_changes */ -class syntax_plugin_changes extends DokuWiki_Syntax_Plugin +class syntax_plugin_changes extends SyntaxPlugin { /** * What kind of syntax are we? @@ -75,12 +77,10 @@ public function handle($match, $state, $pos, Doku_Handler $handler) foreach ($match as $m) { if (is_numeric($m)) { $data['count'] = (int) $m; + } elseif (preg_match('/(\w+)\s*=(.+)/', $m, $temp) == 1) { + $this->handleNamedParameter($temp[1], trim($temp[2]), $data); } else { - if (preg_match('/(\w+)\s*=(.+)/', $m, $temp) == 1) { - $this->handleNamedParameter($temp[1], trim($temp[2]), $data); - } else { - $this->addNamespace($data, trim($m)); - } + $this->addNamespace($data, trim($m)); } } @@ -97,13 +97,13 @@ protected function handleNamedParameter($name, $value, &$data) { global $ID; - static $types = array('edit' => 'E', 'create' => 'C', 'delete' => 'D', 'minor' => 'e'); - static $renderers = array('list', 'pagelist'); + static $types = ['edit' => 'E', 'create' => 'C', 'delete' => 'D', 'minor' => 'e']; + static $renderers = ['list', 'pagelist']; switch ($name) { case 'count': case 'maxage': - $data[$name] = intval($value); + $data[$name] = (int) $value; break; case 'ns': foreach (preg_split('/\s*,\s*/', $value) as $value) { @@ -223,10 +223,10 @@ public function render($mode, Doku_Renderer $R, $data) protected function getChanges($num, $ns, $excludedpages, $type, $user, $maxage, $excludedusers, $reverse) { global $conf; - $changes = array(); - $seen = array(); + $changes = []; + $seen = []; $count = 0; - $lines = array(); + $lines = []; // Get global changelog if (file_exists($conf['changelog']) && is_readable($conf['changelog'])) { @@ -271,7 +271,7 @@ protected function getChanges($num, $ns, $excludedpages, $type, $user, $maxage, // Date sort merged page and media changes if ($this->getConf('listmedia') || $reverse) { - $dates = array(); + $dates = []; foreach ($changes as $change) { $dates[] = $change['date']; } @@ -436,7 +436,7 @@ protected function renderSimpleList($changes, &$R, $flags = null) foreach ($changes as $change) { if ($flags['dayheaders']) { $tdate = date('Ymd', $change['date']); - if ($tdate != $dayheaders_date) { + if ($tdate !== $dayheaders_date) { $R->listu_close(); // break list to insert new header $this->dayheader($R, $change['date']); $R->listu_open(); @@ -478,7 +478,7 @@ protected function renderSimpleList($changes, &$R, $flags = null) */ protected function parseSimpleListFlags($flags) { - $outFlags = array('summary' => true, 'signature' => false, 'dayheaders' => false); + $outFlags = ['summary' => true, 'signature' => false, 'dayheaders' => false]; if (!empty($flags)) { foreach ($flags as $flag) { if (array_key_exists($flag, $outFlags)) {