@@ -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 | /** @var callable|null */ |
| 46 | 46 | private $cookiesHandlerCallback; |
| 47 | 47 | |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | * @param string $domain |
| 58 | 58 | * @param callable $cookiesHandlerCallback |
| 59 | 59 | */ |
| 60 | - public function __construct( |
|
| 60 | + public function __construct ( |
|
| 61 | 61 | LoggerInterface $logger, |
| 62 | 62 | array $params, |
| 63 | 63 | string $domain, |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | * |
| 75 | 75 | * @return self For chaining |
| 76 | 76 | */ |
| 77 | - public function setPost(): self { |
|
| 77 | + public function setPost (): self { |
|
| 78 | 78 | $this->method = self::METHOD_POST; |
| 79 | 79 | return $this; |
| 80 | 80 | } |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | * @param string[] $cookies |
| 84 | 84 | * @return self For chaining |
| 85 | 85 | */ |
| 86 | - public function setCookies( array $cookies ): self { |
|
| 86 | + public function setCookies ( array $cookies ): self { |
|
| 87 | 87 | $this->cookiesToSet = $cookies; |
| 88 | 88 | return $this; |
| 89 | 89 | } |
@@ -92,12 +92,12 @@ discard block |
||
| 92 | 92 | * Execute a query request |
| 93 | 93 | * @return Generator |
| 94 | 94 | */ |
| 95 | - public function executeAsQuery(): Generator { |
|
| 96 | - if ( ( $this->params['action'] ?? false ) !== 'query' ) { |
|
| 95 | + public function executeAsQuery (): Generator { |
|
| 96 | + if ( ( $this->params[ 'action' ] ?? false ) !== 'query' ) { |
|
| 97 | 97 | throw new BadMethodCallException( 'Not an ApiQuery!' ); |
| 98 | 98 | } |
| 99 | 99 | // TODO Is this always correct? |
| 100 | - $key = $this->params['list'] ?? 'pages'; |
|
| 100 | + $key = $this->params[ 'list' ] ?? 'pages'; |
|
| 101 | 101 | $curParams = $this->params; |
| 102 | 102 | $lim = $this->parseLimit(); |
| 103 | 103 | do { |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | * Execute a request that doesn't need any continuation. |
| 127 | 127 | * @return stdClass |
| 128 | 128 | */ |
| 129 | - public function executeSingle(): stdClass { |
|
| 129 | + public function executeSingle (): stdClass { |
|
| 130 | 130 | $curParams = $this->params; |
| 131 | 131 | $res = $this->makeRequestInternal( $curParams ); |
| 132 | 132 | $this->handleErrorAndWarnings( $res ); |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | /** |
| 137 | 137 | * @return int |
| 138 | 138 | */ |
| 139 | - private function parseLimit(): int { |
|
| 139 | + private function parseLimit (): int { |
|
| 140 | 140 | foreach ( $this->params as $name => $val ) { |
| 141 | 141 | if ( substr( $name, -strlen( 'limit' ) ) === 'limit' ) { |
| 142 | 142 | return $val === 'max' ? -1 : (int)$val; |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | * @param string $resKey |
| 154 | 154 | * @return int|null |
| 155 | 155 | */ |
| 156 | - private function countQueryResults( stdClass $res, string $resKey ): ?int { |
|
| 156 | + private function countQueryResults ( stdClass $res, string $resKey ): ?int { |
|
| 157 | 157 | if ( !isset( $res->query->$resKey ) ) { |
| 158 | 158 | return null; |
| 159 | 159 | } |
@@ -181,9 +181,9 @@ discard block |
||
| 181 | 181 | * @phan-param array<int|string|bool> $params |
| 182 | 182 | * @return stdClass |
| 183 | 183 | */ |
| 184 | - private function makeRequestInternal( array $params ): stdClass { |
|
| 184 | + private function makeRequestInternal ( array $params ): stdClass { |
|
| 185 | 185 | if ( $this->method === self::METHOD_POST ) { |
| 186 | - $params['maxlag'] = self::MAXLAG; |
|
| 186 | + $params[ 'maxlag' ] = self::MAXLAG; |
|
| 187 | 187 | } |
| 188 | 188 | $query = http_build_query( $params ); |
| 189 | 189 | |
@@ -203,15 +203,15 @@ discard block |
||
| 203 | 203 | * |
| 204 | 204 | * @param string $rawHeader |
| 205 | 205 | */ |
| 206 | - protected function handleResponseHeader( string $rawHeader ): void { |
|
| 206 | + protected function handleResponseHeader ( string $rawHeader ): void { |
|
| 207 | 207 | $headerParts = explode( ':', $rawHeader, 2 ); |
| 208 | - $headerName = $headerParts[0]; |
|
| 209 | - $headerValue = $headerParts[1] ?? null; |
|
| 208 | + $headerName = $headerParts[ 0 ]; |
|
| 209 | + $headerValue = $headerParts[ 1 ] ?? null; |
|
| 210 | 210 | if ( strtolower( trim( $headerName ) ) === 'set-cookie' ) { |
| 211 | 211 | // TODO Maybe use a cookie file? |
| 212 | - $cookieKeyVal = explode( ';', $headerValue )[0]; |
|
| 212 | + $cookieKeyVal = explode( ';', $headerValue )[ 0 ]; |
|
| 213 | 213 | [ $name, $value ] = explode( '=', $cookieKeyVal ); |
| 214 | - $this->newCookies[$name] = $value; |
|
| 214 | + $this->newCookies[ $name ] = $value; |
|
| 215 | 215 | } |
| 216 | 216 | } |
| 217 | 217 | |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | * @param string $params |
| 222 | 222 | * @return string |
| 223 | 223 | */ |
| 224 | - abstract protected function reallyMakeRequest( string $params ): string; |
|
| 224 | + abstract protected function reallyMakeRequest ( string $params ): string; |
|
| 225 | 225 | |
| 226 | 226 | /** |
| 227 | 227 | * Get a specific exception class depending on the error code |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | * @param stdClass $res |
| 230 | 230 | * @return APIRequestException |
| 231 | 231 | */ |
| 232 | - private function getException( stdClass $res ): APIRequestException { |
|
| 232 | + private function getException ( stdClass $res ): APIRequestException { |
|
| 233 | 233 | switch ( $res->error->code ) { |
| 234 | 234 | case 'missingtitle': |
| 235 | 235 | $ex = new MissingPageException; |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | * @param stdClass $res |
| 256 | 256 | * @throws APIRequestException |
| 257 | 257 | */ |
| 258 | - protected function handleErrorAndWarnings( stdClass $res ): void { |
|
| 258 | + protected function handleErrorAndWarnings ( stdClass $res ): void { |
|
| 259 | 259 | if ( isset( $res->error ) ) { |
| 260 | 260 | throw $this->getException( $res ); |
| 261 | 261 | } |
@@ -271,14 +271,14 @@ discard block |
||
| 271 | 271 | * |
| 272 | 272 | * @return string[] |
| 273 | 273 | */ |
| 274 | - protected function getHeaders(): array { |
|
| 274 | + protected function getHeaders (): array { |
|
| 275 | 275 | $ret = self::HEADERS; |
| 276 | 276 | if ( $this->cookiesToSet ) { |
| 277 | - $cookies = []; |
|
| 277 | + $cookies = [ ]; |
|
| 278 | 278 | foreach ( $this->cookiesToSet as $cname => $cval ) { |
| 279 | - $cookies[] = trim( "$cname=$cval" ); |
|
| 279 | + $cookies[ ] = trim( "$cname=$cval" ); |
|
| 280 | 280 | } |
| 281 | - $ret[] = 'Cookie: ' . implode( '; ', $cookies ); |
|
| 281 | + $ret[ ] = 'Cookie: ' . implode( '; ', $cookies ); |
|
| 282 | 282 | } |
| 283 | 283 | return $ret; |
| 284 | 284 | } |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | * @param string[] $headers |
| 290 | 290 | * @return string |
| 291 | 291 | */ |
| 292 | - protected function buildHeadersString( array $headers ): string { |
|
| 292 | + protected function buildHeadersString ( array $headers ): string { |
|
| 293 | 293 | $ret = ''; |
| 294 | 294 | foreach ( $headers as $header ) { |
| 295 | 295 | $ret .= "$header\r\n"; |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | * @param string $actualParams |
| 302 | 302 | * @return string |
| 303 | 303 | */ |
| 304 | - protected function getDebugURL( string $actualParams ): string { |
|
| 304 | + protected function getDebugURL ( string $actualParams ): string { |
|
| 305 | 305 | return strpos( $this->url, 'login' ) !== false |
| 306 | 306 | ? '[Login request]' |
| 307 | 307 | : "{$this->url}?$actualParams"; |