@@ -380,7 +380,6 @@ |
||
| 380 | 380 | |
| 381 | 381 | /** |
| 382 | 382 | * Get the size of the diff |
| 383 | - * @param int $rev The index of the revision within $this->pageHistory |
|
| 384 | 383 | * @return int Size of the diff |
| 385 | 384 | */ |
| 386 | 385 | private function getDiffSize($revIndex) |
@@ -55,9 +55,9 @@ discard block |
||
| 55 | 55 | $article = $request->query->get('article'); |
| 56 | 56 | |
| 57 | 57 | if ($projectQuery != '' && $article != '') { |
| 58 | - return $this->redirectToRoute('ArticleInfoResult', [ 'project'=>$projectQuery, 'article' => $article ]); |
|
| 58 | + return $this->redirectToRoute('ArticleInfoResult', ['project'=>$projectQuery, 'article' => $article]); |
|
| 59 | 59 | } elseif ($article != '') { |
| 60 | - return $this->redirectToRoute('ArticleInfoProject', [ 'project'=>$projectQuery ]); |
|
| 60 | + return $this->redirectToRoute('ArticleInfoProject', ['project'=>$projectQuery]); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | return $this->render('articleInfo/index.html.twig', [ |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | 'url' => $basicInfo['fullurl'] |
| 103 | 103 | ]; |
| 104 | 104 | |
| 105 | - $this->pageInfo['watchers'] = ( isset($basicInfo['watchers']) ) ? $basicInfo['watchers'] : "< 30"; |
|
| 105 | + $this->pageInfo['watchers'] = (isset($basicInfo['watchers'])) ? $basicInfo['watchers'] : "< 30"; |
|
| 106 | 106 | |
| 107 | 107 | $pageProps = isset($basicInfo['pageprops']) ? $basicInfo['pageprops'] : []; |
| 108 | 108 | |
@@ -164,8 +164,8 @@ discard block |
||
| 164 | 164 | */ |
| 165 | 165 | private function getRevCount() |
| 166 | 166 | { |
| 167 | - $query = "SELECT COUNT(*) AS count FROM " . $this->revisionTable |
|
| 168 | - . " WHERE rev_page = '" . $this->pageInfo['id'] . "'"; |
|
| 167 | + $query = "SELECT COUNT(*) AS count FROM ".$this->revisionTable |
|
| 168 | + . " WHERE rev_page = '".$this->pageInfo['id']."'"; |
|
| 169 | 169 | $res = $this->conn->query($query)->fetchAll(); |
| 170 | 170 | return $res[0]['count']; |
| 171 | 171 | } |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | FROM $this->revisionTable |
| 198 | 198 | LEFT JOIN $userGroupsTable ON rev_user = ug_user |
| 199 | 199 | LEFT JOIN $userFromerGroupsTable ON rev_user = ufg_user |
| 200 | - WHERE rev_page = " . $this->pageInfo['id'] . " AND (ug_group = 'bot' OR ufg_group = 'bot') |
|
| 200 | + WHERE rev_page = ".$this->pageInfo['id']." AND (ug_group = 'bot' OR ufg_group = 'bot') |
|
| 201 | 201 | GROUP BY rev_user_text"; |
| 202 | 202 | $res = $this->conn->query($query)->fetchAll(); |
| 203 | 203 | |
@@ -206,14 +206,14 @@ discard block |
||
| 206 | 206 | $sum = 0; |
| 207 | 207 | foreach ($res as $bot) { |
| 208 | 208 | $bots[$bot['username']] = [ |
| 209 | - 'count' => (int) $bot['count'], |
|
| 209 | + 'count' => (int)$bot['count'], |
|
| 210 | 210 | 'current' => $bot['current'] === 'bot' |
| 211 | 211 | ]; |
| 212 | 212 | $sum += $bot['count']; |
| 213 | 213 | } |
| 214 | 214 | |
| 215 | - uasort($bots, function ($a, $b) { |
|
| 216 | - return $b['count'] - $a['count']; |
|
| 215 | + uasort($bots, function($a, $b) { |
|
| 216 | + return $b['count']-$a['count']; |
|
| 217 | 217 | }); |
| 218 | 218 | |
| 219 | 219 | $this->pageInfo['general']['bot_revision_count'] = $sum; |
@@ -249,10 +249,10 @@ discard block |
||
| 249 | 249 | |
| 250 | 250 | if ($info['all'] > 1) { |
| 251 | 251 | // Number of seconds between first and last edit |
| 252 | - $secs = intval(strtotime($info['last']) - strtotime($info['first']) / $info['all']); |
|
| 252 | + $secs = intval(strtotime($info['last'])-strtotime($info['first']) / $info['all']); |
|
| 253 | 253 | |
| 254 | 254 | // Average time between edits (in days) |
| 255 | - $this->pageInfo['editors'][$editor]['atbe'] = $secs / ( 60 * 60 * 24 ); |
|
| 255 | + $this->pageInfo['editors'][$editor]['atbe'] = $secs / (60 * 60 * 24); |
|
| 256 | 256 | } |
| 257 | 257 | |
| 258 | 258 | if (count($info['sizes'])) { |
@@ -298,7 +298,7 @@ discard block |
||
| 298 | 298 | |
| 299 | 299 | // Transform to associative array by 'type' |
| 300 | 300 | foreach ($res as $row) { |
| 301 | - $data[$row['type'] . '_count'] = $row['value']; |
|
| 301 | + $data[$row['type'].'_count'] = $row['value']; |
|
| 302 | 302 | } |
| 303 | 303 | |
| 304 | 304 | return $data; |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | $title = str_replace(' ', '_', $this->pageInfo['title']); |
| 315 | 315 | $query = "SELECT log_action, log_type, log_timestamp AS timestamp |
| 316 | 316 | FROM $loggingTable |
| 317 | - WHERE log_namespace = '" . $this->pageInfo['namespace'] . "' |
|
| 317 | + WHERE log_namespace = '".$this->pageInfo['namespace']."' |
|
| 318 | 318 | AND log_title = '$title' AND log_timestamp > 1 |
| 319 | 319 | AND log_type IN ('delete', 'move', 'protect', 'stable')"; |
| 320 | 320 | $events = $this->conn->query($query)->fetchAll(); |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | $conn = $this->container->get('doctrine')->getManager('replicas')->getConnection(); |
| 396 | 396 | $res = $conn->query($query)->fetchAll(); |
| 397 | 397 | |
| 398 | - $terms = array_map(function ($entry) { |
|
| 398 | + $terms = array_map(function($entry) { |
|
| 399 | 399 | return $entry['term']; |
| 400 | 400 | }, $res); |
| 401 | 401 | |
@@ -406,7 +406,7 @@ discard block |
||
| 406 | 406 | 'prio' => 2, |
| 407 | 407 | 'name' => 'Wikidata', |
| 408 | 408 | 'notice' => "Label for language <em>$lang</em> is missing", // FIXME: i18n |
| 409 | - 'explanation' => "See: <a target='_blank' " . |
|
| 409 | + 'explanation' => "See: <a target='_blank' ". |
|
| 410 | 410 | "href='//www.wikidata.org/wiki/Help:Label'>Help:Label</a>", |
| 411 | 411 | ]; |
| 412 | 412 | } |
@@ -415,7 +415,7 @@ discard block |
||
| 415 | 415 | 'prio' => 3, |
| 416 | 416 | 'name' => 'Wikidata', |
| 417 | 417 | 'notice' => "Description for language <em>$lang</em> is missing", // FIXME: i18n |
| 418 | - 'explanation' => "See: <a target='_blank' " . |
|
| 418 | + 'explanation' => "See: <a target='_blank' ". |
|
| 419 | 419 | "href='//www.wikidata.org/wiki/Help:Description'>Help:Description</a>", |
| 420 | 420 | ]; |
| 421 | 421 | } |
@@ -432,7 +432,7 @@ discard block |
||
| 432 | 432 | $query = "SELECT rev_id, rev_parent_id, rev_user_text, rev_user, rev_timestamp, |
| 433 | 433 | rev_minor_edit, rev_len, rev_comment |
| 434 | 434 | FROM $this->revisionTable |
| 435 | - WHERE rev_page = '" . $this->pageInfo['id'] . "' AND rev_timestamp > 1 |
|
| 435 | + WHERE rev_page = '".$this->pageInfo['id']."' AND rev_timestamp > 1 |
|
| 436 | 436 | ORDER BY rev_timestamp"; |
| 437 | 437 | |
| 438 | 438 | $res = $this->conn->query($query)->fetchAll(); |
@@ -452,9 +452,9 @@ discard block |
||
| 452 | 452 | return $rev['rev_len']; |
| 453 | 453 | } |
| 454 | 454 | |
| 455 | - $lastRev = $this->pageHistory[$revIndex - 1]; |
|
| 455 | + $lastRev = $this->pageHistory[$revIndex-1]; |
|
| 456 | 456 | |
| 457 | - return $rev['rev_len'] - $lastRev['rev_len']; |
|
| 457 | + return $rev['rev_len']-$lastRev['rev_len']; |
|
| 458 | 458 | } |
| 459 | 459 | |
| 460 | 460 | /** |
@@ -474,12 +474,12 @@ discard block |
||
| 474 | 474 | // The month of the first edit. Used as a comparison when building the per-month data |
| 475 | 475 | $firstEditMonth = strtotime(date('Y-m-01, 00:00', strtotime($firstEdit['rev_timestamp']))); |
| 476 | 476 | |
| 477 | - $lastEdit = $this->pageHistory[ $revisionCount - 1 ]; |
|
| 478 | - $secondLastEdit = $revisionCount === 1 ? $lastEdit : $this->pageHistory[ $revisionCount - 2 ]; |
|
| 477 | + $lastEdit = $this->pageHistory[$revisionCount-1]; |
|
| 478 | + $secondLastEdit = $revisionCount === 1 ? $lastEdit : $this->pageHistory[$revisionCount-2]; |
|
| 479 | 479 | |
| 480 | 480 | // Now we can start our master array. This one will be HUGE! |
| 481 | 481 | $lastEditSize = ($revisionCount > 1) |
| 482 | - ? $lastEdit['rev_len'] - $secondLastEdit['rev_len'] |
|
| 482 | + ? $lastEdit['rev_len']-$secondLastEdit['rev_len'] |
|
| 483 | 483 | : $lastEdit['rev_len']; |
| 484 | 484 | $data = [ |
| 485 | 485 | 'general' => [ |
@@ -576,7 +576,7 @@ discard block |
||
| 576 | 576 | // Increment year and month counts for all edits |
| 577 | 577 | $data['year_count'][$timestamp['year']]['all']++; |
| 578 | 578 | $data['year_count'][$timestamp['year']]['months'][$timestamp['month']]['all']++; |
| 579 | - $data['year_count'][$timestamp['year']]['size'] = (int) $rev['rev_len']; |
|
| 579 | + $data['year_count'][$timestamp['year']]['size'] = (int)$rev['rev_len']; |
|
| 580 | 580 | |
| 581 | 581 | $editsThisMonth = $data['year_count'][$timestamp['year']]['months'][$timestamp['month']]['all']; |
| 582 | 582 | if ($editsThisMonth > $data['max_edits_per_month']) { |
@@ -620,9 +620,9 @@ discard block |
||
| 620 | 620 | } |
| 621 | 621 | |
| 622 | 622 | // determine if the next revision was a revert |
| 623 | - $nextRevision = isset($this->pageHistory[$i + 1]) ? $this->pageHistory[$i + 1] : null; |
|
| 623 | + $nextRevision = isset($this->pageHistory[$i+1]) ? $this->pageHistory[$i+1] : null; |
|
| 624 | 624 | $nextRevisionIsRevert = $nextRevision && |
| 625 | - $this->getDiffSize($i + 1) === -$diffSize && |
|
| 625 | + $this->getDiffSize($i+1) === -$diffSize && |
|
| 626 | 626 | $this->aeh->isRevert($nextRevision['rev_comment']); |
| 627 | 627 | |
| 628 | 628 | // don't count this edit as content removal if the next edit reverted it |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | * Adds a mandatory requirement in form of a php.ini configuration. |
| 224 | 224 | * |
| 225 | 225 | * @param string $cfgName The configuration name used for ini_get() |
| 226 | - * @param bool|callback $evaluation Either a boolean indicating whether the configuration should evaluate to true or false, |
|
| 226 | + * @param boolean|string $evaluation Either a boolean indicating whether the configuration should evaluate to true or false, |
|
| 227 | 227 | * or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement |
| 228 | 228 | * @param bool $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false. |
| 229 | 229 | * This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin. |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | * Adds an optional recommendation in form of a php.ini configuration. |
| 242 | 242 | * |
| 243 | 243 | * @param string $cfgName The configuration name used for ini_get() |
| 244 | - * @param bool|callback $evaluation Either a boolean indicating whether the configuration should evaluate to true or false, |
|
| 244 | + * @param string|false $evaluation Either a boolean indicating whether the configuration should evaluate to true or false, |
|
| 245 | 245 | * or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement |
| 246 | 246 | * @param bool $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false. |
| 247 | 247 | * This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin. |
@@ -49,11 +49,11 @@ discard block |
||
| 49 | 49 | */ |
| 50 | 50 | public function __construct($fulfilled, $testMessage, $helpHtml, $helpText = null, $optional = false) |
| 51 | 51 | { |
| 52 | - $this->fulfilled = (bool) $fulfilled; |
|
| 53 | - $this->testMessage = (string) $testMessage; |
|
| 54 | - $this->helpHtml = (string) $helpHtml; |
|
| 55 | - $this->helpText = null === $helpText ? strip_tags($this->helpHtml) : (string) $helpText; |
|
| 56 | - $this->optional = (bool) $optional; |
|
| 52 | + $this->fulfilled = (bool)$fulfilled; |
|
| 53 | + $this->testMessage = (string)$testMessage; |
|
| 54 | + $this->helpHtml = (string)$helpHtml; |
|
| 55 | + $this->helpText = null === $helpText ? strip_tags($this->helpHtml) : (string)$helpText; |
|
| 56 | + $this->optional = (bool)$optional; |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | /** |
@@ -544,7 +544,7 @@ discard block |
||
| 544 | 544 | ); |
| 545 | 545 | } |
| 546 | 546 | |
| 547 | - $pcreVersion = defined('PCRE_VERSION') ? (float) PCRE_VERSION : null; |
|
| 547 | + $pcreVersion = defined('PCRE_VERSION') ? (float)PCRE_VERSION : null; |
|
| 548 | 548 | |
| 549 | 549 | $this->addRequirement( |
| 550 | 550 | null !== $pcreVersion, |
@@ -783,7 +783,7 @@ discard block |
||
| 783 | 783 | $unit = ''; |
| 784 | 784 | if (!ctype_digit($size)) { |
| 785 | 785 | $unit = strtolower(substr($size, -1, 1)); |
| 786 | - $size = (int) substr($size, 0, -1); |
|
| 786 | + $size = (int)substr($size, 0, -1); |
|
| 787 | 787 | } |
| 788 | 788 | switch ($unit) { |
| 789 | 789 | case 'g': |
@@ -793,7 +793,7 @@ discard block |
||
| 793 | 793 | case 'k': |
| 794 | 794 | return $size * 1024; |
| 795 | 795 | default: |
| 796 | - return (int) $size; |
|
| 796 | + return (int)$size; |
|
| 797 | 797 | } |
| 798 | 798 | } |
| 799 | 799 | |
@@ -815,7 +815,7 @@ discard block |
||
| 815 | 815 | continue; |
| 816 | 816 | } |
| 817 | 817 | |
| 818 | - return (int) $package['version'][1] > 2 ? self::REQUIRED_PHP_VERSION : self::LEGACY_REQUIRED_PHP_VERSION; |
|
| 818 | + return (int)$package['version'][1] > 2 ? self::REQUIRED_PHP_VERSION : self::LEGACY_REQUIRED_PHP_VERSION; |
|
| 819 | 819 | } |
| 820 | 820 | |
| 821 | 821 | return false; |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | // Feel free to remove this, extend it, or make something more sophisticated. |
| 13 | 13 | if (isset($_SERVER['HTTP_CLIENT_IP']) |
| 14 | 14 | || isset($_SERVER['HTTP_X_FORWARDED_FOR']) |
| 15 | - || !( in_array(@$_SERVER['REMOTE_ADDR'], [ '127.0.0.1', 'fe80::1', '::1' ]) || php_sapi_name() === 'cli-server' ) |
|
| 15 | + || !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1']) || php_sapi_name() === 'cli-server') |
|
| 16 | 16 | ) { |
| 17 | 17 | header('HTTP/1.0 403 Forbidden'); |
| 18 | 18 | exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.'); |
@@ -15,11 +15,11 @@ |
||
| 15 | 15 | $data = json_decode($file, true); |
| 16 | 16 | |
| 17 | 17 | // Output the contents to the piped file |
| 18 | -print ( "parameters: |
|
| 18 | +print ("parameters: |
|
| 19 | 19 | automated_tools:\r\n" ); |
| 20 | 20 | foreach ($data as $row) { |
| 21 | - print " - " . $row["name"] . ": '" . $row["regex"] . "'\r\n"; |
|
| 21 | + print " - ".$row["name"].": '".$row["regex"]."'\r\n"; |
|
| 22 | 22 | } |
| 23 | -print ( " |
|
| 23 | +print (" |
|
| 24 | 24 | |
| 25 | - semi-automated edits source: $url" ); |
|
| 25 | + semi-automated edits source: $url"); |
|
@@ -31,10 +31,10 @@ discard block |
||
| 31 | 31 | $username = $request->query->get('user'); |
| 32 | 32 | |
| 33 | 33 | if ($projectQuery != "" && $username != "") { |
| 34 | - $routeParams = [ 'project'=>$projectQuery, 'username' => $username ]; |
|
| 34 | + $routeParams = ['project'=>$projectQuery, 'username' => $username]; |
|
| 35 | 35 | return $this->redirectToRoute("SimpleEditCounterResult", $routeParams); |
| 36 | 36 | } elseif ($projectQuery != "") { |
| 37 | - return $this->redirectToRoute("SimpleEditCounterProject", [ 'project'=>$projectQuery ]); |
|
| 37 | + return $this->redirectToRoute("SimpleEditCounterProject", ['project'=>$projectQuery]); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | // Otherwise fall through. |
@@ -89,8 +89,8 @@ discard block |
||
| 89 | 89 | $resultQuery->execute(); |
| 90 | 90 | |
| 91 | 91 | if ($resultQuery->errorCode() > 0) { |
| 92 | - $this->addFlash("notice", [ "noresult", $username ]); |
|
| 93 | - return $this->redirectToRoute("SimpleEditCounterProject", [ "project"=>$project ]); |
|
| 92 | + $this->addFlash("notice", ["noresult", $username]); |
|
| 93 | + return $this->redirectToRoute("SimpleEditCounterProject", ["project"=>$project]); |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | // Fetch the result data |
@@ -114,16 +114,16 @@ discard block |
||
| 114 | 114 | $rev = $row["value"]; |
| 115 | 115 | } |
| 116 | 116 | if ($row["source"] == "groups") { |
| 117 | - $groups .= $row["value"]. ", "; |
|
| 117 | + $groups .= $row["value"].", "; |
|
| 118 | 118 | } |
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | // Unknown user - If the user is created the $results variable will have 3 entries. |
| 122 | 122 | // This is a workaround to detect non-existent IPs. |
| 123 | 123 | if (count($results) < 3 && $arch == 0 && $rev == 0) { |
| 124 | - $this->addFlash('notice', [ "noresult", $username ]); |
|
| 124 | + $this->addFlash('notice', ["noresult", $username]); |
|
| 125 | 125 | |
| 126 | - return $this->redirectToRoute("SimpleEditCounterProject", [ "project"=>$project ]); |
|
| 126 | + return $this->redirectToRoute("SimpleEditCounterProject", ["project"=>$project]); |
|
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | // Remove the last comma and space |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | 'project_url' => $url, |
| 153 | 153 | 'id' => $id, |
| 154 | 154 | 'arch' => $arch, |
| 155 | - 'rev' => $rev + $arch, |
|
| 155 | + 'rev' => $rev+$arch, |
|
| 156 | 156 | 'live' => $rev, |
| 157 | 157 | 'groups' => $groups, |
| 158 | 158 | 'globalGroups' => $globalGroups, |
@@ -12,8 +12,8 @@ discard block |
||
| 12 | 12 | $title = str_replace(' ', '_', $title); |
| 13 | 13 | $client = new GuzzleHttp\Client(); |
| 14 | 14 | |
| 15 | - $url = 'https://wikimedia.org/api/rest_v1/metrics/pageviews/per-article/' . |
|
| 16 | - "$project/all-access/user/" . rawurlencode($title) . '/daily/' . $start . '/' . $end; |
|
| 15 | + $url = 'https://wikimedia.org/api/rest_v1/metrics/pageviews/per-article/'. |
|
| 16 | + "$project/all-access/user/".rawurlencode($title).'/daily/'.$start.'/'.$end; |
|
| 17 | 17 | |
| 18 | 18 | $res = $client->request('GET', $url); |
| 19 | 19 | return json_decode($res->getBody()->getContents()); |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | $data = $this->getLastDays($project, $title, $days); |
| 33 | 33 | |
| 34 | 34 | // FIXME: needs to handle gotchas |
| 35 | - return array_sum(array_map(function ($item) { |
|
| 35 | + return array_sum(array_map(function($item) { |
|
| 36 | 36 | return $item->views; |
| 37 | 37 | }, $data->items)); |
| 38 | 38 | } |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | // Find the path, and complain if English doesn't exist. |
| 48 | - $path = $this->container->getParameter("kernel.root_dir") . '/../i18n'; |
|
| 48 | + $path = $this->container->getParameter("kernel.root_dir").'/../i18n'; |
|
| 49 | 49 | if (!file_exists("$path/en.json")) { |
| 50 | 50 | throw new Exception("Language directory doesn't exist: $path"); |
| 51 | 51 | } |
@@ -146,7 +146,7 @@ |
||
| 146 | 146 | |
| 147 | 147 | /** |
| 148 | 148 | * |
| 149 | - * @param $username |
|
| 149 | + * @param string $username |
|
| 150 | 150 | * @return integer |
| 151 | 151 | */ |
| 152 | 152 | public function getPageCounts($username, $totalRevisions) |
@@ -62,8 +62,8 @@ discard block |
||
| 62 | 62 | $total = (int)$stmt->fetchColumn(); |
| 63 | 63 | $topEditCounts[$project['dbName']] = array_merge($project, ['total' => $total]); |
| 64 | 64 | } |
| 65 | - uasort($topEditCounts, function ($a, $b) { |
|
| 66 | - return $b['total'] - $a['total']; |
|
| 65 | + uasort($topEditCounts, function($a, $b) { |
|
| 66 | + return $b['total']-$a['total']; |
|
| 67 | 67 | }); |
| 68 | 68 | return array_slice($topEditCounts, 0, $numProjects); |
| 69 | 69 | } |
@@ -133,10 +133,10 @@ discard block |
||
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | $revisionCounts = array_combine( |
| 136 | - array_map(function ($e) { |
|
| 136 | + array_map(function($e) { |
|
| 137 | 137 | return $e['source']; |
| 138 | 138 | }, $results), |
| 139 | - array_map(function ($e) { |
|
| 139 | + array_map(function($e) { |
|
| 140 | 140 | return $e['value']; |
| 141 | 141 | }, $results) |
| 142 | 142 | ); |
@@ -144,8 +144,8 @@ discard block |
||
| 144 | 144 | // Count the number of days, accounting for when there's zero or one edit. |
| 145 | 145 | $revisionCounts['days'] = 0; |
| 146 | 146 | if (isset($revisionCounts['first']) && isset($revisionCounts['last'])) { |
| 147 | - $editingTimeInSeconds = ceil($revisionCounts['last'] - $revisionCounts['first']); |
|
| 148 | - $revisionCounts['days'] = $editingTimeInSeconds ? $editingTimeInSeconds/(60*60*24) : 1; |
|
| 147 | + $editingTimeInSeconds = ceil($revisionCounts['last']-$revisionCounts['first']); |
|
| 148 | + $revisionCounts['days'] = $editingTimeInSeconds ? $editingTimeInSeconds / (60 * 60 * 24) : 1; |
|
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | // Format the first and last dates. |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | : 0; |
| 158 | 158 | |
| 159 | 159 | // Sum deleted and live to make the total. |
| 160 | - $revisionCounts['total'] = $revisionCounts['deleted'] + $revisionCounts['live']; |
|
| 160 | + $revisionCounts['total'] = $revisionCounts['deleted']+$revisionCounts['live']; |
|
| 161 | 161 | |
| 162 | 162 | // Calculate the average number of live edits per day. |
| 163 | 163 | $revisionCounts['avg_per_day'] = round( |
@@ -196,16 +196,16 @@ discard block |
||
| 196 | 196 | $results = $resultQuery->fetchAll(); |
| 197 | 197 | |
| 198 | 198 | $pageCounts = array_combine( |
| 199 | - array_map(function ($e) { |
|
| 199 | + array_map(function($e) { |
|
| 200 | 200 | return $e['source']; |
| 201 | 201 | }, $results), |
| 202 | - array_map(function ($e) { |
|
| 202 | + array_map(function($e) { |
|
| 203 | 203 | return $e['value']; |
| 204 | 204 | }, $results) |
| 205 | 205 | ); |
| 206 | 206 | |
| 207 | 207 | // Total created. |
| 208 | - $pageCounts['created'] = $pageCounts['created-live'] + $pageCounts['created-deleted']; |
|
| 208 | + $pageCounts['created'] = $pageCounts['created-live']+$pageCounts['created-deleted']; |
|
| 209 | 209 | |
| 210 | 210 | // Calculate the average number of edits per page. |
| 211 | 211 | $pageCounts['edits_per_page'] = 0; |
@@ -232,17 +232,17 @@ discard block |
||
| 232 | 232 | $resultQuery->execute(); |
| 233 | 233 | $results = $resultQuery->fetchAll(); |
| 234 | 234 | $logCounts = array_combine( |
| 235 | - array_map(function ($e) { |
|
| 235 | + array_map(function($e) { |
|
| 236 | 236 | return $e['source']; |
| 237 | 237 | }, $results), |
| 238 | - array_map(function ($e) { |
|
| 238 | + array_map(function($e) { |
|
| 239 | 239 | return $e['value']; |
| 240 | 240 | }, $results) |
| 241 | 241 | ); |
| 242 | 242 | |
| 243 | 243 | // Make sure there is some value for each of the wanted counts. |
| 244 | 244 | $requiredCounts = [ |
| 245 | - 'thanks-thank', 'review-approve', 'patrol-patrol','block-block', 'block-unblock', |
|
| 245 | + 'thanks-thank', 'review-approve', 'patrol-patrol', 'block-block', 'block-unblock', |
|
| 246 | 246 | 'protect-protect', 'protect-unprotect', 'delete-delete', 'delete-revision', |
| 247 | 247 | 'delete-restore', 'import-import', 'upload-upload', 'upload-overwrite', |
| 248 | 248 | ]; |
@@ -253,9 +253,9 @@ discard block |
||
| 253 | 253 | } |
| 254 | 254 | |
| 255 | 255 | // Merge approvals together. |
| 256 | - $logCounts['review-approve'] = $logCounts['review-approve'] + |
|
| 257 | - (!empty($logCounts['review-approve-a']) ? $logCounts['review-approve-a'] : 0) + |
|
| 258 | - (!empty($logCounts['review-approve-i']) ? $logCounts['review-approve-i'] : 0) + |
|
| 256 | + $logCounts['review-approve'] = $logCounts['review-approve']+ |
|
| 257 | + (!empty($logCounts['review-approve-a']) ? $logCounts['review-approve-a'] : 0)+ |
|
| 258 | + (!empty($logCounts['review-approve-i']) ? $logCounts['review-approve-i'] : 0)+ |
|
| 259 | 259 | (!empty($logCounts['review-approve-ia']) ? $logCounts['review-approve-ia'] : 0); |
| 260 | 260 | |
| 261 | 261 | // Add Commons upload count, if applicable. |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | public function getNamespaceTotals($userId) |
| 281 | 281 | { |
| 282 | 282 | $sql = "SELECT page_namespace, count(rev_id) AS total |
| 283 | - FROM ".$this->labsHelper->getTable('revision') ." r |
|
| 283 | + FROM ".$this->labsHelper->getTable('revision')." r |
|
| 284 | 284 | JOIN ".$this->labsHelper->getTable('page')." p on r.rev_page = p.page_id |
| 285 | 285 | WHERE r.rev_user = :id GROUP BY page_namespace"; |
| 286 | 286 | $resultQuery = $this->replicas->prepare($sql); |
@@ -288,10 +288,10 @@ discard block |
||
| 288 | 288 | $resultQuery->execute(); |
| 289 | 289 | $results = $resultQuery->fetchAll(); |
| 290 | 290 | $namespaceTotals = array_combine( |
| 291 | - array_map(function ($e) { |
|
| 291 | + array_map(function($e) { |
|
| 292 | 292 | return $e['page_namespace']; |
| 293 | 293 | }, $results), |
| 294 | - array_map(function ($e) { |
|
| 294 | + array_map(function($e) { |
|
| 295 | 295 | return $e['total']; |
| 296 | 296 | }, $results) |
| 297 | 297 | ); |
@@ -316,8 +316,8 @@ discard block |
||
| 316 | 316 | $sql = |
| 317 | 317 | "SELECT rev_id, rev_comment, rev_timestamp, rev_minor_edit, rev_deleted, " |
| 318 | 318 | . " rev_len, rev_parent_id, page_title " |
| 319 | - . " FROM " . $this->labsHelper->getTable('revision', $project['dbName']) |
|
| 320 | - . " JOIN " . $this->labsHelper->getTable('page', $project['dbName']) |
|
| 319 | + . " FROM ".$this->labsHelper->getTable('revision', $project['dbName']) |
|
| 320 | + . " JOIN ".$this->labsHelper->getTable('page', $project['dbName']) |
|
| 321 | 321 | . " ON (rev_page = page_id)" |
| 322 | 322 | . " WHERE rev_timestamp > NOW() - INTERVAL $days DAY AND rev_user_text LIKE :username" |
| 323 | 323 | . " ORDER BY rev_timestamp DESC" |
@@ -332,7 +332,7 @@ discard block |
||
| 332 | 332 | continue; |
| 333 | 333 | } |
| 334 | 334 | $revsWithProject = array_map( |
| 335 | - function (&$item) use ($project) { |
|
| 335 | + function(&$item) use ($project) { |
|
| 336 | 336 | $item['project_name'] = $project['name']; |
| 337 | 337 | $item['project_url'] = $project['url']; |
| 338 | 338 | $item['project_db_name'] = $project['dbName']; |
@@ -342,8 +342,8 @@ discard block |
||
| 342 | 342 | ); |
| 343 | 343 | $allRevisions = array_merge($allRevisions, $revsWithProject); |
| 344 | 344 | } |
| 345 | - usort($allRevisions, function ($a, $b) { |
|
| 346 | - return $b['rev_timestamp'] - $a['rev_timestamp']; |
|
| 345 | + usort($allRevisions, function($a, $b) { |
|
| 346 | + return $b['rev_timestamp']-$a['rev_timestamp']; |
|
| 347 | 347 | }); |
| 348 | 348 | return array_slice($allRevisions, 0, $contribCount); |
| 349 | 349 | } |
@@ -365,8 +365,8 @@ discard block |
||
| 365 | 365 | . " MONTH(rev_timestamp) AS `month`," |
| 366 | 366 | . " page_namespace," |
| 367 | 367 | . " COUNT(rev_id) AS `count` " |
| 368 | - . " FROM " . $this->labsHelper->getTable('revision') |
|
| 369 | - . " JOIN " . $this->labsHelper->getTable('page') . " ON (rev_page = page_id)" |
|
| 368 | + . " FROM ".$this->labsHelper->getTable('revision') |
|
| 369 | + . " JOIN ".$this->labsHelper->getTable('page')." ON (rev_page = page_id)" |
|
| 370 | 370 | . " WHERE rev_user_text = :username" |
| 371 | 371 | . " GROUP BY YEAR(rev_timestamp), MONTH(rev_timestamp), page_namespace " |
| 372 | 372 | . " ORDER BY rev_timestamp DESC"; |
@@ -422,10 +422,10 @@ discard block |
||
| 422 | 422 | . " SUBSTR(CAST(rev_timestamp AS CHAR(4)), 1, 4) AS `year`," |
| 423 | 423 | . " page_namespace," |
| 424 | 424 | . " COUNT(rev_id) AS `count` " |
| 425 | - . " FROM " . $this->labsHelper->getTable('revision') |
|
| 426 | - . " JOIN " . $this->labsHelper->getTable('page') . " ON (rev_page = page_id)" . |
|
| 427 | - " WHERE rev_user_text = :username" . |
|
| 428 | - " GROUP BY SUBSTR(CAST(rev_timestamp AS CHAR(4)), 1, 4), page_namespace " . |
|
| 425 | + . " FROM ".$this->labsHelper->getTable('revision') |
|
| 426 | + . " JOIN ".$this->labsHelper->getTable('page')." ON (rev_page = page_id)". |
|
| 427 | + " WHERE rev_user_text = :username". |
|
| 428 | + " GROUP BY SUBSTR(CAST(rev_timestamp AS CHAR(4)), 1, 4), page_namespace ". |
|
| 429 | 429 | " ORDER BY rev_timestamp DESC "; |
| 430 | 430 | $resultQuery = $this->replicas->prepare($sql); |
| 431 | 431 | $resultQuery->bindParam(":username", $username); |
@@ -466,7 +466,7 @@ discard block |
||
| 466 | 466 | . " DAYOFWEEK(rev_timestamp) AS `y`, " |
| 467 | 467 | . " $xCalc AS `x`, " |
| 468 | 468 | . " COUNT(rev_id) AS `r` " |
| 469 | - . " FROM " . $this->labsHelper->getTable('revision') |
|
| 469 | + . " FROM ".$this->labsHelper->getTable('revision') |
|
| 470 | 470 | . " WHERE rev_user_text = :username" |
| 471 | 471 | . " GROUP BY DAYOFWEEK(rev_timestamp), $xCalc " |
| 472 | 472 | . " "; |
@@ -72,7 +72,6 @@ discard block |
||
| 72 | 72 | |
| 73 | 73 | /** |
| 74 | 74 | * Get a link to the given user's userpage, or to Special:Contribs if $username is an IP |
| 75 | - * @param string $username Username |
|
| 76 | 75 | * @param string $projectUrl Project domain and protocol such as https://en.wikipedia.org |
| 77 | 76 | * @param string [$label] The link text, defaults to $username |
| 78 | 77 | * @return string Markup |
@@ -176,7 +175,7 @@ discard block |
||
| 176 | 175 | /** |
| 177 | 176 | * Get links to pageviews tools for the given page |
| 178 | 177 | * @param string $title Title of page |
| 179 | - * @param string $projectUrl Project domain such as en.wikipedia.org |
|
| 178 | + * @param string $project Project domain such as en.wikipedia.org |
|
| 180 | 179 | * @return string Markup |
| 181 | 180 | */ |
| 182 | 181 | public function pageviewsLinks($title, $project) |
@@ -14,25 +14,25 @@ discard block |
||
| 14 | 14 | |
| 15 | 15 | public function intuitionMessage($message = "", $vars = []) |
| 16 | 16 | { |
| 17 | - return $this->getIntuition()->msg($message, [ "domain" => "xtools", "variables" => $vars ]); |
|
| 17 | + return $this->getIntuition()->msg($message, ["domain" => "xtools", "variables" => $vars]); |
|
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | /*********************************** FUNCTIONS ***********************************/ |
| 21 | 21 | |
| 22 | 22 | public function getFunctions() |
| 23 | 23 | { |
| 24 | - $options = [ 'is_safe' => [ 'html']]; |
|
| 24 | + $options = ['is_safe' => ['html']]; |
|
| 25 | 25 | return [ |
| 26 | - new Twig_SimpleFunction('wiki_link', [ $this, 'wikiLink' ], $options), |
|
| 27 | - new Twig_SimpleFunction('user_link', [ $this, 'userLink' ], $options), |
|
| 28 | - new Twig_SimpleFunction('user_log_link', [ $this, 'userLogLink' ], $options), |
|
| 29 | - new Twig_SimpleFunction('group_link', [ $this, 'groupLink' ], $options), |
|
| 30 | - new Twig_SimpleFunction('wiki_history_link', [ $this, 'wikiHistoryLink' ], $options), |
|
| 31 | - new Twig_SimpleFunction('wiki_log_link', [ $this, 'wikiLogLink' ], $options), |
|
| 32 | - new Twig_SimpleFunction('pageviews_links', [ $this, 'pageviewsLinks' ], $options), |
|
| 33 | - new Twig_SimpleFunction('diff_link', [ $this, 'diffLink' ], $options), |
|
| 34 | - new Twig_SimpleFunction('perma_link', [ $this, 'permaLink' ], $options), |
|
| 35 | - new Twig_SimpleFunction('edit_link', [ $this, 'editLink' ], $options), |
|
| 26 | + new Twig_SimpleFunction('wiki_link', [$this, 'wikiLink'], $options), |
|
| 27 | + new Twig_SimpleFunction('user_link', [$this, 'userLink'], $options), |
|
| 28 | + new Twig_SimpleFunction('user_log_link', [$this, 'userLogLink'], $options), |
|
| 29 | + new Twig_SimpleFunction('group_link', [$this, 'groupLink'], $options), |
|
| 30 | + new Twig_SimpleFunction('wiki_history_link', [$this, 'wikiHistoryLink'], $options), |
|
| 31 | + new Twig_SimpleFunction('wiki_log_link', [$this, 'wikiLogLink'], $options), |
|
| 32 | + new Twig_SimpleFunction('pageviews_links', [$this, 'pageviewsLinks'], $options), |
|
| 33 | + new Twig_SimpleFunction('diff_link', [$this, 'diffLink'], $options), |
|
| 34 | + new Twig_SimpleFunction('perma_link', [$this, 'permaLink'], $options), |
|
| 35 | + new Twig_SimpleFunction('edit_link', [$this, 'editLink'], $options), |
|
| 36 | 36 | ]; |
| 37 | 37 | } |
| 38 | 38 | |
@@ -244,9 +244,9 @@ discard block |
||
| 244 | 244 | public function getFilters() |
| 245 | 245 | { |
| 246 | 246 | return [ |
| 247 | - new \Twig_SimpleFilter('percent_format', [ $this, 'percentFormat' ]), |
|
| 248 | - new \Twig_SimpleFilter('diff_format', [ $this, 'diffFormat' ], [ 'is_safe' => [ 'html' ] ]), |
|
| 249 | - new \Twig_SimpleFilter('wikify_comment', [ $this, 'wikifyComment' ], [ 'is_safe' => [ 'html' ] ]), |
|
| 247 | + new \Twig_SimpleFilter('percent_format', [$this, 'percentFormat']), |
|
| 248 | + new \Twig_SimpleFilter('diff_format', [$this, 'diffFormat'], ['is_safe' => ['html']]), |
|
| 249 | + new \Twig_SimpleFilter('wikify_comment', [$this, 'wikifyComment'], ['is_safe' => ['html']]), |
|
| 250 | 250 | ]; |
| 251 | 251 | } |
| 252 | 252 | |
@@ -282,10 +282,10 @@ discard block |
||
| 282 | 282 | if (!$denominator) { |
| 283 | 283 | $quotient = $numerator; |
| 284 | 284 | } else { |
| 285 | - $quotient = ( $numerator / $denominator ) * 100; |
|
| 285 | + $quotient = ($numerator / $denominator) * 100; |
|
| 286 | 286 | } |
| 287 | 287 | |
| 288 | - return round($quotient, $precision) . '%'; |
|
| 288 | + return round($quotient, $precision).'%'; |
|
| 289 | 289 | } |
| 290 | 290 | |
| 291 | 291 | /** |
@@ -303,7 +303,7 @@ discard block |
||
| 303 | 303 | if ($isSection) { |
| 304 | 304 | $sectionTitle = $sectionMatch[1][0]; |
| 305 | 305 | $sectionTitleLink = str_replace(' ', '_', $sectionTitle); |
| 306 | - $sectionWikitext = "<a target='_blank' href='$projectUrl/wiki/$title#$sectionTitleLink'>→</a>" . |
|
| 306 | + $sectionWikitext = "<a target='_blank' href='$projectUrl/wiki/$title#$sectionTitleLink'>→</a>". |
|
| 307 | 307 | "<em class='text-muted'>$sectionTitle:</em> "; |
| 308 | 308 | $wikitext = str_replace($sectionMatch[0][0], $sectionWikitext, $wikitext); |
| 309 | 309 | } |