@@ -1,4 +1,4 @@ |
||
1 | -<?php declare( strict_types=1 ); |
|
1 | +<?php declare(strict_types=1); |
|
2 | 2 | |
3 | 3 | use BotRiconferme\Bot; |
4 | 4 | use BotRiconferme\CLI; |
@@ -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 | |
@@ -11,12 +11,12 @@ discard block |
||
11 | 11 | /** @var self */ |
12 | 12 | private static $instance; |
13 | 13 | /** @var string[] */ |
14 | - private $opts = []; |
|
14 | + private $opts = [ ]; |
|
15 | 15 | |
16 | 16 | /** |
17 | 17 | * Use self::init() and self::getInstance() |
18 | 18 | */ |
19 | - private function __construct() { |
|
19 | + private function __construct () { |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | /** |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | * @param string[] $confValues |
26 | 26 | * @throws ConfigException |
27 | 27 | */ |
28 | - public static function init( array $confValues ) : void { |
|
28 | + public static function init ( array $confValues ) : void { |
|
29 | 29 | if ( self::$instance ) { |
30 | 30 | throw new ConfigException( 'Config was already initialized' ); |
31 | 31 | } |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | * @param string $key |
45 | 45 | * @param mixed $value |
46 | 46 | */ |
47 | - protected function set( string $key, $value ) : void { |
|
47 | + protected function set ( string $key, $value ) : void { |
|
48 | 48 | $this->opts[ $key ] = $value; |
49 | 49 | } |
50 | 50 | |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | * @return self |
55 | 55 | * @throws ConfigException |
56 | 56 | */ |
57 | - public static function getInstance() : self { |
|
57 | + public static function getInstance () : self { |
|
58 | 58 | if ( !self::$instance ) { |
59 | 59 | throw new ConfigException( 'Config not yet initialized' ); |
60 | 60 | } |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | * @return mixed |
69 | 69 | * @throws ConfigException |
70 | 70 | */ |
71 | - public function get( string $opt ) { |
|
71 | + public function get ( string $opt ) { |
|
72 | 72 | if ( !isset( $this->opts[ $opt ] ) ) { |
73 | 73 | throw new ConfigException( "Config option '$opt' not set." ); |
74 | 74 | } |
@@ -1,4 +1,4 @@ discard block |
||
1 | -<?php declare( strict_types=1 ); |
|
1 | +<?php declare(strict_types=1); |
|
2 | 2 | |
3 | 3 | namespace BotRiconferme\Request; |
4 | 4 | |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | * @param LoggerInterface $logger |
15 | 15 | * @param string $domain |
16 | 16 | */ |
17 | - public function __construct( LoggerInterface $logger, string $domain ) { |
|
17 | + public function __construct ( LoggerInterface $logger, string $domain ) { |
|
18 | 18 | $this->logger = $logger; |
19 | 19 | $this->domain = $domain; |
20 | 20 | } |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | * @phan-param array<int|string|bool> $params |
25 | 25 | * @return RequestBase |
26 | 26 | */ |
27 | - public function newFromParams( array $params ) : RequestBase { |
|
27 | + public function newFromParams ( array $params ) : RequestBase { |
|
28 | 28 | if ( extension_loaded( 'curl' ) ) { |
29 | 29 | return new CurlRequest( $this->logger, $params, $this->domain ); |
30 | 30 | } |
@@ -1,4 +1,4 @@ discard block |
||
1 | -<?php declare( strict_types=1 ); |
|
1 | +<?php declare(strict_types=1); |
|
2 | 2 | |
3 | 3 | namespace BotRiconferme\Request; |
4 | 4 | |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | /** @var string */ |
42 | 42 | protected $method = self::METHOD_GET; |
43 | 43 | /** @var string[] */ |
44 | - protected $newCookies = []; |
|
44 | + protected $newCookies = [ ]; |
|
45 | 45 | |
46 | 46 | /** @var LoggerInterface */ |
47 | 47 | protected $logger; |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | * @phan-param array<int|string|bool> $params |
55 | 55 | * @param string $domain |
56 | 56 | */ |
57 | - public function __construct( LoggerInterface $logger, array $params, string $domain ) { |
|
57 | + public function __construct ( LoggerInterface $logger, array $params, string $domain ) { |
|
58 | 58 | $this->logger = $logger; |
59 | 59 | $this->params = [ 'format' => 'json' ] + $params; |
60 | 60 | $this->url = $domain; |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | * |
66 | 66 | * @return self For chaining |
67 | 67 | */ |
68 | - public function setPost() : self { |
|
68 | + public function setPost () : self { |
|
69 | 69 | $this->method = self::METHOD_POST; |
70 | 70 | return $this; |
71 | 71 | } |
@@ -74,12 +74,12 @@ discard block |
||
74 | 74 | * Execute a query request |
75 | 75 | * @return Generator |
76 | 76 | */ |
77 | - public function executeAsQuery() : Generator { |
|
78 | - if ( ( $this->params['action'] ?? false ) !== 'query' ) { |
|
77 | + public function executeAsQuery () : Generator { |
|
78 | + if ( ( $this->params[ 'action' ] ?? false ) !== 'query' ) { |
|
79 | 79 | throw new BadMethodCallException( 'Not an ApiQuery!' ); |
80 | 80 | } |
81 | 81 | // TODO Is this always correct? |
82 | - $key = $this->params['list'] ?? 'pages'; |
|
82 | + $key = $this->params[ 'list' ] ?? 'pages'; |
|
83 | 83 | $curParams = $this->params; |
84 | 84 | $lim = $this->parseLimit(); |
85 | 85 | do { |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | * Execute a request that doesn't need any continuation. |
109 | 109 | * @return stdClass |
110 | 110 | */ |
111 | - public function executeSingle() : stdClass { |
|
111 | + public function executeSingle () : stdClass { |
|
112 | 112 | $curParams = $this->params; |
113 | 113 | $res = $this->makeRequestInternal( $curParams ); |
114 | 114 | $this->handleErrorAndWarnings( $res ); |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | /** |
119 | 119 | * @return int |
120 | 120 | */ |
121 | - private function parseLimit() : int { |
|
121 | + private function parseLimit () : int { |
|
122 | 122 | foreach ( $this->params as $name => $val ) { |
123 | 123 | if ( substr( $name, -strlen( 'limit' ) ) === 'limit' ) { |
124 | 124 | return $val === 'max' ? -1 : (int)$val; |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | * @param string $resKey |
136 | 136 | * @return int|null |
137 | 137 | */ |
138 | - private function countQueryResults( stdClass $res, string $resKey ) : ?int { |
|
138 | + private function countQueryResults ( stdClass $res, string $resKey ) : ?int { |
|
139 | 139 | if ( !isset( $res->query->$resKey ) ) { |
140 | 140 | return null; |
141 | 141 | } |
@@ -163,9 +163,9 @@ discard block |
||
163 | 163 | * @phan-param array<int|string|bool> $params |
164 | 164 | * @return stdClass |
165 | 165 | */ |
166 | - private function makeRequestInternal( array $params ) : stdClass { |
|
166 | + private function makeRequestInternal ( array $params ) : stdClass { |
|
167 | 167 | if ( $this->method === self::METHOD_POST ) { |
168 | - $params['maxlag'] = self::MAXLAG; |
|
168 | + $params[ 'maxlag' ] = self::MAXLAG; |
|
169 | 169 | } |
170 | 170 | $query = http_build_query( $params ); |
171 | 171 | |
@@ -186,18 +186,18 @@ discard block |
||
186 | 186 | * @param string $params |
187 | 187 | * @return string |
188 | 188 | */ |
189 | - abstract protected function reallyMakeRequest( string $params ) : string; |
|
189 | + abstract protected function reallyMakeRequest ( string $params ) : string; |
|
190 | 190 | |
191 | 191 | /** |
192 | 192 | * After a request, set cookies for the next ones |
193 | 193 | * |
194 | 194 | * @param string[] $cookies |
195 | 195 | */ |
196 | - protected function setCookies( array $cookies ) : void { |
|
196 | + protected function setCookies ( array $cookies ) : void { |
|
197 | 197 | foreach ( $cookies as $cookie ) { |
198 | 198 | /** @var string[] $bits */ |
199 | 199 | $bits = explode( ';', $cookie ); |
200 | - [ $name, $value ] = explode( '=', $bits[0] ); |
|
200 | + [ $name, $value ] = explode( '=', $bits[ 0 ] ); |
|
201 | 201 | self::$cookiesToSet[ $name ] = $value; |
202 | 202 | } |
203 | 203 | } |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | * @param stdClass $res |
209 | 209 | * @return APIRequestException |
210 | 210 | */ |
211 | - private function getException( stdClass $res ) : APIRequestException { |
|
211 | + private function getException ( stdClass $res ) : APIRequestException { |
|
212 | 212 | switch ( $res->error->code ) { |
213 | 213 | case 'missingtitle': |
214 | 214 | $ex = new MissingPageException; |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | * @param stdClass $res |
235 | 235 | * @throws APIRequestException |
236 | 236 | */ |
237 | - protected function handleErrorAndWarnings( stdClass $res ) : void { |
|
237 | + protected function handleErrorAndWarnings ( stdClass $res ) : void { |
|
238 | 238 | if ( isset( $res->error ) ) { |
239 | 239 | throw $this->getException( $res ); |
240 | 240 | } |
@@ -250,14 +250,14 @@ discard block |
||
250 | 250 | * |
251 | 251 | * @return string[] |
252 | 252 | */ |
253 | - protected function getHeaders() : array { |
|
253 | + protected function getHeaders () : array { |
|
254 | 254 | $ret = self::HEADERS; |
255 | 255 | if ( self::$cookiesToSet ) { |
256 | - $cookies = []; |
|
256 | + $cookies = [ ]; |
|
257 | 257 | foreach ( self::$cookiesToSet as $cname => $cval ) { |
258 | - $cookies[] = trim( "$cname=$cval" ); |
|
258 | + $cookies[ ] = trim( "$cname=$cval" ); |
|
259 | 259 | } |
260 | - $ret[] = 'Cookie: ' . implode( '; ', $cookies ); |
|
260 | + $ret[ ] = 'Cookie: ' . implode( '; ', $cookies ); |
|
261 | 261 | } |
262 | 262 | return $ret; |
263 | 263 | } |
@@ -268,7 +268,7 @@ discard block |
||
268 | 268 | * @param string[] $headers |
269 | 269 | * @return string |
270 | 270 | */ |
271 | - protected function buildHeadersString( array $headers ) : string { |
|
271 | + protected function buildHeadersString ( array $headers ) : string { |
|
272 | 272 | $ret = ''; |
273 | 273 | foreach ( $headers as $header ) { |
274 | 274 | $ret .= "$header\r\n"; |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | * @param string $actualParams |
281 | 281 | * @return string |
282 | 282 | */ |
283 | - protected function getDebugURL( string $actualParams ) : string { |
|
283 | + protected function getDebugURL ( string $actualParams ) : string { |
|
284 | 284 | return strpos( $this->url, 'login' ) !== false |
285 | 285 | ? '[Login request]' |
286 | 286 | : "{$this->url}?$actualParams"; |
@@ -1,4 +1,4 @@ discard block |
||
1 | -<?php declare( strict_types=1 ); |
|
1 | +<?php declare(strict_types=1); |
|
2 | 2 | |
3 | 3 | namespace BotRiconferme\Request; |
4 | 4 | |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | * @inheritDoc |
14 | 14 | * @throws APIRequestException |
15 | 15 | */ |
16 | - protected function reallyMakeRequest( string $params ) : string { |
|
16 | + protected function reallyMakeRequest ( string $params ) : string { |
|
17 | 17 | $curl = curl_init(); |
18 | 18 | if ( $curl === false ) { |
19 | 19 | throw new APIRequestException( 'Cannot open cURL handler.' ); |
@@ -59,11 +59,11 @@ discard block |
||
59 | 59 | * @internal Only used as CB for cURL (CURLOPT_HEADERFUNCTION) |
60 | 60 | * @suppress PhanUnreferencedPublicMethod,PhanUnusedPublicNoOverrideMethodParameter |
61 | 61 | */ |
62 | - public function headersHandler( $ch, string $header ) : int { |
|
62 | + public function headersHandler ( $ch, string $header ) : int { |
|
63 | 63 | /** @var string[] $bits */ |
64 | 64 | $bits = explode( ':', $header, 2 ); |
65 | - if ( trim( $bits[0] ) === 'Set-Cookie' ) { |
|
66 | - $this->newCookies[] = $bits[1]; |
|
65 | + if ( trim( $bits[ 0 ] ) === 'Set-Cookie' ) { |
|
66 | + $this->newCookies[ ] = $bits[ 1 ]; |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | return strlen( $header ); |
@@ -1,4 +1,4 @@ discard block |
||
1 | -<?php declare( strict_types=1 ); |
|
1 | +<?php declare(strict_types=1); |
|
2 | 2 | |
3 | 3 | namespace BotRiconferme\Request; |
4 | 4 | |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | /** |
10 | 10 | * @inheritDoc |
11 | 11 | */ |
12 | - protected function reallyMakeRequest( string $params ) : string { |
|
12 | + protected function reallyMakeRequest ( string $params ) : string { |
|
13 | 13 | $context = [ |
14 | 14 | 'http' => [ |
15 | 15 | 'method' => $this->method, |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | ]; |
19 | 19 | $url = $this->url; |
20 | 20 | if ( $this->method === self::METHOD_POST ) { |
21 | - $context['http']['content'] = $params; |
|
21 | + $context[ 'http' ][ 'content' ] = $params; |
|
22 | 22 | } else { |
23 | 23 | $url = "$url?$params"; |
24 | 24 | } |
@@ -28,8 +28,8 @@ discard block |
||
28 | 28 | foreach ( $http_response_header as $header ) { |
29 | 29 | /** @var string[] $bits */ |
30 | 30 | $bits = explode( ':', $header, 2 ); |
31 | - if ( trim( $bits[0] ) === 'Set-Cookie' ) { |
|
32 | - $this->newCookies[] = $bits[1]; |
|
31 | + if ( trim( $bits[ 0 ] ) === 'Set-Cookie' ) { |
|
32 | + $this->newCookies[ ] = $bits[ 1 ]; |
|
33 | 33 | } |
34 | 34 | } |
35 | 35 |
@@ -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() : string { |
|
108 | + public function __toString () : string { |
|
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; |
4 | 4 | |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | * @param MessageProvider $mp |
73 | 73 | * @param PageBotList $pbl |
74 | 74 | */ |
75 | - public function __construct( |
|
75 | + public function __construct ( |
|
76 | 76 | LoggerInterface $logger, |
77 | 77 | WikiGroup $wikiGroup, |
78 | 78 | MessageProvider $mp, |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | * @param string[] $tasks Only used in MODE_TASK and MODE_SUBTASK |
98 | 98 | * @return TaskResult |
99 | 99 | */ |
100 | - public function run( string $mode, array $tasks = [] ) : TaskResult { |
|
100 | + public function run ( string $mode, array $tasks = [ ] ) : TaskResult { |
|
101 | 101 | if ( $mode === self::MODE_COMPLETE ) { |
102 | 102 | return $this->runTasks( self::FULL_RUN_ORDERED ); |
103 | 103 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | * @param string[] $tasks |
114 | 114 | * @return TaskResult |
115 | 115 | */ |
116 | - private function runTasks( array $tasks ) : TaskResult { |
|
116 | + private function runTasks ( array $tasks ) : TaskResult { |
|
117 | 117 | $res = new TaskResult( TaskResult::STATUS_GOOD ); |
118 | 118 | do { |
119 | 119 | $res->merge( $this->runTask( current( $tasks ) ) ); |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | * @param string $name |
129 | 129 | * @return TaskResult |
130 | 130 | */ |
131 | - protected function runTask( string $name ) : TaskResult { |
|
131 | + protected function runTask ( string $name ) : TaskResult { |
|
132 | 132 | if ( !isset( self::TASKS_MAP[ $name ] ) ) { |
133 | 133 | throw new InvalidArgumentException( "'$name' is not a valid task." ); |
134 | 134 | } |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | * @param string[] $subtasks |
143 | 143 | * @return TaskResult |
144 | 144 | */ |
145 | - private function runSubtasks( array $subtasks ) : TaskResult { |
|
145 | + private function runSubtasks ( array $subtasks ) : TaskResult { |
|
146 | 146 | $res = new TaskResult( TaskResult::STATUS_GOOD ); |
147 | 147 | do { |
148 | 148 | $res->merge( $this->runSubtask( current( $subtasks ) ) ); |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | * @param string $name |
158 | 158 | * @return TaskResult |
159 | 159 | */ |
160 | - protected function runSubtask( string $name ) : TaskResult { |
|
160 | + protected function runSubtask ( string $name ) : TaskResult { |
|
161 | 161 | if ( !isset( self::SUBTASKS_MAP[ $name ] ) ) { |
162 | 162 | throw new InvalidArgumentException( "'$name' is not a valid subtask." ); |
163 | 163 | } |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | * @param string $name |
173 | 173 | * @return Task |
174 | 174 | */ |
175 | - private function getTaskInstance( string $name ) : Task { |
|
175 | + private function getTaskInstance ( string $name ) : Task { |
|
176 | 176 | $class = self::TASKS_MAP[ $name ]; |
177 | 177 | return new $class( |
178 | 178 | $this->logger, |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | * @param string $class |
190 | 190 | * @return Subtask |
191 | 191 | */ |
192 | - private function getSubtaskInstance( string $class ) : Subtask { |
|
192 | + private function getSubtaskInstance ( string $class ) : Subtask { |
|
193 | 193 | return new $class( |
194 | 194 | $this->logger, |
195 | 195 | $this->wikiGroup, |
@@ -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 |