Skip to content

Commit e7c3d2a

Browse files
anndaannda
authored
Merge pull request #673 from cosmocode/bot/autofix
🤖 Automatic code style fixes
2 parents 7f4e957 + 5e29103 commit e7c3d2a

35 files changed

+87
-128
lines changed

‎action/aggregationeditor.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class action_plugin_struct_aggregationeditor extends ActionPlugin
3838
/**
3939
* Registers a callback function for a given event
4040
*
41-
* @param Doku_Event_Handler $controller DokuWiki's event controller object
41+
* @param EventHandler $controller DokuWiki's event controller object
4242
* @return void
4343
*/
4444
public function register(EventHandler $controller)
@@ -50,7 +50,7 @@ public function register(EventHandler $controller)
5050
/**
5151
* Add user's permissions to JSINFO
5252
*
53-
* @param Doku_Event $event
53+
* @param Event $event
5454
*/
5555
public function addJsinfo(Event $event)
5656
{
@@ -61,7 +61,7 @@ public function addJsinfo(Event $event)
6161

6262

6363
/**
64-
* @param Doku_Event $event
64+
* @param Event $event
6565
*/
6666
public function handleAjax(Event $event)
6767
{
@@ -132,7 +132,7 @@ protected function saveRow()
132132
$helper = plugin_load('helper', 'struct');
133133
$helper->saveLookupData($access, $data);
134134

135-
$config = json_decode($INPUT->str('searchconf'), true);
135+
$config = json_decode($INPUT->str('searchconf'), true, 512, JSON_THROW_ON_ERROR);
136136
// update row id
137137
$this->rid = $access->getRid();
138138
$config = $this->addTypeFilter($config);

‎action/ajax.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class action_plugin_struct_ajax extends ActionPlugin
1818
/**
1919
* Registers a callback function for a given event
2020
*
21-
* @param Doku_Event_Handler $controller DokuWiki's event controller object
21+
* @param EventHandler $controller DokuWiki's event controller object
2222
* @return void
2323
*/
2424
public function register(EventHandler $controller)
@@ -29,7 +29,7 @@ public function register(EventHandler $controller)
2929
/**
3030
* Pass Ajax call to a type
3131
*
32-
* @param Doku_Event $event event object by reference
32+
* @param Event $event event object by reference
3333
*/
3434
public function handleAjax(Event $event)
3535
{
@@ -51,7 +51,7 @@ public function handleAjax(Event $event)
5151
http_status(500);
5252
}
5353

54-
echo json_encode($result);
54+
echo json_encode($result, JSON_THROW_ON_ERROR);
5555
}
5656

5757
/**

‎action/bureaucracy.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class action_plugin_struct_bureaucracy extends ActionPlugin
3131
/**
3232
* Registers a callback function for a given event
3333
*
34-
* @param Doku_Event_Handler $controller DokuWiki's event controller object
34+
* @param EventHandler $controller DokuWiki's event controller object
3535
* @return void
3636
*/
3737
public function register(EventHandler $controller)
@@ -45,7 +45,7 @@ public function register(EventHandler $controller)
4545
/**
4646
* Load a whole schema as fields
4747
*
48-
* @param Doku_Event $event event object by reference
48+
* @param Event $event event object by reference
4949
* @param mixed $param [the parameters passed as fifth argument to register_hook() when this
5050
* handler was registered]
5151
* @return bool
@@ -82,7 +82,7 @@ public function handleSchema(Event $event, $param)
8282
/**
8383
* Replace lookup fields placeholder's values
8484
*
85-
* @param Doku_Event $event event object by reference
85+
* @param Event $event event object by reference
8686
* @param mixed $param [the parameters passed as fifth argument to register_hook() when this
8787
* handler was registered]
8888
* @return bool
@@ -115,8 +115,8 @@ public function handleLookupFields(Event $event, $param)
115115
// lookups can reference pages or global data, so check both pid and rid
116116
// make sure not to double decode pid!
117117
$originalPid = $pid;
118-
$pid = json_decode($pid)[0] ?? $pid;
119-
$rid = json_decode($originalPid)[1] ?? null;
118+
$pid = json_decode($pid, null, 512, JSON_THROW_ON_ERROR)[0] ?? $pid;
119+
$rid = json_decode($originalPid, null, 512, JSON_THROW_ON_ERROR)[1] ?? null;
120120
if (($pid && $pids[$i] === $pid) || ($rid && $rids[$i] === (string)$rid)) {
121121
$field->opt['struct_pids'][] = $pid;
122122
$new_value[] = $result[$i][0]->getDisplayValue();
@@ -137,7 +137,7 @@ public function handleLookupFields(Event $event, $param)
137137
/**
138138
* Save the struct data
139139
*
140-
* @param Doku_Event $event event object by reference
140+
* @param Event $event event object by reference
141141
* @param mixed $param [the parameters passed as fifth argument to register_hook() when this
142142
* handler was registered]
143143
* @return bool

‎action/cache.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class action_plugin_struct_cache extends ActionPlugin
1616
/**
1717
* Registers a callback function for a given event
1818
*
19-
* @param Doku_Event_Handler $controller DokuWiki's event controller object
19+
* @param EventHandler $controller DokuWiki's event controller object
2020
* @return void
2121
*/
2222
public function register(EventHandler $controller)
@@ -39,7 +39,7 @@ public static function getSchemaRefreshFile()
3939
* For pages potentially containing schema data, refresh the cache when schema data has been
4040
* updated
4141
*
42-
* @param Doku_Event $event event object by reference
42+
* @param Event $event event object by reference
4343
* @param mixed $param [the parameters passed as fifth argument to register_hook() when this
4444
* handler was registered]
4545
* @return bool
@@ -62,7 +62,7 @@ public function handleCacheSchemachange(Event $event, $param)
6262
* For pages containing an aggregation, add the last modified date of the database itself
6363
* to the cache dependencies
6464
*
65-
* @param Doku_Event $event event object by reference
65+
* @param Event $event event object by reference
6666
* @param mixed $param [the parameters passed as fifth argument to register_hook() when this
6767
* handler was registered]
6868
* @return bool
@@ -119,7 +119,7 @@ public function handleCacheAggregation(Event $event, $param)
119119
/**
120120
* Disable cache when dymanic parameters are present
121121
*
122-
* @param Doku_Event $event event object by reference
122+
* @param Event $event event object by reference
123123
* @param mixed $param [the parameters passed as fifth argument to register_hook() when this
124124
* handler was registered]
125125
* @return bool

‎action/config.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class action_plugin_struct_config extends ActionPlugin
1818
/**
1919
* Registers a callback function for a given event
2020
*
21-
* @param Doku_Event_Handler $controller DokuWiki's event controller object
21+
* @param EventHandler $controller DokuWiki's event controller object
2222
* @return void
2323
*/
2424
public function register(EventHandler $controller)
@@ -30,7 +30,7 @@ public function register(EventHandler $controller)
3030
/**
3131
* Reconfigure config for a given type
3232
*
33-
* @param Doku_Event $event event object by reference
33+
* @param Event $event event object by reference
3434
* @param mixed $param [the parameters passed as fifth argument to register_hook() when this
3535
* handler was registered]
3636
*/
@@ -41,20 +41,20 @@ public function handleAjax(Event $event, $param)
4141
$event->stopPropagation();
4242
global $INPUT;
4343

44-
$conf = json_decode($INPUT->str('conf'), true);
44+
$conf = json_decode($INPUT->str('conf'), true, 512, JSON_THROW_ON_ERROR);
4545
$typeclasses = Column::allTypes();
4646
$class = $typeclasses[$INPUT->str('type', 'Text')];
4747
/** @var AbstractBaseType $type */
4848
$type = new $class($conf);
4949

5050
header('Content-Type: text/plain'); // we need the encoded string, not decoded by jQuery
51-
echo json_encode($type->getConfig());
51+
echo json_encode($type->getConfig(), JSON_THROW_ON_ERROR);
5252
}
5353

5454
/**
5555
* Add config options to JSINFO
5656
*
57-
* @param Doku_Event $event
57+
* @param Event $event
5858
*/
5959
public function addJsinfo(Event $event)
6060
{

‎action/diff.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class action_plugin_struct_diff extends ActionPlugin
1919
/**
2020
* Registers a callback function for a given event
2121
*
22-
* @param Doku_Event_Handler $controller DokuWiki's event controller object
22+
* @param EventHandler $controller DokuWiki's event controller object
2323
* @return void
2424
*/
2525
public function register(EventHandler $controller)
@@ -32,7 +32,7 @@ public function register(EventHandler $controller)
3232
*
3333
* This is done by adding pseudo syntax to the page source when it is loaded in diff context
3434
*
35-
* @param Doku_Event $event event object by reference
35+
* @param Event $event event object by reference
3636
* @param mixed $param [the parameters passed as fifth argument to register_hook() when this
3737
* handler was registered]
3838
* @return bool

‎action/edit.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class action_plugin_struct_edit extends ActionPlugin
3030
/**
3131
* Registers a callback function for a given event
3232
*
33-
* @param Doku_Event_Handler $controller DokuWiki's event controller object
33+
* @param EventHandler $controller DokuWiki's event controller object
3434
* @return void
3535
*/
3636
public function register(EventHandler $controller)
@@ -64,7 +64,7 @@ public function addFromData(Event $event, $_param)
6464
*
6565
* TODO: Remove this after HTML_EDITFORM_OUTPUT is no longer released in DokuWiki stable
6666
*
67-
* @param Doku_Event $event event object by reference
67+
* @param Event $event event object by reference
6868
* @param mixed $param [the parameters passed as fifth argument to register_hook() when this
6969
* handler was registered]
7070
* @return bool

‎action/entry.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class action_plugin_struct_entry extends ActionPlugin
3838
/**
3939
* Registers a callback function for a given event
4040
*
41-
* @param Doku_Event_Handler $controller DokuWiki's event controller object
41+
* @param EventHandler $controller DokuWiki's event controller object
4242
* @return void
4343
*/
4444
public function register(EventHandler $controller)
@@ -54,7 +54,7 @@ public function register(EventHandler $controller)
5454
/**
5555
* Clean up and validate the input data
5656
*
57-
* @param Doku_Event $event event object by reference
57+
* @param Event $event event object by reference
5858
* @param mixed $param [the parameters passed as fifth argument to register_hook() when this
5959
* handler was registered]
6060
* @return bool
@@ -92,7 +92,7 @@ public function handleValidation(Event $event, $param)
9292
/**
9393
* Check if the page has to be changed
9494
*
95-
* @param Doku_Event $event event object by reference
95+
* @param Event $event event object by reference
9696
* @param mixed $param [the parameters passed as fifth argument to register_hook() when this
9797
* handler was registered]
9898
* @return bool
@@ -125,7 +125,7 @@ public function handlePagesaveBefore(Event $event, $param)
125125
*
126126
* When this is called, INPUT data has been validated already.
127127
*
128-
* @param Doku_Event $event event object by reference
128+
* @param Event $event event object by reference
129129
* @param mixed $param [the parameters passed as fifth argument to register_hook() when this
130130
* handler was registered]
131131
* @return bool

‎action/inline.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class action_plugin_struct_inline extends ActionPlugin
3939
/**
4040
* Registers a callback function for a given event
4141
*
42-
* @param Doku_Event_Handler $controller DokuWiki's event controller object
42+
* @param EventHandler $controller DokuWiki's event controller object
4343
* @return void
4444
*/
4545
public function register(EventHandler $controller)
@@ -48,7 +48,7 @@ public function register(EventHandler $controller)
4848
}
4949

5050
/**
51-
* @param Doku_Event $event
51+
* @param Event $event
5252
* @param $param
5353
*/
5454
public function handleAjax(Event $event, $param)
@@ -182,7 +182,7 @@ protected function inlineSave()
182182
$value = $this->schemadata->getDataColumn($this->column);
183183
$R = new Doku_Renderer_xhtml();
184184
$value->render($R, 'xhtml'); // FIXME use configured default renderer
185-
$data = json_encode(['value' => $R->doc, 'rev' => $this->schemadata->getTimestamp()]);
185+
$data = json_encode(['value' => $R->doc, 'rev' => $this->schemadata->getTimestamp()], JSON_THROW_ON_ERROR);
186186
echo $data;
187187
}
188188

‎action/migration.php

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function register(EventHandler $controller)
2929
/**
3030
* Call our custom migrations when defined
3131
*
32-
* @param Doku_Event $event
32+
* @param Event $event
3333
* @param $param
3434
*/
3535
public function handleMigrations(Event $event, $param)
@@ -251,9 +251,7 @@ protected function migration17($sqlite)
251251
$cols = $sqlite->queryAll($s);
252252

253253
if ($cols) {
254-
$colnames = array_map(function ($c) {
255-
return 'col' . $c['COL'];
256-
}, $cols);
254+
$colnames = array_map(static fn($c) => 'col' . $c['COL'], $cols);
257255

258256
// data_ tables
259257
$s = 'SELECT pid, rid, rev, ' . implode(', ', $colnames) . " FROM data_$name";
@@ -389,9 +387,7 @@ protected function getFixedValues($row)
389387
}
390388

391389
if (!empty($fixes)) {
392-
$fixes = array_map(function ($set, $key) {
393-
return "$key = '$set'";
394-
}, $fixes, array_keys($fixes));
390+
$fixes = array_map(static fn($set, $key) => "$key = '$set'", $fixes, array_keys($fixes));
395391
}
396392

397393
return [$pid, $rid, $rev, $colref, $rowno, $fixes];

0 commit comments

Comments
 (0)