@@ -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 | |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | */ |
| 16 | 16 | abstract class TaskBase extends ContextSource { |
| 17 | 17 | /** @var string[] */ |
| 18 | - protected $errors = []; |
|
| 18 | + protected $errors = [ ]; |
|
| 19 | 19 | /** @var TaskDataProvider */ |
| 20 | 20 | protected $dataProvider; |
| 21 | 21 | |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | * @param MessageProvider $mp |
| 29 | 29 | * @param PageBotList $pbl |
| 30 | 30 | */ |
| 31 | - final public function __construct( |
|
| 31 | + final public function __construct ( |
|
| 32 | 32 | LoggerInterface $logger, |
| 33 | 33 | WikiGroup $wikiGroup, |
| 34 | 34 | TaskDataProvider $dataProvider, |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | * |
| 45 | 45 | * @return \BotRiconferme\TaskHelper\TaskResult |
| 46 | 46 | */ |
| 47 | - final public function run() : TaskResult { |
|
| 47 | + final public function run () : TaskResult { |
|
| 48 | 48 | $class = ( new \ReflectionClass( $this ) )->getShortName(); |
| 49 | 49 | $opName = $this->getOperationName(); |
| 50 | 50 | $this->getLogger()->info( "Starting $opName $class" ); |
@@ -75,19 +75,19 @@ discard block |
||
| 75 | 75 | * |
| 76 | 76 | * @return int One of the STATUS_* constants |
| 77 | 77 | */ |
| 78 | - abstract protected function runInternal() : int; |
|
| 78 | + abstract protected function runInternal () : int; |
|
| 79 | 79 | |
| 80 | 80 | /** |
| 81 | 81 | * How this operation should be called in logs |
| 82 | 82 | * |
| 83 | 83 | * @return string |
| 84 | 84 | */ |
| 85 | - abstract public function getOperationName() : string; |
|
| 85 | + abstract public function getOperationName () : string; |
|
| 86 | 86 | |
| 87 | 87 | /** |
| 88 | 88 | * @return TaskDataProvider |
| 89 | 89 | */ |
| 90 | - protected function getDataProvider() : TaskDataProvider { |
|
| 90 | + protected function getDataProvider () : TaskDataProvider { |
|
| 91 | 91 | return $this->dataProvider; |
| 92 | 92 | } |
| 93 | 93 | } |
@@ -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 === 'task' ) { |
| 63 | - $this->runInternal( TaskManager::MODE_TASK, $taskOpt['task'] ); |
|
| 63 | + $this->runInternal( TaskManager::MODE_TASK, $taskOpt[ 'task' ] ); |
|
| 64 | 64 | } elseif ( $type === 'subtask' ) { |
| 65 | - $this->runInternal( TaskManager::MODE_SUBTASK, $taskOpt['subtask'] ); |
|
| 65 | + $this->runInternal( TaskManager::MODE_SUBTASK, $taskOpt[ 'subtask' ] ); |
|
| 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'; |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | * |
| 101 | 101 | * @param IFlushingAwareLogger $baseLogger |
| 102 | 102 | */ |
| 103 | - private function createMainLogger( IFlushingAwareLogger $baseLogger ) : void { |
|
| 103 | + private function createMainLogger ( IFlushingAwareLogger $baseLogger ) : void { |
|
| 104 | 104 | $mainWiki = $this->wikiGroup->getMainWiki(); |
| 105 | 105 | $mp = $this->messageProvider; |
| 106 | 106 | $errTitle = $this->cli->getOpt( 'error-title' ); |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | /** |
| 128 | 128 | * Create the Config |
| 129 | 129 | */ |
| 130 | - private function initConfig() : void { |
|
| 130 | + private function initConfig () : void { |
|
| 131 | 131 | $wiki = $this->wikiGroup->getMainWiki(); |
| 132 | 132 | try { |
| 133 | 133 | $confValues = json_decode( $wiki->getPageContent( $this->cli->getOpt( 'config-title' ) ), true ); |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | * @param string $mode |
| 145 | 145 | * @param string|null $name |
| 146 | 146 | */ |
| 147 | - private function runInternal( |
|
| 147 | + private function runInternal ( |
|
| 148 | 148 | string $mode = TaskManager::MODE_COMPLETE, |
| 149 | 149 | string $name = null |
| 150 | 150 | ) : void { |
@@ -164,8 +164,7 @@ discard block |
||
| 164 | 164 | $base = "Execution of $activity"; |
| 165 | 165 | if ( $res->isOK() ) { |
| 166 | 166 | $msg = $res->getStatus() === TaskResult::STATUS_NOTHING ? |
| 167 | - ': nothing to do' : |
|
| 168 | - ' completed successfully'; |
|
| 167 | + ': nothing to do' : ' completed successfully'; |
|
| 169 | 168 | $this->mainLogger->info( $base . $msg ); |
| 170 | 169 | } else { |
| 171 | 170 | $this->mainLogger->error( "$base failed.\n$res" ); |
@@ -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 | |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | * @param LoggerInterface $logger |
| 35 | 35 | * @param RequestFactory $requestFactory |
| 36 | 36 | */ |
| 37 | - public function __construct( |
|
| 37 | + public function __construct ( |
|
| 38 | 38 | LoginInfo $li, |
| 39 | 39 | LoggerInterface $logger, |
| 40 | 40 | RequestFactory $requestFactory |
@@ -47,28 +47,28 @@ discard block |
||
| 47 | 47 | /** |
| 48 | 48 | * @return LoginInfo |
| 49 | 49 | */ |
| 50 | - public function getLoginInfo() : LoginInfo { |
|
| 50 | + public function getLoginInfo () : LoginInfo { |
|
| 51 | 51 | return $this->loginInfo; |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | /** |
| 55 | 55 | * @return RequestFactory |
| 56 | 56 | */ |
| 57 | - public function getRequestFactory() : RequestFactory { |
|
| 57 | + public function getRequestFactory () : RequestFactory { |
|
| 58 | 58 | return $this->requestFactory; |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | /** |
| 62 | 62 | * @param string $ident |
| 63 | 63 | */ |
| 64 | - public function setLocalUserIdentifier( string $ident ) : void { |
|
| 64 | + public function setLocalUserIdentifier ( string $ident ) : void { |
|
| 65 | 65 | $this->localUserIdentifier = $ident; |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | /** |
| 69 | 69 | * @return string |
| 70 | 70 | */ |
| 71 | - public function getLocalUserIdentifier() : string { |
|
| 71 | + public function getLocalUserIdentifier () : string { |
|
| 72 | 72 | return $this->localUserIdentifier; |
| 73 | 73 | } |
| 74 | 74 | |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | * @throws MissingPageException |
| 82 | 82 | * @throws MissingSectionException |
| 83 | 83 | */ |
| 84 | - public function getPageContent( string $title, int $section = null ) : string { |
|
| 84 | + public function getPageContent ( string $title, int $section = null ) : string { |
|
| 85 | 85 | $msg = "Retrieving content of $title" . ( $section !== null ? ", section $section" : '' ); |
| 86 | 86 | $this->logger->info( $msg ); |
| 87 | 87 | $params = [ |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | ]; |
| 94 | 94 | |
| 95 | 95 | if ( $section !== null ) { |
| 96 | - $params['rvsection'] = $section; |
|
| 96 | + $params[ 'rvsection' ] = $section; |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | $req = $this->buildRequest( $params ); |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | throw new MissingPageException( $title ); |
| 104 | 104 | } |
| 105 | 105 | |
| 106 | - $mainSlot = $page->revisions[0]->slots->main; |
|
| 106 | + $mainSlot = $page->revisions[ 0 ]->slots->main; |
|
| 107 | 107 | |
| 108 | 108 | if ( $section !== null && isset( $mainSlot->nosuchsection ) ) { |
| 109 | 109 | throw new MissingSectionException( $title, $section ); |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | * @param array $params |
| 118 | 118 | * @throws EditException |
| 119 | 119 | */ |
| 120 | - public function editPage( array $params ) : void { |
|
| 120 | + public function editPage ( array $params ) : void { |
|
| 121 | 121 | $this->login(); |
| 122 | 122 | |
| 123 | 123 | $params = [ |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | ] + $params; |
| 127 | 127 | |
| 128 | 128 | if ( BOT_EDITS === true ) { |
| 129 | - $params['bot'] = 1; |
|
| 129 | + $params[ 'bot' ] = 1; |
|
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | $res = $this->buildRequest( $params )->setPost()->execute(); |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | * Login wrapper. Checks if we're already logged in and clears tokens cache |
| 145 | 145 | * @throws LoginException |
| 146 | 146 | */ |
| 147 | - public function login() : void { |
|
| 147 | + public function login () : void { |
|
| 148 | 148 | if ( $this->loginInfo === null ) { |
| 149 | 149 | throw new CannotLoginException( 'Missing login data' ); |
| 150 | 150 | } |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | |
| 175 | 175 | self::$loggedIn = true; |
| 176 | 176 | // Clear tokens cache |
| 177 | - $this->tokens = []; |
|
| 177 | + $this->tokens = [ ]; |
|
| 178 | 178 | $this->logger->info( 'Login succeeded' ); |
| 179 | 179 | } |
| 180 | 180 | |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | * @param string $type |
| 185 | 185 | * @return string |
| 186 | 186 | */ |
| 187 | - public function getToken( string $type ) : string { |
|
| 187 | + public function getToken ( string $type ) : string { |
|
| 188 | 188 | if ( !isset( $this->tokens[ $type ] ) ) { |
| 189 | 189 | $params = [ |
| 190 | 190 | 'action' => 'query', |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | * @param string $title |
| 208 | 208 | * @return int |
| 209 | 209 | */ |
| 210 | - public function getPageCreationTS( string $title ) : int { |
|
| 210 | + public function getPageCreationTS ( string $title ) : int { |
|
| 211 | 211 | $params = [ |
| 212 | 212 | 'action' => 'query', |
| 213 | 213 | 'prop' => 'revisions', |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | |
| 221 | 221 | $res = $this->buildRequest( $params )->execute(); |
| 222 | 222 | $data = $res->query->pages; |
| 223 | - return strtotime( reset( $data )->revisions[0]->timestamp ); |
|
| 223 | + return strtotime( reset( $data )->revisions[ 0 ]->timestamp ); |
|
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | /** |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | * @param string $title |
| 230 | 230 | * @param string $reason |
| 231 | 231 | */ |
| 232 | - public function protectPage( string $title, string $reason ) : void { |
|
| 232 | + public function protectPage ( string $title, string $reason ) : void { |
|
| 233 | 233 | $this->logger->info( "Protecting page $title" ); |
| 234 | 234 | $this->login(); |
| 235 | 235 | |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | * @param array $params |
| 251 | 251 | * @return RequestBase |
| 252 | 252 | */ |
| 253 | - private function buildRequest( array $params ) : RequestBase { |
|
| 253 | + private function buildRequest ( array $params ) : RequestBase { |
|
| 254 | 254 | return $this->requestFactory->newFromParams( $params ); |
| 255 | 255 | } |
| 256 | 256 | } |
@@ -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\Subtask; |
| 4 | 4 | |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | /** |
| 16 | 16 | * @inheritDoc |
| 17 | 17 | */ |
| 18 | - public function runInternal() : int { |
|
| 18 | + public function runInternal () : int { |
|
| 19 | 19 | $users = $this->getDataProvider()->getUsersToProcess(); |
| 20 | 20 | |
| 21 | 21 | if ( !$users ) { |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | * |
| 35 | 35 | * @param User $user |
| 36 | 36 | */ |
| 37 | - protected function processUser( User $user ) : void { |
|
| 37 | + protected function processUser ( User $user ) : void { |
|
| 38 | 38 | $this->getLogger()->info( "Processing user $user" ); |
| 39 | 39 | try { |
| 40 | 40 | $num = $this->getLastPageNum( $user ) + 1; |
@@ -69,14 +69,14 @@ discard block |
||
| 69 | 69 | * @return int |
| 70 | 70 | * @throws TaskException |
| 71 | 71 | */ |
| 72 | - protected function getLastPageNum( User $user ) : int { |
|
| 72 | + protected function getLastPageNum ( User $user ) : int { |
|
| 73 | 73 | $this->getLogger()->info( "Retrieving previous pages for $user" ); |
| 74 | 74 | |
| 75 | - $unprefixedTitle = explode( ':', $this->getOpt( 'main-page-title' ), 2 )[1]; |
|
| 75 | + $unprefixedTitle = explode( ':', $this->getOpt( 'main-page-title' ), 2 )[ 1 ]; |
|
| 76 | 76 | |
| 77 | 77 | $prefixes = [ "$unprefixedTitle/$user/" ]; |
| 78 | 78 | foreach ( $user->getAliases() as $alias ) { |
| 79 | - $prefixes[] = "$unprefixedTitle/$alias/"; |
|
| 79 | + $prefixes[ ] = "$unprefixedTitle/$alias/"; |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | $params = [ |
@@ -86,9 +86,9 @@ discard block |
||
| 86 | 86 | 'apprefix' => implode( '|', $prefixes ), |
| 87 | 87 | 'aplimit' => 'max' |
| 88 | 88 | ]; |
| 89 | - $foundPages = []; |
|
| 89 | + $foundPages = [ ]; |
|
| 90 | 90 | foreach ( $prefixes as $prefix ) { |
| 91 | - $params['apprefix'] = $prefix; |
|
| 91 | + $params[ 'apprefix' ] = $prefix; |
|
| 92 | 92 | $res = $this->getRequestFactory()->newFromParams( $params )->execute(); |
| 93 | 93 | $foundPages = array_merge( $foundPages, $res->query->allpages ); |
| 94 | 94 | } |
@@ -114,14 +114,14 @@ discard block |
||
| 114 | 114 | * @param string $title |
| 115 | 115 | * @param User $user |
| 116 | 116 | */ |
| 117 | - protected function createPage( string $title, User $user ) : void { |
|
| 117 | + protected function createPage ( string $title, User $user ) : void { |
|
| 118 | 118 | $this->getLogger()->info( "Creating page $title" ); |
| 119 | 119 | $groups = $user->getGroupsWithDates(); |
| 120 | 120 | $textParams = [ |
| 121 | 121 | '$user' => $user->getName(), |
| 122 | - '$date' => $groups['sysop'], |
|
| 123 | - '$burocrate' => $groups['bureaucrat'] ?? '', |
|
| 124 | - '$checkuser' => $groups['checkuser'] ?? '' |
|
| 122 | + '$date' => $groups[ 'sysop' ], |
|
| 123 | + '$burocrate' => $groups[ 'bureaucrat' ] ?? '', |
|
| 124 | + '$checkuser' => $groups[ 'checkuser' ] ?? '' |
|
| 125 | 125 | ]; |
| 126 | 126 | |
| 127 | 127 | $params = [ |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | * @param Page $basePage |
| 140 | 140 | * @param string $newText |
| 141 | 141 | */ |
| 142 | - protected function createBasePage( Page $basePage, string $newText ) : void { |
|
| 142 | + protected function createBasePage ( Page $basePage, string $newText ) : void { |
|
| 143 | 143 | $this->getLogger()->info( "Creating base page $basePage" ); |
| 144 | 144 | |
| 145 | 145 | $params = [ |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | * @param Page $basePage |
| 156 | 156 | * @param string $newText |
| 157 | 157 | */ |
| 158 | - protected function updateBasePage( Page $basePage, string $newText ) : void { |
|
| 158 | + protected function updateBasePage ( Page $basePage, string $newText ) : void { |
|
| 159 | 159 | $this->getLogger()->info( "Updating base page $basePage" ); |
| 160 | 160 | |
| 161 | 161 | $params = [ |
@@ -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\Page; |
| 4 | 4 | |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | /** @var int */ |
| 15 | 15 | private $opposeSection; |
| 16 | 16 | /** @var array Counts of votes for each section */ |
| 17 | - private $sectionCounts = []; |
|
| 17 | + private $sectionCounts = [ ]; |
|
| 18 | 18 | |
| 19 | 19 | // Possible outcomes of a vote |
| 20 | 20 | public const OUTCOME_OK = 0; |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | * because they can vary depending on whether the page is a vote, which is relatively |
| 34 | 34 | * expensive to know since it requires parsing the content of the page. |
| 35 | 35 | */ |
| 36 | - private function defineSections() : void { |
|
| 36 | + private function defineSections () : void { |
|
| 37 | 37 | $this->supportSection = $this->isVote() ? 3 : 0; |
| 38 | 38 | $this->opposeSection = $this->isVote() ? 4 : 3; |
| 39 | 39 | } |
@@ -43,8 +43,8 @@ discard block |
||
| 43 | 43 | * |
| 44 | 44 | * @return string |
| 45 | 45 | */ |
| 46 | - public function getUserName() : string { |
|
| 47 | - return explode( '/', $this->title )[2]; |
|
| 46 | + public function getUserName () : string { |
|
| 47 | + return explode( '/', $this->title )[ 2 ]; |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | /** |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | * |
| 53 | 53 | * @return int |
| 54 | 54 | */ |
| 55 | - public function getNum() : int { |
|
| 55 | + public function getNum () : int { |
|
| 56 | 56 | $bits = explode( '/', $this->getTitle() ); |
| 57 | 57 | return (int)end( $bits ); |
| 58 | 58 | } |
@@ -62,8 +62,8 @@ discard block |
||
| 62 | 62 | * |
| 63 | 63 | * @return string |
| 64 | 64 | */ |
| 65 | - public function getUserNum() : string { |
|
| 66 | - return explode( '/', $this->getTitle(), 3 )[2]; |
|
| 65 | + public function getUserNum () : string { |
|
| 66 | + return explode( '/', $this->getTitle(), 3 )[ 2 ]; |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | /** |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | * |
| 72 | 72 | * @return int |
| 73 | 73 | */ |
| 74 | - public function getOpposingCount() : int { |
|
| 74 | + public function getOpposingCount () : int { |
|
| 75 | 75 | $this->defineSections(); |
| 76 | 76 | return $this->getCountForSection( $this->opposeSection ); |
| 77 | 77 | } |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | * @return int |
| 83 | 83 | * @throws \BadMethodCallException |
| 84 | 84 | */ |
| 85 | - public function getSupportCount() : int { |
|
| 85 | + public function getSupportCount () : int { |
|
| 86 | 86 | if ( !$this->isVote() ) { |
| 87 | 87 | throw new \BadMethodCallException( 'Cannot get support for a non-vote page.' ); |
| 88 | 88 | } |
@@ -96,13 +96,13 @@ discard block |
||
| 96 | 96 | * @param int $secNum |
| 97 | 97 | * @return int |
| 98 | 98 | */ |
| 99 | - protected function getCountForSection( int $secNum ) : int { |
|
| 99 | + protected function getCountForSection ( int $secNum ) : int { |
|
| 100 | 100 | if ( !isset( $this->sectionCounts[ $secNum ] ) ) { |
| 101 | 101 | $content = $this->wiki->getPageContent( $this->title, $secNum ); |
| 102 | 102 | // Let's hope that this is good enough... |
| 103 | - $this->sectionCounts[$secNum] = preg_match_all( "/^# *(?![# *:]|\.\.\.$)/m", $content ); |
|
| 103 | + $this->sectionCounts[ $secNum ] = preg_match_all( "/^# *(?![# *:]|\.\.\.$)/m", $content ); |
|
| 104 | 104 | } |
| 105 | - return $this->sectionCounts[$secNum]; |
|
| 105 | + return $this->sectionCounts[ $secNum ]; |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | /** |
@@ -110,9 +110,9 @@ discard block |
||
| 110 | 110 | * |
| 111 | 111 | * @return int |
| 112 | 112 | */ |
| 113 | - protected function getQuorum() : int { |
|
| 113 | + protected function getQuorum () : int { |
|
| 114 | 114 | $reg = "!soddisfare il \[\[[^|\]]+\|quorum]] di '''(\d+) voti'''!"; |
| 115 | - return (int)$this->getMatch( $reg )[1]; |
|
| 115 | + return (int)$this->getMatch( $reg )[ 1 ]; |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | /** |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | * |
| 121 | 121 | * @return bool |
| 122 | 122 | */ |
| 123 | - public function hasOpposition() : bool { |
|
| 123 | + public function hasOpposition () : bool { |
|
| 124 | 124 | return $this->getOpposingCount() >= self::REQUIRED_OPPOSE; |
| 125 | 125 | } |
| 126 | 126 | |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | * |
| 130 | 130 | * @return int One of the OUTCOME_* constants |
| 131 | 131 | */ |
| 132 | - public function getOutcome() : int { |
|
| 132 | + public function getOutcome () : int { |
|
| 133 | 133 | if ( !$this->isVote() ) { |
| 134 | 134 | return self::OUTCOME_OK; |
| 135 | 135 | } |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | * @throws \BadMethodCallException |
| 153 | 153 | * @throws \LogicException |
| 154 | 154 | */ |
| 155 | - public function getOutcomeText() : string { |
|
| 155 | + public function getOutcomeText () : string { |
|
| 156 | 156 | if ( !$this->isVote() ) { |
| 157 | 157 | throw new \BadMethodCallException( 'No need for an outcome text.' ); |
| 158 | 158 | } |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | * |
| 187 | 187 | * @return bool |
| 188 | 188 | */ |
| 189 | - public function isVote() : bool { |
|
| 189 | + public function isVote () : bool { |
|
| 190 | 190 | $sectionReg = '/<!-- SEZIONE DA UTILIZZARE PER/'; |
| 191 | 191 | return !$this->matches( $sectionReg ); |
| 192 | 192 | } |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | * |
| 197 | 197 | * @return int |
| 198 | 198 | */ |
| 199 | - public function getCreationTimestamp() : int { |
|
| 199 | + public function getCreationTimestamp () : int { |
|
| 200 | 200 | return $this->wiki->getPageCreationTS( $this->title ); |
| 201 | 201 | } |
| 202 | 202 | |
@@ -205,7 +205,7 @@ discard block |
||
| 205 | 205 | * |
| 206 | 206 | * @return int |
| 207 | 207 | */ |
| 208 | - public function getEndTimestamp() : int { |
|
| 208 | + public function getEndTimestamp () : int { |
|
| 209 | 209 | if ( $this->isVote() ) { |
| 210 | 210 | $reg = "!La votazione ha inizio il.+ alle ore ([\d:]+) e ha termine il (.+) alla stessa ora!"; |
| 211 | 211 | [ , $hours, $day ] = $this->getMatch( $reg ); |
@@ -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 | |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | /** @var string */ |
| 33 | 33 | protected $method = self::METHOD_GET; |
| 34 | 34 | /** @var string[] */ |
| 35 | - protected $newCookies = []; |
|
| 35 | + protected $newCookies = [ ]; |
|
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | 38 | * @private Use RequestFactory |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | * @param array $params |
| 41 | 41 | * @param string $domain |
| 42 | 42 | */ |
| 43 | - public function __construct( array $params, string $domain ) { |
|
| 43 | + public function __construct ( array $params, string $domain ) { |
|
| 44 | 44 | $this->params = [ 'format' => 'json' ] + $params; |
| 45 | 45 | $this->url = $domain; |
| 46 | 46 | } |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | * |
| 51 | 51 | * @return self For chaining |
| 52 | 52 | */ |
| 53 | - public function setPost() : self { |
|
| 53 | + public function setPost () : self { |
|
| 54 | 54 | $this->method = self::METHOD_POST; |
| 55 | 55 | return $this; |
| 56 | 56 | } |
@@ -62,15 +62,15 @@ discard block |
||
| 62 | 62 | * @todo Return an iterable object which automatically continues the query only if the last |
| 63 | 63 | * entry available is reached, instead of requesting max results. |
| 64 | 64 | */ |
| 65 | - public function execute() : \stdClass { |
|
| 65 | + public function execute () : \stdClass { |
|
| 66 | 66 | $curParams = $this->params; |
| 67 | 67 | $lim = $this->parseLimit(); |
| 68 | - $sets = []; |
|
| 68 | + $sets = [ ]; |
|
| 69 | 69 | do { |
| 70 | 70 | $res = $this->makeRequestInternal( $curParams ); |
| 71 | 71 | |
| 72 | 72 | $this->handleErrorAndWarnings( $res ); |
| 73 | - $sets[] = $res; |
|
| 73 | + $sets[ ] = $res; |
|
| 74 | 74 | |
| 75 | 75 | // Assume that we have finished |
| 76 | 76 | $finished = true; |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | * FIXME Should be revamped together with countResults |
| 96 | 96 | * @return int |
| 97 | 97 | */ |
| 98 | - private function parseLimit() : int { |
|
| 98 | + private function parseLimit () : int { |
|
| 99 | 99 | foreach ( $this->params as $name => $val ) { |
| 100 | 100 | if ( substr( $name, -strlen( 'limit' ) ) === 'limit' ) { |
| 101 | 101 | return $val === 'max' ? -1 : (int)$val; |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | * @param \stdClass $res |
| 114 | 114 | * @return int|null |
| 115 | 115 | */ |
| 116 | - private function countResults( \stdClass $res ) : ?int { |
|
| 116 | + private function countResults ( \stdClass $res ) : ?int { |
|
| 117 | 117 | if ( isset( $res->query->pages ) && count( get_object_vars( $res->query->pages ) ) === 1 ) { |
| 118 | 118 | $pages = $res->query->pages; |
| 119 | 119 | return count( reset( $pages )->revisions ); |
@@ -127,9 +127,9 @@ discard block |
||
| 127 | 127 | * @param array $params |
| 128 | 128 | * @return \stdClass |
| 129 | 129 | */ |
| 130 | - private function makeRequestInternal( array $params ) : \stdClass { |
|
| 130 | + private function makeRequestInternal ( array $params ) : \stdClass { |
|
| 131 | 131 | if ( $this->method === self::METHOD_POST ) { |
| 132 | - $params['maxlag'] = self::MAXLAG; |
|
| 132 | + $params[ 'maxlag' ] = self::MAXLAG; |
|
| 133 | 133 | } |
| 134 | 134 | $query = http_build_query( $params ); |
| 135 | 135 | |
@@ -145,17 +145,17 @@ discard block |
||
| 145 | 145 | * @param string $params |
| 146 | 146 | * @return string |
| 147 | 147 | */ |
| 148 | - abstract protected function reallyMakeRequest( string $params ) : string; |
|
| 148 | + abstract protected function reallyMakeRequest ( string $params ) : string; |
|
| 149 | 149 | |
| 150 | 150 | /** |
| 151 | 151 | * After a request, set cookies for the next ones |
| 152 | 152 | * |
| 153 | 153 | * @param array $cookies |
| 154 | 154 | */ |
| 155 | - protected function setCookies( array $cookies ) : void { |
|
| 155 | + protected function setCookies ( array $cookies ) : void { |
|
| 156 | 156 | foreach ( $cookies as $cookie ) { |
| 157 | 157 | $bits = explode( ';', $cookie ); |
| 158 | - [ $name, $value ] = explode( '=', $bits[0] ); |
|
| 158 | + [ $name, $value ] = explode( '=', $bits[ 0 ] ); |
|
| 159 | 159 | self::$cookiesToSet[ $name ] = $value; |
| 160 | 160 | } |
| 161 | 161 | } |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | * @param \stdClass $res |
| 167 | 167 | * @return APIRequestException |
| 168 | 168 | */ |
| 169 | - private function getException( \stdClass $res ) : APIRequestException { |
|
| 169 | + private function getException ( \stdClass $res ) : APIRequestException { |
|
| 170 | 170 | switch ( $res->error->code ) { |
| 171 | 171 | case 'missingtitle': |
| 172 | 172 | $ex = new MissingPageException; |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | * @param \stdClass $res |
| 190 | 190 | * @throws APIRequestException |
| 191 | 191 | */ |
| 192 | - protected function handleErrorAndWarnings( \stdClass $res ) : void { |
|
| 192 | + protected function handleErrorAndWarnings ( \stdClass $res ) : void { |
|
| 193 | 193 | if ( isset( $res->error ) ) { |
| 194 | 194 | throw $this->getException( $res ); |
| 195 | 195 | } elseif ( isset( $res->warnings ) ) { |
@@ -205,9 +205,9 @@ discard block |
||
| 205 | 205 | * @param \stdClass[] $sets |
| 206 | 206 | * @return \stdClass |
| 207 | 207 | */ |
| 208 | - private function mergeSets( array $sets ) : \stdClass { |
|
| 208 | + private function mergeSets ( array $sets ) : \stdClass { |
|
| 209 | 209 | if ( !$sets ) { |
| 210 | - return (object)[]; |
|
| 210 | + return (object)[ ]; |
|
| 211 | 211 | } |
| 212 | 212 | // Use the first set as template |
| 213 | 213 | $ret = array_shift( $sets ); |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | * @param array|\stdClass $second |
| 226 | 226 | * @return array|\stdClass array |
| 227 | 227 | */ |
| 228 | - private function recursiveMerge( $first, $second ) { |
|
| 228 | + private function recursiveMerge ( $first, $second ) { |
|
| 229 | 229 | $ret = $first; |
| 230 | 230 | if ( is_array( $second ) ) { |
| 231 | 231 | $ret = is_array( $first ) ? array_merge_recursive( $first, $second ) : $second; |
@@ -243,14 +243,14 @@ discard block |
||
| 243 | 243 | * |
| 244 | 244 | * @return array |
| 245 | 245 | */ |
| 246 | - protected function getHeaders() :array { |
|
| 246 | + protected function getHeaders () :array { |
|
| 247 | 247 | $ret = self::HEADERS; |
| 248 | 248 | if ( self::$cookiesToSet ) { |
| 249 | - $cookies = []; |
|
| 249 | + $cookies = [ ]; |
|
| 250 | 250 | foreach ( self::$cookiesToSet as $cname => $cval ) { |
| 251 | - $cookies[] = trim( "$cname=$cval" ); |
|
| 251 | + $cookies[ ] = trim( "$cname=$cval" ); |
|
| 252 | 252 | } |
| 253 | - $ret[] = 'Cookie: ' . implode( '; ', $cookies ); |
|
| 253 | + $ret[ ] = 'Cookie: ' . implode( '; ', $cookies ); |
|
| 254 | 254 | } |
| 255 | 255 | return $ret; |
| 256 | 256 | } |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | * @param array $headers |
| 262 | 262 | * @return string |
| 263 | 263 | */ |
| 264 | - protected function buildHeadersString( array $headers ) : string { |
|
| 264 | + protected function buildHeadersString ( array $headers ) : string { |
|
| 265 | 265 | $ret = ''; |
| 266 | 266 | foreach ( $headers as $header ) { |
| 267 | 267 | $ret .= "$header\r\n"; |