@@ -255,7 +255,7 @@ |
||
| 255 | 255 | * Adapted from https://github.com/MusikAnimal/pageviews |
| 256 | 256 | * @param array $params Associative array of params to pass to API |
| 257 | 257 | * @param string $project Project to query, e.g. en.wikipedia.org |
| 258 | - * @param string|func $dataKey The key for the main chunk of data, in the query hash |
|
| 258 | + * @param string $dataKey The key for the main chunk of data, in the query hash |
|
| 259 | 259 | * (e.g. 'categorymembers' for API:Categorymembers). |
| 260 | 260 | * If this is a function it is given the response data, |
| 261 | 261 | * and expected to return the data we want to concatentate. |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | public function groups($project, $username) |
| 66 | 66 | { |
| 67 | 67 | $this->setUp($project); |
| 68 | - $params = [ "list"=>"users", "ususers"=>$username, "usprop"=>"groups" ]; |
|
| 68 | + $params = ["list"=>"users", "ususers"=>$username, "usprop"=>"groups"]; |
|
| 69 | 69 | $query = new SimpleRequest('query', $params); |
| 70 | 70 | $result = []; |
| 71 | 71 | |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | public function globalGroups($project, $username) |
| 92 | 92 | { |
| 93 | 93 | $this->setUp($project); |
| 94 | - $params = [ "meta"=>"globaluserinfo", "guiuser"=>$username, "guiprop"=>"groups" ]; |
|
| 94 | + $params = ["meta"=>"globaluserinfo", "guiuser"=>$username, "guiprop"=>"groups"]; |
|
| 95 | 95 | $query = new SimpleRequest('query', $params); |
| 96 | 96 | $result = []; |
| 97 | 97 | |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | $groups[] = "B"; |
| 142 | 142 | } |
| 143 | 143 | if (in_array("steward", $admin["groups"])) { |
| 144 | - $groups[] = "S" ; |
|
| 144 | + $groups[] = "S"; |
|
| 145 | 145 | } |
| 146 | 146 | if (in_array("checkuser", $admin["groups"])) { |
| 147 | 147 | $groups[] = "CU"; |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | if (in_array("bot", $admin["groups"])) { |
| 153 | 153 | $groups[] = "Bot"; |
| 154 | 154 | } |
| 155 | - $result[ $admin["name"] ] = [ |
|
| 155 | + $result[$admin["name"]] = [ |
|
| 156 | 156 | "groups" => implode('/', $groups) |
| 157 | 157 | ]; |
| 158 | 158 | } |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | $normalized = []; |
| 228 | 228 | if (isset($result['query']['normalized'])) { |
| 229 | 229 | array_map( |
| 230 | - function ($e) use (&$normalized) { |
|
| 230 | + function($e) use (&$normalized) { |
|
| 231 | 231 | $normalized[$e['to']] = $e['from']; |
| 232 | 232 | }, |
| 233 | 233 | $result['query']['normalized'] |
@@ -312,7 +312,7 @@ discard block |
||
| 312 | 312 | $query = FluentRequest::factory()->setAction('query')->setParams($requestData); |
| 313 | 313 | $innerPromise = $this->api->getRequestAsync($query); |
| 314 | 314 | |
| 315 | - $innerPromise->then(function ($result) use (&$data) { |
|
| 315 | + $innerPromise->then(function($result) use (&$data) { |
|
| 316 | 316 | // some failures come back as 200s, so we still resolve and let the outer function handle it |
| 317 | 317 | if (isset($result['error']) || !isset($result['query'])) { |
| 318 | 318 | return $data['promise']->resolve($data); |
@@ -10,7 +10,6 @@ |
||
| 10 | 10 | use Xtools\Page; |
| 11 | 11 | use Xtools\PagesRepository; |
| 12 | 12 | use Xtools\Project; |
| 13 | -use Xtools\ProjectRepository; |
|
| 14 | 13 | use Xtools\User; |
| 15 | 14 | |
| 16 | 15 | /** |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | $archiveTable = $projectData->getRepository()->getTableName($dbName, 'archive'); |
| 169 | 169 | |
| 170 | 170 | $condBegin = $start ? " AND rev_timestamp > :start " : null; |
| 171 | - $condEnd = $end ? " AND rev_timestamp < :end ": null; |
|
| 171 | + $condEnd = $end ? " AND rev_timestamp < :end " : null; |
|
| 172 | 172 | |
| 173 | 173 | $regexes = []; |
| 174 | 174 | |
@@ -262,8 +262,8 @@ discard block |
||
| 262 | 262 | } |
| 263 | 263 | |
| 264 | 264 | // Sort the array and do some simple math. |
| 265 | - uasort($results, function ($a, $b) { |
|
| 266 | - return $b['count'] - $a['count']; |
|
| 265 | + uasort($results, function($a, $b) { |
|
| 266 | + return $b['count']-$a['count']; |
|
| 267 | 267 | }); |
| 268 | 268 | |
| 269 | 269 | if ($total != 0) { |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | // If we've got a project and user, redirect to results. |
| 50 | 50 | if ($projectName != '' && $username != '') { |
| 51 | - $routeParams = [ 'project' => $projectName, 'username' => $username ]; |
|
| 51 | + $routeParams = ['project' => $projectName, 'username' => $username]; |
|
| 52 | 52 | return $this->redirectToRoute('SimpleEditCounterResult', $routeParams); |
| 53 | 53 | } |
| 54 | 54 | |
@@ -120,8 +120,8 @@ discard block |
||
| 120 | 120 | $resultQuery->execute(); |
| 121 | 121 | |
| 122 | 122 | if ($resultQuery->errorCode() > 0) { |
| 123 | - $this->addFlash('notice', [ 'no-result', $username ]); |
|
| 124 | - return $this->redirectToRoute('SimpleEditCounterProject', [ 'project' => $project->getDomain() ]); |
|
| 123 | + $this->addFlash('notice', ['no-result', $username]); |
|
| 124 | + return $this->redirectToRoute('SimpleEditCounterProject', ['project' => $project->getDomain()]); |
|
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | // Fetch the result data |
@@ -145,16 +145,16 @@ discard block |
||
| 145 | 145 | $rev = $row['value']; |
| 146 | 146 | } |
| 147 | 147 | if ($row['source'] == 'groups') { |
| 148 | - $groups .= $row['value']. ', '; |
|
| 148 | + $groups .= $row['value'].', '; |
|
| 149 | 149 | } |
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | // Unknown user - If the user is created the $results variable will have 3 entries. |
| 153 | 153 | // This is a workaround to detect non-existent IPs. |
| 154 | 154 | if (count($results) < 3 && $arch == 0 && $rev == 0) { |
| 155 | - $this->addFlash('notice', [ 'no-result', $username ]); |
|
| 155 | + $this->addFlash('notice', ['no-result', $username]); |
|
| 156 | 156 | |
| 157 | - return $this->redirectToRoute('SimpleEditCounterProject', [ 'project' => $project->getDomain() ]); |
|
| 157 | + return $this->redirectToRoute('SimpleEditCounterProject', ['project' => $project->getDomain()]); |
|
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | // Remove the last comma and space |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | 'project' => $project, |
| 184 | 184 | 'id' => $id, |
| 185 | 185 | 'arch' => $arch, |
| 186 | - 'rev' => $rev + $arch, |
|
| 186 | + 'rev' => $rev+$arch, |
|
| 187 | 187 | 'live' => $rev, |
| 188 | 188 | 'groups' => $groups, |
| 189 | 189 | 'globalGroups' => $globalGroups, |
@@ -150,7 +150,7 @@ |
||
| 150 | 150 | // $tableExtension in order to generate the new table name |
| 151 | 151 | if ($this->isLabs() && $tableExtension !== null) { |
| 152 | 152 | $mapped = true; |
| 153 | - $tableName = $tableName . '_' . $tableExtension; |
|
| 153 | + $tableName = $tableName.'_'.$tableExtension; |
|
| 154 | 154 | } elseif ($this->container->hasParameter("app.table.$tableName")) { |
| 155 | 155 | // Use the table specified in the table mapping configuration, if present. |
| 156 | 156 | $mapped = true; |
@@ -7,7 +7,6 @@ |
||
| 7 | 7 | |
| 8 | 8 | use AppBundle\Helper\AutomatedEditsHelper; |
| 9 | 9 | use DateInterval; |
| 10 | -use DateTime; |
|
| 11 | 10 | use Mediawiki\Api\SimpleRequest; |
| 12 | 11 | |
| 13 | 12 | /** |
@@ -146,10 +146,10 @@ discard block |
||
| 146 | 146 | $resultQuery->execute(); |
| 147 | 147 | $results = $resultQuery->fetchAll(); |
| 148 | 148 | $logCounts = array_combine( |
| 149 | - array_map(function ($e) { |
|
| 149 | + array_map(function($e) { |
|
| 150 | 150 | return $e['source']; |
| 151 | 151 | }, $results), |
| 152 | - array_map(function ($e) { |
|
| 152 | + array_map(function($e) { |
|
| 153 | 153 | return $e['value']; |
| 154 | 154 | }, $results) |
| 155 | 155 | ); |
@@ -366,9 +366,9 @@ discard block |
||
| 366 | 366 | $resultQuery->bindParam(":id", $userId); |
| 367 | 367 | $resultQuery->execute(); |
| 368 | 368 | $results = $resultQuery->fetchAll(); |
| 369 | - $namespaceTotals = array_combine(array_map(function ($e) { |
|
| 369 | + $namespaceTotals = array_combine(array_map(function($e) { |
|
| 370 | 370 | return $e['page_namespace']; |
| 371 | - }, $results), array_map(function ($e) { |
|
| 371 | + }, $results), array_map(function($e) { |
|
| 372 | 372 | return $e['total']; |
| 373 | 373 | }, $results)); |
| 374 | 374 | |
@@ -427,7 +427,7 @@ discard block |
||
| 427 | 427 | } |
| 428 | 428 | $queries[] = $sql; |
| 429 | 429 | } |
| 430 | - $sql = "(\n" . join("\n) UNION (\n", $queries) . ")\n"; |
|
| 430 | + $sql = "(\n".join("\n) UNION (\n", $queries).")\n"; |
|
| 431 | 431 | $resultQuery = $this->getProjectsConnection()->prepare($sql); |
| 432 | 432 | $resultQuery->bindParam(":username", $username); |
| 433 | 433 | $resultQuery->execute(); |
@@ -47,8 +47,8 @@ |
||
| 47 | 47 | $this->assertEquals(200, $client->getResponse()->getStatusCode()); |
| 48 | 48 | |
| 49 | 49 | // Check that a correct namespace value was returned |
| 50 | - $response = (array) json_decode($client->getResponse()->getContent()); |
|
| 51 | - $namespaces = (array) $response['namespaces']; |
|
| 50 | + $response = (array)json_decode($client->getResponse()->getContent()); |
|
| 51 | + $namespaces = (array)$response['namespaces']; |
|
| 52 | 52 | $this->assertEquals('Utilisateur', array_values($namespaces)[2]); // User in French |
| 53 | 53 | } |
| 54 | 54 | } |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | 'username' => $username, |
| 79 | 79 | ]); |
| 80 | 80 | } elseif ($projectQuery != "") { |
| 81 | - return $this->redirectToRoute("PagesProject", [ 'project'=>$projectQuery ]); |
|
| 81 | + return $this->redirectToRoute("PagesProject", ['project'=>$projectQuery]); |
|
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | // set default wiki so we can populate the namespace selector |
@@ -207,8 +207,8 @@ discard block |
||
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | if ($total < 1) { |
| 210 | - $this->addFlash('notice', [ 'no-result', $username ]); |
|
| 211 | - return $this->redirectToRoute('PagesProject', [ 'project' => $project ]); |
|
| 210 | + $this->addFlash('notice', ['no-result', $username]); |
|
| 211 | + return $this->redirectToRoute('PagesProject', ['project' => $project]); |
|
| 212 | 212 | } |
| 213 | 213 | |
| 214 | 214 | ksort($pagesByNamespaceByDate); |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | |
| 60 | 60 | /** |
| 61 | 61 | * Get this page's database ID. |
| 62 | - * @return int |
|
| 62 | + * @return \string|null |
|
| 63 | 63 | */ |
| 64 | 64 | public function getId() |
| 65 | 65 | { |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | |
| 70 | 70 | /** |
| 71 | 71 | * Get this page's length in bytes. |
| 72 | - * @return int |
|
| 72 | + * @return \string|null |
|
| 73 | 73 | */ |
| 74 | 74 | public function getLength() |
| 75 | 75 | { |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | |
| 94 | 94 | /** |
| 95 | 95 | * Get the full URL of this page. |
| 96 | - * @return string |
|
| 96 | + * @return \string|null |
|
| 97 | 97 | */ |
| 98 | 98 | public function getUrl() |
| 99 | 99 | { |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | |
| 104 | 104 | /** |
| 105 | 105 | * Get the numerical ID of the namespace of this page. |
| 106 | - * @return int |
|
| 106 | + * @return \string|null |
|
| 107 | 107 | */ |
| 108 | 108 | public function getNamespace() |
| 109 | 109 | { |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | |
| 114 | 114 | /** |
| 115 | 115 | * Get the number of page watchers. |
| 116 | - * @return int |
|
| 116 | + * @return \string|null |
|
| 117 | 117 | */ |
| 118 | 118 | public function getWatchers() |
| 119 | 119 | { |
@@ -378,7 +378,6 @@ discard block |
||
| 378 | 378 | |
| 379 | 379 | /** |
| 380 | 380 | * Get all wikidata items for the page, not just languages of sister projects |
| 381 | - * @param Page $page |
|
| 382 | 381 | * @return int Number of records. |
| 383 | 382 | */ |
| 384 | 383 | public function getWikidataItems() |
@@ -388,7 +387,6 @@ discard block |
||
| 388 | 387 | |
| 389 | 388 | /** |
| 390 | 389 | * Count wikidata items for the page, not just languages of sister projects |
| 391 | - * @param Page $page |
|
| 392 | 390 | * @return int Number of records. |
| 393 | 391 | */ |
| 394 | 392 | public function countWikidataItems() |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | |
| 328 | 328 | $wikidataInfo = $this->getRepository()->getWikidataInfo($this); |
| 329 | 329 | |
| 330 | - $terms = array_map(function ($entry) { |
|
| 330 | + $terms = array_map(function($entry) { |
|
| 331 | 331 | return $entry['term']; |
| 332 | 332 | }, $wikidataInfo); |
| 333 | 333 | |
@@ -338,7 +338,7 @@ discard block |
||
| 338 | 338 | 'prio' => 2, |
| 339 | 339 | 'name' => 'Wikidata', |
| 340 | 340 | 'notice' => "Label for language <em>$lang</em> is missing", // FIXME: i18n |
| 341 | - 'explanation' => "See: <a target='_blank' " . |
|
| 341 | + 'explanation' => "See: <a target='_blank' ". |
|
| 342 | 342 | "href='//www.wikidata.org/wiki/Help:Label'>Help:Label</a>", |
| 343 | 343 | ]; |
| 344 | 344 | } |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | 'prio' => 3, |
| 349 | 349 | 'name' => 'Wikidata', |
| 350 | 350 | 'notice' => "Description for language <em>$lang</em> is missing", // FIXME: i18n |
| 351 | - 'explanation' => "See: <a target='_blank' " . |
|
| 351 | + 'explanation' => "See: <a target='_blank' ". |
|
| 352 | 352 | "href='//www.wikidata.org/wiki/Help:Description'>Help:Description</a>", |
| 353 | 353 | ]; |
| 354 | 354 | } |