@@ -1,4 +1,4 @@ discard block |
||
1 | -<?php declare( strict_types=1 ); |
|
1 | +<?php declare(strict_types=1); |
|
2 | 2 | |
3 | 3 | namespace BotRiconferme\Task; |
4 | 4 | |
@@ -22,15 +22,15 @@ discard block |
||
22 | 22 | /** |
23 | 23 | * @inheritDoc |
24 | 24 | */ |
25 | - protected function getSubtasksMap(): array { |
|
25 | + protected function getSubtasksMap (): array { |
|
26 | 26 | // Everything is done here. |
27 | - return []; |
|
27 | + return [ ]; |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | /** |
31 | 31 | * @inheritDoc |
32 | 32 | */ |
33 | - public function runInternal() : int { |
|
33 | + public function runInternal () : int { |
|
34 | 34 | $this->actualList = $this->getActualAdmins(); |
35 | 35 | $pageBotList = $this->getBotList(); |
36 | 36 | $this->botList = $pageBotList->getDecodedContent(); |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | * @return string[][] |
59 | 59 | * @phan-return array<string,string[]> |
60 | 60 | */ |
61 | - protected function getActualAdmins() : array { |
|
61 | + protected function getActualAdmins () : array { |
|
62 | 62 | $params = [ |
63 | 63 | 'action' => 'query', |
64 | 64 | 'list' => 'allusers', |
@@ -76,8 +76,8 @@ discard block |
||
76 | 76 | * @return string[][] |
77 | 77 | * @phan-return array<string,string[]> |
78 | 78 | */ |
79 | - protected function extractAdmins( Generator $data ) : array { |
|
80 | - $ret = []; |
|
79 | + protected function extractAdmins ( Generator $data ) : array { |
|
80 | + $ret = [ ]; |
|
81 | 81 | $blacklist = $this->getOpt( 'exclude-admins' ); |
82 | 82 | foreach ( $data as $u ) { |
83 | 83 | if ( in_array( $u->name, $blacklist, true ) ) { |
@@ -94,16 +94,16 @@ discard block |
||
94 | 94 | * |
95 | 95 | * @return string[][] |
96 | 96 | */ |
97 | - protected function getMissingGroups() : array { |
|
98 | - $missing = []; |
|
97 | + protected function getMissingGroups () : array { |
|
98 | + $missing = [ ]; |
|
99 | 99 | foreach ( $this->actualList as $adm => $groups ) { |
100 | - $curMissing = array_diff( $groups, array_keys( $this->botList[$adm] ?? [] ) ); |
|
100 | + $curMissing = array_diff( $groups, array_keys( $this->botList[ $adm ] ?? [ ] ) ); |
|
101 | 101 | |
102 | 102 | foreach ( $curMissing as $group ) { |
103 | 103 | try { |
104 | 104 | $missing[ $adm ][ $group ] = $this->getFlagDate( $adm, $group ); |
105 | 105 | } catch ( TaskException $e ) { |
106 | - $this->errors[] = $e->getMessage(); |
|
106 | + $this->errors[ ] = $e->getMessage(); |
|
107 | 107 | } |
108 | 108 | } |
109 | 109 | } |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | * @return string |
119 | 119 | * @throws TaskException |
120 | 120 | */ |
121 | - protected function getFlagDate( string $admin, string $group ) : string { |
|
121 | + protected function getFlagDate ( string $admin, string $group ) : string { |
|
122 | 122 | $this->getLogger()->info( "Retrieving $group flag date for $admin" ); |
123 | 123 | |
124 | 124 | $wiki = $this->getWiki(); |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | * @param string $group |
154 | 154 | * @return string|null |
155 | 155 | */ |
156 | - private function extractTimestamp( Generator $data, string $group ) : ?string { |
|
156 | + private function extractTimestamp ( Generator $data, string $group ) : ?string { |
|
157 | 157 | $ts = null; |
158 | 158 | foreach ( $data as $entry ) { |
159 | 159 | if ( |
@@ -172,8 +172,8 @@ discard block |
||
172 | 172 | * |
173 | 173 | * @return string[][] |
174 | 174 | */ |
175 | - protected function getExtraGroups() : array { |
|
176 | - $extra = []; |
|
175 | + protected function getExtraGroups () : array { |
|
176 | + $extra = [ ]; |
|
177 | 177 | foreach ( $this->botList as $name => $groups ) { |
178 | 178 | $groups = array_diff_key( $groups, array_fill_keys( PageBotList::NON_GROUP_KEYS, 1 ) ); |
179 | 179 | if ( !isset( $this->actualList[ $name ] ) ) { |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | * @param string[] $names |
190 | 190 | * @return Generator |
191 | 191 | */ |
192 | - private function getRenameEntries( array $names ) : Generator { |
|
192 | + private function getRenameEntries ( array $names ) : Generator { |
|
193 | 193 | $titles = array_map( static function ( string $x ) : string { |
194 | 194 | return "Utente:$x"; |
195 | 195 | }, $names ); |
@@ -213,14 +213,14 @@ discard block |
||
213 | 213 | * @param string[] $names |
214 | 214 | * @return string[] [ old_name => new_name ] |
215 | 215 | */ |
216 | - protected function getRenamedUsers( array $names ) : array { |
|
216 | + protected function getRenamedUsers ( array $names ) : array { |
|
217 | 217 | if ( !$names ) { |
218 | - return []; |
|
218 | + return [ ]; |
|
219 | 219 | } |
220 | 220 | $this->getLogger()->info( 'Checking rename for ' . implode( ', ', $names ) ); |
221 | 221 | |
222 | 222 | $data = $this->getRenameEntries( $names ); |
223 | - $ret = []; |
|
223 | + $ret = [ ]; |
|
224 | 224 | foreach ( $data as $entry ) { |
225 | 225 | // 1 month is arbitrary |
226 | 226 | if ( strtotime( $entry->timestamp ) > strtotime( '-1 month' ) ) { |
@@ -239,18 +239,18 @@ discard block |
||
239 | 239 | * @phan-param array<string,array<string,string|string[]>> $newContent |
240 | 240 | * @param string[][] $removed |
241 | 241 | */ |
242 | - private function handleRenames( array &$newContent, array $removed ) : void { |
|
242 | + private function handleRenames ( array &$newContent, array $removed ) : void { |
|
243 | 243 | $renameMap = $this->getRenamedUsers( array_keys( $removed ) ); |
244 | 244 | foreach ( $removed as $oldName => $info ) { |
245 | 245 | if ( |
246 | 246 | array_key_exists( $oldName, $renameMap ) && |
247 | - array_key_exists( $renameMap[$oldName], $newContent ) |
|
247 | + array_key_exists( $renameMap[ $oldName ], $newContent ) |
|
248 | 248 | ) { |
249 | 249 | // This user was renamed! Add this name as alias, if they're still listed |
250 | 250 | $newName = $renameMap[ $oldName ]; |
251 | 251 | $this->getLogger()->info( "Found rename $oldName -> $newName" ); |
252 | - $aliases = array_unique( array_merge( $newContent[ $newName ]['aliases'], [ $oldName ] ) ); |
|
253 | - $newContent[ $newName ]['aliases'] = $aliases; |
|
252 | + $aliases = array_unique( array_merge( $newContent[ $newName ][ 'aliases' ], [ $oldName ] ) ); |
|
253 | + $newContent[ $newName ][ 'aliases' ] = $aliases; |
|
254 | 254 | // Transfer overrides to the new name. |
255 | 255 | $overrides = array_diff_key( $info, [ 'override' => 1, 'override-perm' => 1 ] ); |
256 | 256 | $newContent[ $newName ] = array_merge( $newContent[ $newName ], $overrides ); |
@@ -265,12 +265,12 @@ discard block |
||
265 | 265 | * @param string[][] $extra |
266 | 266 | * @return string[][] Removed users |
267 | 267 | */ |
268 | - private function handleExtraAndMissing( |
|
268 | + private function handleExtraAndMissing ( |
|
269 | 269 | array &$newContent, |
270 | 270 | array $missing, |
271 | 271 | array $extra |
272 | 272 | ) : array { |
273 | - $removed = []; |
|
273 | + $removed = [ ]; |
|
274 | 274 | foreach ( $newContent as $user => $groups ) { |
275 | 275 | if ( isset( $missing[ $user ] ) ) { |
276 | 276 | $newContent[ $user ] = array_merge( $groups, $missing[ $user ] ); |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | if ( array_diff_key( $newGroups, array_fill_keys( PageBotList::NON_GROUP_KEYS, 1 ) ) ) { |
281 | 281 | $newContent[ $user ] = $newGroups; |
282 | 282 | } else { |
283 | - $removed[$user] = $newContent[$user]; |
|
283 | + $removed[ $user ] = $newContent[ $user ]; |
|
284 | 284 | unset( $newContent[ $user ] ); |
285 | 285 | } |
286 | 286 | } |
@@ -297,7 +297,7 @@ discard block |
||
297 | 297 | * @param string[][] $extra |
298 | 298 | * @return array[] |
299 | 299 | */ |
300 | - protected function getNewContent( array $missing, array $extra ) : array { |
|
300 | + protected function getNewContent ( array $missing, array $extra ) : array { |
|
301 | 301 | $newContent = $this->botList; |
302 | 302 | |
303 | 303 | $removed = $this->handleExtraAndMissing( $newContent, $missing, $extra ); |
@@ -316,12 +316,12 @@ discard block |
||
316 | 316 | * |
317 | 317 | * @param array[] &$newContent |
318 | 318 | */ |
319 | - protected function removeOverrides( array &$newContent ) : void { |
|
320 | - $removed = []; |
|
319 | + protected function removeOverrides ( array &$newContent ) : void { |
|
320 | + $removed = [ ]; |
|
321 | 321 | foreach ( $newContent as $user => $groups ) { |
322 | 322 | if ( PageBotList::isOverrideExpired( $groups ) ) { |
323 | 323 | unset( $newContent[ $user ][ 'override' ] ); |
324 | - $removed[] = $user; |
|
324 | + $removed[ ] = $user; |
|
325 | 325 | } |
326 | 326 | } |
327 | 327 |
@@ -1,4 +1,4 @@ discard block |
||
1 | -<?php declare( strict_types=1 ); |
|
1 | +<?php declare(strict_types=1); |
|
2 | 2 | |
3 | 3 | namespace BotRiconferme\Message; |
4 | 4 | |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | /** |
24 | 24 | * @param string $value |
25 | 25 | */ |
26 | - public function __construct( string $value ) { |
|
26 | + public function __construct ( string $value ) { |
|
27 | 27 | $this->value = $value; |
28 | 28 | } |
29 | 29 | |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | * @phan-param array<string,int|string> $args |
33 | 33 | * @return self |
34 | 34 | */ |
35 | - public function params( array $args ) : self { |
|
35 | + public function params ( array $args ) : self { |
|
36 | 36 | $this->value = strtr( $this->value, $args ); |
37 | 37 | return $this; |
38 | 38 | } |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | /** |
41 | 41 | * @return string |
42 | 42 | */ |
43 | - public function text() : string { |
|
43 | + public function text () : string { |
|
44 | 44 | $this->parsePlurals(); |
45 | 45 | return $this->value; |
46 | 46 | } |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | /** |
49 | 49 | * Replace {{$plur|<amount>|sing|plur}} |
50 | 50 | */ |
51 | - protected function parsePlurals() : void { |
|
51 | + protected function parsePlurals () : void { |
|
52 | 52 | $reg = '!\{\{\$plur\|(?P<amount>\d+)\|(?P<sing>[^}|]+)\|(?P<plur>[^|}]+)}}!'; |
53 | 53 | |
54 | 54 | if ( preg_match( $reg, $this->value ) === 0 ) { |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | * @return string |
62 | 62 | */ |
63 | 63 | static function ( array $matches ) : string { |
64 | - return (int)$matches['amount'] > 1 ? trim( $matches['plur'] ) : trim( $matches['sing'] ); |
|
64 | + return (int)$matches[ 'amount' ] > 1 ? trim( $matches[ 'plur' ] ) : trim( $matches[ 'sing' ] ); |
|
65 | 65 | }, |
66 | 66 | $this->value |
67 | 67 | ); |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | * @param string $timeString Full format, e.g. "15 aprile 2019 18:27" |
74 | 74 | * @return int |
75 | 75 | */ |
76 | - public static function getTimestampFromLocalTime( string $timeString ) : int { |
|
76 | + public static function getTimestampFromLocalTime ( string $timeString ) : int { |
|
77 | 77 | $englishTime = str_ireplace( |
78 | 78 | array_values( self::MONTHS ), |
79 | 79 | array_keys( self::MONTHS ), |
@@ -92,12 +92,12 @@ discard block |
||
92 | 92 | * @param string $emptyText |
93 | 93 | * @return string |
94 | 94 | */ |
95 | - public static function commaList( array $data, string $emptyText = 'nessuno' ) : string { |
|
95 | + public static function commaList ( array $data, string $emptyText = 'nessuno' ) : string { |
|
96 | 96 | if ( count( $data ) > 1 ) { |
97 | 97 | $last = array_pop( $data ); |
98 | 98 | $ret = implode( ', ', $data ) . " e $last"; |
99 | 99 | } elseif ( $data ) { |
100 | - $ret = (string)$data[0]; |
|
100 | + $ret = (string)$data[ 0 ]; |
|
101 | 101 | } else { |
102 | 102 | $ret = $emptyText; |
103 | 103 | } |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | return $ret; |
106 | 106 | } |
107 | 107 | |
108 | - public function __toString() { |
|
108 | + public function __toString () { |
|
109 | 109 | return $this->text(); |
110 | 110 | } |
111 | 111 | } |
@@ -1,4 +1,4 @@ discard block |
||
1 | -<?php declare( strict_types=1 ); |
|
1 | +<?php declare(strict_types=1); |
|
2 | 2 | |
3 | 3 | namespace BotRiconferme\Logger; |
4 | 4 | |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | * @param string $summary |
30 | 30 | * @param string $minlevel |
31 | 31 | */ |
32 | - public function __construct( Page $logPage, string $summary, $minlevel = LogLevel::INFO ) { |
|
32 | + public function __construct ( Page $logPage, string $summary, $minlevel = LogLevel::INFO ) { |
|
33 | 33 | $this->minLevel = $this->levelToInt( $minlevel ); |
34 | 34 | $this->logPage = $logPage; |
35 | 35 | $this->summary = $summary; |
@@ -40,16 +40,16 @@ discard block |
||
40 | 40 | * @param mixed[] $context |
41 | 41 | * @suppress PhanUnusedPublicMethodParameter |
42 | 42 | */ |
43 | - public function log( $level, $message, array $context = [] ) :void { |
|
43 | + public function log ( $level, $message, array $context = [ ] ) :void { |
|
44 | 44 | if ( $this->levelToInt( $level ) >= $this->minLevel ) { |
45 | - $this->buffer[] = $this->getFormattedMessage( $level, $message ); |
|
45 | + $this->buffer[ ] = $this->getFormattedMessage( $level, $message ); |
|
46 | 46 | } |
47 | 47 | } |
48 | 48 | |
49 | 49 | /** |
50 | 50 | * @return string |
51 | 51 | */ |
52 | - protected function getOutput() : string { |
|
52 | + protected function getOutput () : string { |
|
53 | 53 | $line = str_repeat( '-', 80 ); |
54 | 54 | return "\n\n" . implode( "\n", $this->buffer ) . "\n$line\n\n"; |
55 | 55 | } |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | /** |
58 | 58 | * @inheritDoc |
59 | 59 | */ |
60 | - public function flush() : void { |
|
60 | + public function flush () : void { |
|
61 | 61 | if ( $this->buffer ) { |
62 | 62 | $this->logPage->edit( [ |
63 | 63 | 'appendtext' => $this->getOutput(), |
@@ -1,4 +1,4 @@ discard block |
||
1 | -<?php declare( strict_types=1 ); |
|
1 | +<?php declare(strict_types=1); |
|
2 | 2 | |
3 | 3 | namespace BotRiconferme\Logger; |
4 | 4 | |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | /** |
15 | 15 | * @param IFlushingAwareLogger ...$loggers |
16 | 16 | */ |
17 | - public function __construct( IFlushingAwareLogger ...$loggers ) { |
|
17 | + public function __construct ( IFlushingAwareLogger ...$loggers ) { |
|
18 | 18 | $this->loggers = $loggers; |
19 | 19 | } |
20 | 20 | |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | * @param mixed[] $context |
24 | 24 | * @suppress PhanUnusedPublicMethodParameter |
25 | 25 | */ |
26 | - public function log( $level, $message, array $context = [] ) :void { |
|
26 | + public function log ( $level, $message, array $context = [ ] ) :void { |
|
27 | 27 | foreach ( $this->loggers as $logger ) { |
28 | 28 | $logger->log( $level, $message ); |
29 | 29 | } |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | /** |
33 | 33 | * @inheritDoc |
34 | 34 | */ |
35 | - public function flush() : void { |
|
35 | + public function flush () : void { |
|
36 | 36 | foreach ( $this->loggers as $logger ) { |
37 | 37 | $logger->flush(); |
38 | 38 | } |
@@ -1,4 +1,4 @@ discard block |
||
1 | -<?php declare( strict_types=1 ); |
|
1 | +<?php declare(strict_types=1); |
|
2 | 2 | |
3 | 3 | namespace BotRiconferme\Logger; |
4 | 4 | |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | /** |
18 | 18 | * @param string $minlevel |
19 | 19 | */ |
20 | - public function __construct( $minlevel = LogLevel::INFO ) { |
|
20 | + public function __construct ( $minlevel = LogLevel::INFO ) { |
|
21 | 21 | $this->minLevel = $this->levelToInt( $minlevel ); |
22 | 22 | } |
23 | 23 | |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | * @param mixed[] $context |
27 | 27 | * @suppress PhanUnusedPublicMethodParameter |
28 | 28 | */ |
29 | - public function log( $level, $message, array $context = [] ) : void { |
|
29 | + public function log ( $level, $message, array $context = [ ] ) : void { |
|
30 | 30 | if ( $this->levelToInt( $level ) >= $this->minLevel ) { |
31 | 31 | echo $this->getFormattedMessage( $level, $message ) . "\n"; |
32 | 32 | } |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | /** |
36 | 36 | * @inheritDoc |
37 | 37 | */ |
38 | - public function flush() : void { |
|
38 | + public function flush () : void { |
|
39 | 39 | // Everything else is printed immediately |
40 | 40 | echo "\n" . str_repeat( '-', 80 ) . "\n\n"; |
41 | 41 | } |
@@ -1,4 +1,4 @@ discard block |
||
1 | -<?php declare( strict_types=1 ); |
|
1 | +<?php declare(strict_types=1); |
|
2 | 2 | |
3 | 3 | namespace BotRiconferme\Wiki; |
4 | 4 | |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | * @param UserInfo $ui |
24 | 24 | * @param Wiki $wiki |
25 | 25 | */ |
26 | - public function __construct( UserInfo $ui, Wiki $wiki ) { |
|
26 | + public function __construct ( UserInfo $ui, Wiki $wiki ) { |
|
27 | 27 | $this->wiki = $wiki; |
28 | 28 | $this->name = $ui->getName(); |
29 | 29 | $this->ui = $ui; |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | /** |
33 | 33 | * @return string |
34 | 34 | */ |
35 | - public function getName() : string { |
|
35 | + public function getName () : string { |
|
36 | 36 | return $this->name; |
37 | 37 | } |
38 | 38 | |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | * |
42 | 42 | * @return string[] |
43 | 43 | */ |
44 | - public function getGroups() : array { |
|
44 | + public function getGroups () : array { |
|
45 | 45 | return $this->ui->extractGroups(); |
46 | 46 | } |
47 | 47 | |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | * |
51 | 51 | * @return string[] [ group => date ] |
52 | 52 | */ |
53 | - public function getGroupsWithDates() : array { |
|
53 | + public function getGroupsWithDates () : array { |
|
54 | 54 | return $this->ui->extractGroupsWithDates(); |
55 | 55 | } |
56 | 56 | |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | * @param string $groupName |
61 | 61 | * @return bool |
62 | 62 | */ |
63 | - public function inGroup( string $groupName ) : bool { |
|
63 | + public function inGroup ( string $groupName ) : bool { |
|
64 | 64 | return in_array( $groupName, $this->getGroups(), true ); |
65 | 65 | } |
66 | 66 | |
@@ -69,9 +69,9 @@ discard block |
||
69 | 69 | * |
70 | 70 | * @inheritDoc |
71 | 71 | */ |
72 | - public function getRegex( string $delimiter = '/' ) : string { |
|
72 | + public function getRegex ( string $delimiter = '/' ) : string { |
|
73 | 73 | $bits = $this->getAliases(); |
74 | - $bits[] = $this->name; |
|
74 | + $bits[ ] = $this->name; |
|
75 | 75 | $regexify = static function ( string $el ) use ( $delimiter ) : string { |
76 | 76 | return str_replace( ' ', '[ _]', preg_quote( $el, $delimiter ) ); |
77 | 77 | }; |
@@ -83,14 +83,14 @@ discard block |
||
83 | 83 | * |
84 | 84 | * @return string[] |
85 | 85 | */ |
86 | - public function getAliases() : array { |
|
86 | + public function getAliases () : array { |
|
87 | 87 | return $this->ui->getAliases(); |
88 | 88 | } |
89 | 89 | |
90 | 90 | /** |
91 | 91 | * @return Page |
92 | 92 | */ |
93 | - public function getTalkPage() : Page { |
|
93 | + public function getTalkPage () : Page { |
|
94 | 94 | return new Page( "User talk:{$this->name}", $this->wiki ); |
95 | 95 | } |
96 | 96 | |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | * Get the default base page, e.g. WP:A/Riconferma annuale/XXX |
99 | 99 | * @return Page |
100 | 100 | */ |
101 | - public function getBasePage() : Page { |
|
101 | + public function getBasePage () : Page { |
|
102 | 102 | $prefix = Config::getInstance()->get( 'main-page-title' ); |
103 | 103 | return new Page( "$prefix/$this", $this->wiki ); |
104 | 104 | } |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | * @throws MissingPageException |
111 | 111 | * @return Page |
112 | 112 | */ |
113 | - public function getExistingBasePage() : Page { |
|
113 | + public function getExistingBasePage () : Page { |
|
114 | 114 | $basePage = $this->getBasePage(); |
115 | 115 | if ( !$basePage->exists() ) { |
116 | 116 | $basePage = null; |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | /** |
135 | 135 | * @return string |
136 | 136 | */ |
137 | - public function __toString() : string { |
|
137 | + public function __toString () : string { |
|
138 | 138 | return $this->name; |
139 | 139 | } |
140 | 140 | } |
@@ -1,4 +1,4 @@ discard block |
||
1 | -<?php declare( strict_types=1 ); |
|
1 | +<?php declare(strict_types=1); |
|
2 | 2 | |
3 | 3 | namespace BotRiconferme; |
4 | 4 | |
@@ -66,14 +66,14 @@ discard block |
||
66 | 66 | /** |
67 | 67 | * @return bool |
68 | 68 | */ |
69 | - public static function isCLI() : bool { |
|
69 | + public static function isCLI () : bool { |
|
70 | 70 | return PHP_SAPI === 'cli'; |
71 | 71 | } |
72 | 72 | |
73 | 73 | /** |
74 | 74 | * Populate options and check for required ones |
75 | 75 | */ |
76 | - public function __construct() { |
|
76 | + public function __construct () { |
|
77 | 77 | $opts = getopt( self::SHORT_OPTS, self::LONG_OPTS ); |
78 | 78 | $this->checkRequiredOpts( $opts ); |
79 | 79 | $this->checkConflictingOpts( $opts ); |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | /** |
85 | 85 | * @param string[] $opts |
86 | 86 | */ |
87 | - private function checkRequiredOpts( array $opts ) : void { |
|
87 | + private function checkRequiredOpts ( array $opts ) : void { |
|
88 | 88 | $missingOpts = array_diff( self::REQUIRED_OPTS, array_keys( $opts ) ); |
89 | 89 | if ( $missingOpts ) { |
90 | 90 | $this->fatal( 'Required options missing: ' . implode( ', ', $missingOpts ) ); |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | /** |
107 | 107 | * @param string[] $opts |
108 | 108 | */ |
109 | - private function checkConflictingOpts( array $opts ) : void { |
|
109 | + private function checkConflictingOpts ( array $opts ) : void { |
|
110 | 110 | $this->checkNotBothSet( $opts, 'password', 'use-password-file' ); |
111 | 111 | if ( array_key_exists( 'use-password-file', $opts ) && !file_exists( self::PASSWORD_FILE ) ) { |
112 | 112 | $this->fatal( 'Please create the password file (' . self::PASSWORD_FILE . ')' ); |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | * @param string $first |
128 | 128 | * @param string $second |
129 | 129 | */ |
130 | - private function checkNotBothSet( array $opts, string $first, string $second ) : void { |
|
130 | + private function checkNotBothSet ( array $opts, string $first, string $second ) : void { |
|
131 | 131 | if ( array_key_exists( $first, $opts ) && array_key_exists( $second, $opts ) ) { |
132 | 132 | $this->fatal( "Can only use one of '$first' and '$second'" ); |
133 | 133 | } |
@@ -136,23 +136,23 @@ discard block |
||
136 | 136 | /** |
137 | 137 | * @param string[] &$opts |
138 | 138 | */ |
139 | - private function canonicalize( array &$opts ) : void { |
|
139 | + private function canonicalize ( array &$opts ) : void { |
|
140 | 140 | if ( array_key_exists( 'use-password-file', $opts ) ) { |
141 | 141 | $pw = trim( file_get_contents( self::PASSWORD_FILE ) ); |
142 | - $opts['password'] = $pw; |
|
143 | - unset( $opts['use-password-file'] ); |
|
142 | + $opts[ 'password' ] = $pw; |
|
143 | + unset( $opts[ 'use-password-file' ] ); |
|
144 | 144 | } |
145 | 145 | if ( array_key_exists( 'use-private-password-file', $opts ) ) { |
146 | 146 | $pw = trim( file_get_contents( self::PRIVATE_PASSWORD_FILE ) ); |
147 | - $opts['private-password'] = $pw; |
|
148 | - unset( $opts['use-private-password-file'] ); |
|
147 | + $opts[ 'private-password' ] = $pw; |
|
148 | + unset( $opts[ 'use-private-password-file' ] ); |
|
149 | 149 | } |
150 | 150 | } |
151 | 151 | |
152 | 152 | /** |
153 | 153 | * @param string $msg |
154 | 154 | */ |
155 | - private function fatal( string $msg ) : void { |
|
155 | + private function fatal ( string $msg ) : void { |
|
156 | 156 | exit( $msg . "\n" ); |
157 | 157 | } |
158 | 158 | |
@@ -161,14 +161,14 @@ discard block |
||
161 | 161 | * @param mixed|null $default |
162 | 162 | * @return mixed |
163 | 163 | */ |
164 | - public function getOpt( string $opt, $default = null ) { |
|
165 | - return $this->opts[$opt] ?? $default; |
|
164 | + public function getOpt ( string $opt, $default = null ) { |
|
165 | + return $this->opts[ $opt ] ?? $default; |
|
166 | 166 | } |
167 | 167 | |
168 | 168 | /** |
169 | 169 | * @return string[] Either [ 'tasks' => name1,... ] or [ 'subtasks' => name1,... ] |
170 | 170 | */ |
171 | - public function getTaskOpt() : array { |
|
171 | + public function getTaskOpt () : array { |
|
172 | 172 | return array_intersect_key( |
173 | 173 | $this->opts, |
174 | 174 | [ 'tasks' => true, 'subtasks' => true ] |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | /** |
179 | 179 | * @return string|null |
180 | 180 | */ |
181 | - public function getURL() : ?string { |
|
181 | + public function getURL () : ?string { |
|
182 | 182 | return $this->getOpt( 'force-url' ); |
183 | 183 | } |
184 | 184 | } |
@@ -1,4 +1,4 @@ discard block |
||
1 | -<?php declare( strict_types=1 ); |
|
1 | +<?php declare(strict_types=1); |
|
2 | 2 | |
3 | 3 | namespace BotRiconferme; |
4 | 4 | |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | /** |
34 | 34 | * @param CLI $cli |
35 | 35 | */ |
36 | - public function __construct( CLI $cli ) { |
|
36 | + public function __construct ( CLI $cli ) { |
|
37 | 37 | $this->cli = $cli; |
38 | 38 | $this->initialize(); |
39 | 39 | } |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | /** |
42 | 42 | * Initialize all members. |
43 | 43 | */ |
44 | - private function initialize() : void { |
|
44 | + private function initialize () : void { |
|
45 | 45 | $simpleLogger = new SimpleLogger(); |
46 | 46 | $this->createWikiGroup( $simpleLogger ); |
47 | 47 | $this->messageProvider = new MessageProvider( |
@@ -55,14 +55,14 @@ discard block |
||
55 | 55 | /** |
56 | 56 | * Main entry point |
57 | 57 | */ |
58 | - public function run() : void { |
|
58 | + public function run () : void { |
|
59 | 59 | $taskOpt = $this->cli->getTaskOpt(); |
60 | 60 | $type = current( array_keys( $taskOpt ) ); |
61 | 61 | try { |
62 | 62 | if ( $type === 'tasks' ) { |
63 | - $this->runInternal( TaskManager::MODE_TASK, explode( ',', $taskOpt['tasks'] ) ); |
|
63 | + $this->runInternal( TaskManager::MODE_TASK, explode( ',', $taskOpt[ 'tasks' ] ) ); |
|
64 | 64 | } elseif ( $type === 'subtasks' ) { |
65 | - $this->runInternal( TaskManager::MODE_SUBTASK, explode( ',', $taskOpt['subtasks'] ) ); |
|
65 | + $this->runInternal( TaskManager::MODE_SUBTASK, explode( ',', $taskOpt[ 'subtasks' ] ) ); |
|
66 | 66 | } else { |
67 | 67 | $this->runInternal(); |
68 | 68 | } |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | /** |
77 | 77 | * @param LoggerInterface $baseLogger |
78 | 78 | */ |
79 | - private function createWikiGroup( LoggerInterface $baseLogger ) : void { |
|
79 | + private function createWikiGroup ( LoggerInterface $baseLogger ) : void { |
|
80 | 80 | // FIXME Hardcoded |
81 | 81 | $url = $this->cli->getURL() ?? 'https://it.wikipedia.org/w/api.php'; |
82 | 82 | $localUserIdentifier = '@itwiki'; |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | * |
115 | 115 | * @param IFlushingAwareLogger $baseLogger |
116 | 116 | */ |
117 | - private function createMainLogger( IFlushingAwareLogger $baseLogger ) : void { |
|
117 | + private function createMainLogger ( IFlushingAwareLogger $baseLogger ) : void { |
|
118 | 118 | $mainWiki = $this->wikiGroup->getMainWiki(); |
119 | 119 | $mp = $this->messageProvider; |
120 | 120 | $errTitle = $this->cli->getOpt( 'error-title' ); |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | /** |
142 | 142 | * Create the Config |
143 | 143 | */ |
144 | - private function initConfig() : void { |
|
144 | + private function initConfig () : void { |
|
145 | 145 | $wiki = $this->wikiGroup->getMainWiki(); |
146 | 146 | try { |
147 | 147 | $confValues = json_decode( $wiki->getPageContent( $this->cli->getOpt( 'config-title' ) ), true ); |
@@ -158,9 +158,9 @@ discard block |
||
158 | 158 | * @param string $mode |
159 | 159 | * @param string[] $taskNames |
160 | 160 | */ |
161 | - private function runInternal( |
|
161 | + private function runInternal ( |
|
162 | 162 | string $mode = TaskManager::MODE_COMPLETE, |
163 | - array $taskNames = [] |
|
163 | + array $taskNames = [ ] |
|
164 | 164 | ) : void { |
165 | 165 | $activity = $mode === TaskManager::MODE_COMPLETE |
166 | 166 | ? 'full process' |
@@ -180,8 +180,7 @@ discard block |
||
180 | 180 | $base = "Execution of $activity"; |
181 | 181 | if ( $res->isOK() ) { |
182 | 182 | $msg = $res->getStatus() === TaskResult::STATUS_NOTHING ? |
183 | - ': nothing to do' : |
|
184 | - ' completed successfully'; |
|
183 | + ': nothing to do' : ' completed successfully'; |
|
185 | 184 | $this->mainLogger->info( $base . $msg ); |
186 | 185 | } else { |
187 | 186 | $this->mainLogger->error( "$base failed.\n$res" ); |
@@ -1,4 +1,4 @@ |
||
1 | -<?php declare( strict_types=1 ); |
|
1 | +<?php declare(strict_types=1); |
|
2 | 2 | |
3 | 3 | namespace BotRiconferme\Exception; |
4 | 4 |