@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | $end = $request->query->get('end'); |
32 | 32 | |
33 | 33 | if ($start != '' && $end != '') { |
34 | - return $this->redirectToRoute('MetaResult', [ 'start' => $start, 'end' => $end ]); |
|
34 | + return $this->redirectToRoute('MetaResult', ['start' => $start, 'end' => $end]); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | return $this->render('meta/index.html.twig', [ |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | $timeline = []; |
74 | 74 | $startObj = new DateTime($start); |
75 | 75 | $endObj = new DateTime($end); |
76 | - $numDays = (int) $endObj->diff($startObj)->format("%a"); |
|
76 | + $numDays = (int)$endObj->diff($startObj)->format("%a"); |
|
77 | 77 | $grandSum = 0; |
78 | 78 | |
79 | 79 | // Generate array of date labels |
@@ -85,17 +85,17 @@ discard block |
||
85 | 85 | |
86 | 86 | foreach ($data as $entry) { |
87 | 87 | if (!isset($totals[$entry['tool']])) { |
88 | - $totals[$entry['tool']] = (int) $entry['count']; |
|
88 | + $totals[$entry['tool']] = (int)$entry['count']; |
|
89 | 89 | |
90 | 90 | // Create arrays for each tool, filled with zeros for each date in the timeline |
91 | 91 | $timeline[$entry['tool']] = array_fill(0, $numDays, 0); |
92 | 92 | } else { |
93 | - $totals[$entry['tool']] += (int) $entry['count']; |
|
93 | + $totals[$entry['tool']] += (int)$entry['count']; |
|
94 | 94 | } |
95 | 95 | |
96 | 96 | $date = new DateTime($entry['date']); |
97 | - $dateIndex = (int) $date->diff($startObj)->format("%a"); |
|
98 | - $timeline[$entry['tool']][$dateIndex] = (int) $entry['count']; |
|
97 | + $dateIndex = (int)$date->diff($startObj)->format("%a"); |
|
98 | + $timeline[$entry['tool']][$dateIndex] = (int)$entry['count']; |
|
99 | 99 | |
100 | 100 | $grandSum += $entry['count']; |
101 | 101 | } |
@@ -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); |
@@ -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; |
@@ -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); |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | * Get metadata about a single page from the API. |
19 | 19 | * @param Project $project The project to which the page belongs. |
20 | 20 | * @param string $pageTitle Page title. |
21 | - * @return string[] Array with some of the following keys: pageid, title, missing, displaytitle, |
|
21 | + * @return string|null Array with some of the following keys: pageid, title, missing, displaytitle, |
|
22 | 22 | * url. |
23 | 23 | */ |
24 | 24 | public function getPageInfo(Project $project, $pageTitle) |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | * Get the statement for a single revision, so that you can iterate row by row. |
97 | 97 | * @param Page $page The page. |
98 | 98 | * @param User|null $user Specify to get only revisions by the given user. |
99 | - * @return Doctrine\DBAL\Driver\PDOStatement |
|
99 | + * @return \Doctrine\DBAL\Driver\Statement |
|
100 | 100 | */ |
101 | 101 | public function getRevisionsStmt(Page $page, User $user = null) |
102 | 102 | { |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | |
323 | 323 | $wikidataId = ltrim($page->getWikidataId(), 'Q'); |
324 | 324 | |
325 | - $sql = "SELECT " . ($count ? 'COUNT(*) AS count' : '*') . " |
|
325 | + $sql = "SELECT ".($count ? 'COUNT(*) AS count' : '*')." |
|
326 | 326 | FROM wikidatawiki_p.wb_items_per_site |
327 | 327 | WHERE ips_item_id = :wikidataId"; |
328 | 328 | |
@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | |
333 | 333 | $result = $resultQuery->fetchAll(); |
334 | 334 | |
335 | - return $count ? (int) $result[0]['count'] : $result; |
|
335 | + return $count ? (int)$result[0]['count'] : $result; |
|
336 | 336 | } |
337 | 337 | |
338 | 338 | /** |
@@ -372,7 +372,7 @@ discard block |
||
372 | 372 | |
373 | 373 | // Transform to associative array by 'type' |
374 | 374 | foreach ($res as $row) { |
375 | - $data[$row['type'] . '_count'] = $row['value']; |
|
375 | + $data[$row['type'].'_count'] = $row['value']; |
|
376 | 376 | } |
377 | 377 | |
378 | 378 | return $data; |
@@ -409,7 +409,7 @@ discard block |
||
409 | 409 | |
410 | 410 | $project = $page->getProject()->getDomain(); |
411 | 411 | |
412 | - $url = 'https://wikimedia.org/api/rest_v1/metrics/pageviews/per-article/' . |
|
412 | + $url = 'https://wikimedia.org/api/rest_v1/metrics/pageviews/per-article/'. |
|
413 | 413 | "$project/all-access/user/$title/daily/$start/$end"; |
414 | 414 | |
415 | 415 | $res = $client->request('GET', $url); |
@@ -389,7 +389,7 @@ |
||
389 | 389 | * The edit previously deemed as having the maximum amount of content added. |
390 | 390 | * This is used to discount content that was reverted. |
391 | 391 | * @var Edit|null |
392 | - */ |
|
392 | + */ |
|
393 | 393 | $prevMaxAddEdit = null; |
394 | 394 | |
395 | 395 | /** |
@@ -80,9 +80,9 @@ discard block |
||
80 | 80 | $article = $request->query->get('article'); |
81 | 81 | |
82 | 82 | if ($projectQuery != '' && $article != '') { |
83 | - return $this->redirectToRoute('ArticleInfoResult', [ 'project'=>$projectQuery, 'article' => $article ]); |
|
83 | + return $this->redirectToRoute('ArticleInfoResult', ['project'=>$projectQuery, 'article' => $article]); |
|
84 | 84 | } elseif ($article != '') { |
85 | - return $this->redirectToRoute('ArticleInfoProject', [ 'project'=>$projectQuery ]); |
|
85 | + return $this->redirectToRoute('ArticleInfoProject', ['project'=>$projectQuery]); |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | if ($projectQuery == '') { |
@@ -120,10 +120,10 @@ discard block |
||
120 | 120 | $rendered = str_replace('"', '\"', trim($rendered)); |
121 | 121 | |
122 | 122 | // Uglify temporary file. |
123 | - $tmpFile = sys_get_temp_dir() . '/xtools_articleinfo_gadget.js'; |
|
123 | + $tmpFile = sys_get_temp_dir().'/xtools_articleinfo_gadget.js'; |
|
124 | 124 | $script = "echo \"$rendered\" | tee $tmpFile >/dev/null && "; |
125 | - $script .= $this->get('kernel')->getRootDir() . |
|
126 | - "/Resources/node_modules/uglify-es/bin/uglifyjs $tmpFile --mangle " . |
|
125 | + $script .= $this->get('kernel')->getRootDir(). |
|
126 | + "/Resources/node_modules/uglify-es/bin/uglifyjs $tmpFile --mangle ". |
|
127 | 127 | "&& rm $tmpFile >/dev/null"; |
128 | 128 | $process = new Process($script); |
129 | 129 | $process->run(); |
@@ -142,10 +142,10 @@ discard block |
||
142 | 142 | $rendered = str_replace('\"', '"', trim($rendered)); |
143 | 143 | |
144 | 144 | // Add comment after uglifying since it removes comments. |
145 | - $rendered = "/**\n * This code was automatically generated and should not " . |
|
146 | - "be manually edited.\n * For updates, please copy and paste from " . |
|
147 | - $this->generateUrl('ArticleInfoGadget', ['uglify' => 1], UrlGeneratorInterface::ABSOLUTE_URL) . |
|
148 | - "\n * Released under GPL v3 license.\n */\n" . $rendered; |
|
145 | + $rendered = "/**\n * This code was automatically generated and should not ". |
|
146 | + "be manually edited.\n * For updates, please copy and paste from ". |
|
147 | + $this->generateUrl('ArticleInfoGadget', ['uglify' => 1], UrlGeneratorInterface::ABSOLUTE_URL). |
|
148 | + "\n * Released under GPL v3 license.\n */\n".$rendered; |
|
149 | 149 | } |
150 | 150 | |
151 | 151 | $response = new \Symfony\Component\HttpFoundation\Response($rendered); |
@@ -245,10 +245,10 @@ discard block |
||
245 | 245 | $userGroupsTable = $this->projectRepo->getTableName($this->dbName, 'user_groups'); |
246 | 246 | $userFromerGroupsTable = $this->projectRepo->getTableName($this->dbName, 'user_former_groups'); |
247 | 247 | $query = "SELECT COUNT(rev_user_text) AS count, rev_user_text AS username, ug_group AS current |
248 | - FROM " . $this->projectRepo->getTableName($this->dbName, 'revision') . " |
|
248 | + FROM " . $this->projectRepo->getTableName($this->dbName, 'revision')." |
|
249 | 249 | LEFT JOIN $userGroupsTable ON rev_user = ug_user |
250 | 250 | LEFT JOIN $userFromerGroupsTable ON rev_user = ufg_user |
251 | - WHERE rev_page = " . $this->pageInfo['page']->getId() . " AND (ug_group = 'bot' OR ufg_group = 'bot') |
|
251 | + WHERE rev_page = ".$this->pageInfo['page']->getId()." AND (ug_group = 'bot' OR ufg_group = 'bot') |
|
252 | 252 | GROUP BY rev_user_text"; |
253 | 253 | $res = $this->conn->query($query)->fetchAll(); |
254 | 254 | |
@@ -257,14 +257,14 @@ discard block |
||
257 | 257 | $sum = 0; |
258 | 258 | foreach ($res as $bot) { |
259 | 259 | $bots[$bot['username']] = [ |
260 | - 'count' => (int) $bot['count'], |
|
260 | + 'count' => (int)$bot['count'], |
|
261 | 261 | 'current' => $bot['current'] === 'bot' |
262 | 262 | ]; |
263 | 263 | $sum += $bot['count']; |
264 | 264 | } |
265 | 265 | |
266 | - uasort($bots, function ($a, $b) { |
|
267 | - return $b['count'] - $a['count']; |
|
266 | + uasort($bots, function($a, $b) { |
|
267 | + return $b['count']-$a['count']; |
|
268 | 268 | }); |
269 | 269 | |
270 | 270 | $this->pageInfo['general']['bot_revision_count'] = $sum; |
@@ -312,10 +312,10 @@ discard block |
||
312 | 312 | |
313 | 313 | if ($info['all'] > 1) { |
314 | 314 | // Number of seconds between first and last edit |
315 | - $secs = $info['last']->getTimestamp() - $info['first']->getTimestamp(); |
|
315 | + $secs = $info['last']->getTimestamp()-$info['first']->getTimestamp(); |
|
316 | 316 | |
317 | 317 | // Average time between edits (in days) |
318 | - $this->pageInfo['editors'][$editor]['atbe'] = $secs / ( 60 * 60 * 24 ); |
|
318 | + $this->pageInfo['editors'][$editor]['atbe'] = $secs / (60 * 60 * 24); |
|
319 | 319 | } |
320 | 320 | |
321 | 321 | if (count($info['sizes'])) { |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | |
331 | 331 | // First sort editors array by the amount of text they added |
332 | 332 | $topTenEditorsByAdded = $this->pageInfo['editors']; |
333 | - uasort($topTenEditorsByAdded, function ($a, $b) { |
|
333 | + uasort($topTenEditorsByAdded, function($a, $b) { |
|
334 | 334 | if ($a['added'] === $b['added']) { |
335 | 335 | return 0; |
336 | 336 | } |
@@ -339,7 +339,7 @@ discard block |
||
339 | 339 | |
340 | 340 | // Then build a new array of top 10 editors by added text, |
341 | 341 | // in the data structure needed for the chart |
342 | - $this->pageInfo['topTenEditorsByAdded'] = array_map(function ($editor) { |
|
342 | + $this->pageInfo['topTenEditorsByAdded'] = array_map(function($editor) { |
|
343 | 343 | $added = $this->pageInfo['editors'][$editor]['added']; |
344 | 344 | return [ |
345 | 345 | 'label' => $editor, |
@@ -364,7 +364,7 @@ discard block |
||
364 | 364 | $title = str_replace(' ', '_', $page->getTitle()); |
365 | 365 | $sql = "SELECT log_action, log_type, log_timestamp AS timestamp |
366 | 366 | FROM $loggingTable |
367 | - WHERE log_namespace = '" . $page->getNamespace() . "' |
|
367 | + WHERE log_namespace = '".$page->getNamespace()."' |
|
368 | 368 | AND log_title = :title AND log_timestamp > 1 |
369 | 369 | AND log_type IN ('delete', 'move', 'protect', 'stable')"; |
370 | 370 | $resultQuery = $this->conn->prepare($sql); |
@@ -489,7 +489,7 @@ discard block |
||
489 | 489 | |
490 | 490 | if ($revCount === 0) { |
491 | 491 | $firstEdit = $edit; |
492 | - $firstEditMonth = mktime(0, 0, 0, (int) $firstEdit->getMonth(), 1, $firstEdit->getYear()); |
|
492 | + $firstEditMonth = mktime(0, 0, 0, (int)$firstEdit->getMonth(), 1, $firstEdit->getYear()); |
|
493 | 493 | } |
494 | 494 | |
495 | 495 | $username = $edit->getUser()->getUsername(); |
@@ -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(); |
@@ -6,7 +6,6 @@ |
||
6 | 6 | namespace Xtools; |
7 | 7 | |
8 | 8 | use DateInterval; |
9 | -use DateTime; |
|
10 | 9 | use Mediawiki\Api\SimpleRequest; |
11 | 10 | |
12 | 11 | /** |
@@ -11,7 +11,6 @@ |
||
11 | 11 | use Symfony\Component\HttpFoundation\Request; |
12 | 12 | use Symfony\Component\HttpFoundation\Response; |
13 | 13 | use Xtools\ProjectRepository; |
14 | -use Xtools\User; |
|
15 | 14 | use Xtools\UserRepository; |
16 | 15 | |
17 | 16 | /** |
@@ -151,8 +151,8 @@ |
||
151 | 151 | // Get individual counts of how many times each tool was used. |
152 | 152 | // This also includes a wikilink to the tool. |
153 | 153 | $toolCounts = $user->getAutomatedCounts($projectData, $namespace, $start, $end); |
154 | - $toolsTotal = array_reduce($toolCounts, function ($a, $b) { |
|
155 | - return $a + $b['count']; |
|
154 | + $toolsTotal = array_reduce($toolCounts, function($a, $b) { |
|
155 | + return $a+$b['count']; |
|
156 | 156 | }); |
157 | 157 | |
158 | 158 | // Query to get combined (semi)automated using for all edits |