x-tools / xtools

src/AppBundle/Helper/ApiHelper.php

Spacing +12 added lines, -12 removed lines

@@ -55,7 +55,7 @@ 
     public function groups($project, $username)
     {
         $this->setUp($project);
-        $params = [ "list"=>"users", "ususers"=>$username, "usprop"=>"groups" ];
+        $params = ["list"=>"users", "ususers"=>$username, "usprop"=>"groups"];
         $query = new SimpleRequest('query', $params);
         $result = [];
 
@@ -74,7 +74,7 @@ 
     public function globalGroups($project, $username)
     {
         $this->setUp($project);
-        $params = [ "meta"=>"globaluserinfo", "guiuser"=>$username, "guiprop"=>"groups" ];
+        $params = ["meta"=>"globaluserinfo", "guiuser"=>$username, "guiprop"=>"groups"];
         $query = new SimpleRequest('query', $params);
         $result = [];
 
@@ -104,7 +104,7 @@ 
         }
 
         $this->setUp($project);
-        $query = new SimpleRequest('query', [ "meta"=>"siteinfo", "siprop"=>"namespaces" ]);
+        $query = new SimpleRequest('query', ["meta"=>"siteinfo", "siprop"=>"namespaces"]);
         $namespaces = [];
 
         try {
@@ -160,7 +160,7 @@ 
                 $groups[] = "B";
             }
             if (in_array("steward", $admin["groups"])) {
-                $groups[] = "S" ;
+                $groups[] = "S";
             }
             if (in_array("checkuser", $admin["groups"])) {
                 $groups[] = "CU";
@@ -171,7 +171,7 @@ 
             if (in_array("bot", $admin["groups"])) {
                 $groups[] = "Bot";
             }
-            $result[ $admin["name"] ] = [
+            $result[$admin["name"]] = [
                 "groups" => implode('/', $groups)
             ];
         }
@@ -246,7 +246,7 @@ 
             $normalized = [];
             if (isset($result['query']['normalized'])) {
                 array_map(
-                    function ($e) use (&$normalized) {
+                    function($e) use (&$normalized) {
                         $normalized[$e['to']] = $e['from'];
                     },
                     $result['query']['normalized']
@@ -292,7 +292,7 @@ 
         ];
 
         // get assessments for this page from the API
-        $assessments = $this->massApi($params, $project, function ($data) {
+        $assessments = $this->massApi($params, $project, function($data) {
             return isset($data['pages'][0]['pageassessments']) ? $data['pages'][0]['pageassessments'] : [];
         }, 'pacontinue')['pages'];
 
@@ -316,7 +316,7 @@ 
                 $classAttrs = $config['class']['Unknown'];
                 $assessment['class']['value'] = '???';
                 $assessment['class']['category'] = $classAttrs['category'];
-                $assessment['class']['badge'] = "https://upload.wikimedia.org/wikipedia/commons/". $classAttrs['badge'];
+                $assessment['class']['badge'] = "https://upload.wikimedia.org/wikipedia/commons/".$classAttrs['badge'];
             } else {
                 $classAttrs = $config['class'][$classValue];
                 $assessment['class'] = [
@@ -327,7 +327,7 @@ 
 
                 // add full URL to badge icon
                 if ($classAttrs['badge'] !== '') {
-                    $assessment['class']['badge'] = "https://upload.wikimedia.org/wikipedia/commons/" .
+                    $assessment['class']['badge'] = "https://upload.wikimedia.org/wikipedia/commons/".
                         $classAttrs['badge'];
                 }
 
@@ -376,9 +376,9 @@ 
         $config = $this->getAssessmentsConfig();
 
         if (isset($config[$project]['class'][$class])) {
-            return "https://upload.wikimedia.org/wikipedia/commons/" . $config[$project]['class'][$class]['badge'];
+            return "https://upload.wikimedia.org/wikipedia/commons/".$config[$project]['class'][$class]['badge'];
         } elseif (isset($config[$project]['class']['Unknown'])) {
-            return "https://upload.wikimedia.org/wikipedia/commons/" . $config[$project]['class']['Unknown']['badge'];
+            return "https://upload.wikimedia.org/wikipedia/commons/".$config[$project]['class']['Unknown']['badge'];
         } else {
             return "";
         }
@@ -471,7 +471,7 @@ 
         $query = FluentRequest::factory()->setAction('query')->setParams($requestData);
         $innerPromise = $this->api->getRequestAsync($query);
 
-        $innerPromise->then(function ($result) use (&$data) {
+        $innerPromise->then(function($result) use (&$data) {
             // some failures come back as 200s, so we still resolve and let the outer function handle it
             if (isset($result['error']) || !isset($result['query'])) {
                 return $data['promise']->resolve($data);

src/AppBundle/Controller/EditCounterController.php

Spacing +4 added lines, -4 removed lines

@@ -63,10 +63,10 @@ 
         $username = $request->query->get('username');
 
         if (($project || $queryProject) && $username) {
-            $routeParams = [ 'project'=>($project ?: $queryProject), 'username' => $username ];
+            $routeParams = ['project'=>($project ?: $queryProject), 'username' => $username];
             return $this->redirectToRoute("EditCounterResult", $routeParams);
         } elseif (!$project && $queryProject) {
-            return $this->redirectToRoute("EditCounterProject", [ 'project'=>$queryProject ]);
+            return $this->redirectToRoute("EditCounterProject", ['project'=>$queryProject]);
         }
 
         $this->init($project);
@@ -171,9 +171,9 @@ 
             'rev_small' => $revisionCounts['small'],
             'rev_large' => $revisionCounts['large'],
             'with_comments' => $revisionCounts['with_comments'],
-            'without_comments' => $revisionCounts['live'] - $revisionCounts['with_comments'],
+            'without_comments' => $revisionCounts['live']-$revisionCounts['with_comments'],
             'minor_edits' => $revisionCounts['minor_edits'],
-            'nonminor_edits' => $revisionCounts['live'] - $revisionCounts['minor_edits'],
+            'nonminor_edits' => $revisionCounts['live']-$revisionCounts['minor_edits'],
             'auto_edits_total' => array_sum($automatedEditsSummary),
 
             // Page counts.

src/AppBundle/Controller/ArticleInfoController.php

Spacing +25 added lines, -25 removed lines

@@ -55,9 +55,9 @@ 
         $article = $request->query->get('article');
 
         if ($projectQuery != '' && $article != '') {
-            return $this->redirectToRoute('ArticleInfoResult', [ 'project'=>$projectQuery, 'article' => $article ]);
+            return $this->redirectToRoute('ArticleInfoResult', ['project'=>$projectQuery, 'article' => $article]);
         } elseif ($article != '') {
-            return $this->redirectToRoute('ArticleInfoProject', [ 'project'=>$projectQuery ]);
+            return $this->redirectToRoute('ArticleInfoProject', ['project'=>$projectQuery]);
         }
 
         return $this->render('articleInfo/index.html.twig', [
@@ -102,7 +102,7 @@ 
             'url' => $basicInfo['fullurl']
         ];
 
-        $this->pageInfo['watchers'] = ( isset($basicInfo['watchers']) ) ? $basicInfo['watchers'] : "< 30";
+        $this->pageInfo['watchers'] = (isset($basicInfo['watchers'])) ? $basicInfo['watchers'] : "< 30";
 
         $pageProps = isset($basicInfo['pageprops']) ? $basicInfo['pageprops'] : [];
 
@@ -164,8 +164,8 @@ 
      */
     private function getRevCount()
     {
-        $query = "SELECT COUNT(*) AS count FROM " . $this->revisionTable
-                 . " WHERE rev_page = '" . $this->pageInfo['id'] . "'";
+        $query = "SELECT COUNT(*) AS count FROM ".$this->revisionTable
+                 . " WHERE rev_page = '".$this->pageInfo['id']."'";
         $res = $this->conn->query($query)->fetchAll();
         return $res[0]['count'];
     }
@@ -197,7 +197,7 @@ 
                   FROM $this->revisionTable
                   LEFT JOIN $userGroupsTable ON rev_user = ug_user
                   LEFT JOIN $userFromerGroupsTable ON rev_user = ufg_user
-                  WHERE rev_page = " . $this->pageInfo['id'] . " AND (ug_group = 'bot' OR ufg_group = 'bot')
+                  WHERE rev_page = ".$this->pageInfo['id']." AND (ug_group = 'bot' OR ufg_group = 'bot')
                   GROUP BY rev_user_text";
         $res = $this->conn->query($query)->fetchAll();
 
@@ -206,14 +206,14 @@ 
         $sum = 0;
         foreach ($res as $bot) {
             $bots[$bot['username']] = [
-                'count' => (int) $bot['count'],
+                'count' => (int)$bot['count'],
                 'current' => $bot['current'] === 'bot'
             ];
             $sum += $bot['count'];
         }
 
-        uasort($bots, function ($a, $b) {
-            return $b['count'] - $a['count'];
+        uasort($bots, function($a, $b) {
+            return $b['count']-$a['count'];
         });
 
         $this->pageInfo['general']['bot_revision_count'] = $sum;
@@ -249,10 +249,10 @@ 
 
             if ($info['all'] > 1) {
                 // Number of seconds between first and last edit
-                $secs = intval(strtotime($info['last']) - strtotime($info['first']) / $info['all']);
+                $secs = intval(strtotime($info['last'])-strtotime($info['first']) / $info['all']);
 
                 // Average time between edits (in days)
-                $this->pageInfo['editors'][$editor]['atbe'] = $secs / ( 60 * 60 * 24 );
+                $this->pageInfo['editors'][$editor]['atbe'] = $secs / (60 * 60 * 24);
             }
 
             if (count($info['sizes'])) {
@@ -298,7 +298,7 @@ 
 
         // Transform to associative array by 'type'
         foreach ($res as $row) {
-            $data[$row['type'] . '_count'] = $row['value'];
+            $data[$row['type'].'_count'] = $row['value'];
         }
 
         return $data;
@@ -314,7 +314,7 @@ 
         $title = str_replace(' ', '_', $this->pageInfo['title']);
         $query = "SELECT log_action, log_type, log_timestamp AS timestamp
                   FROM $loggingTable
-                  WHERE log_namespace = '" . $this->pageInfo['namespace'] . "'
+                  WHERE log_namespace = '".$this->pageInfo['namespace']."'
                   AND log_title = '$title' AND log_timestamp > 1
                   AND log_type IN ('delete', 'move', 'protect', 'stable')";
         $events = $this->conn->query($query)->fetchAll();
@@ -395,7 +395,7 @@ 
         $conn = $this->container->get('doctrine')->getManager('replicas')->getConnection();
         $res = $conn->query($query)->fetchAll();
 
-        $terms = array_map(function ($entry) {
+        $terms = array_map(function($entry) {
             return $entry['term'];
         }, $res);
 
@@ -406,7 +406,7 @@ 
                 'prio' => 2,
                 'name' => 'Wikidata',
                 'notice' => "Label for language <em>$lang</em> is missing", // FIXME: i18n
-                'explanation' => "See: <a target='_blank' " .
+                'explanation' => "See: <a target='_blank' ".
                     "href='//www.wikidata.org/wiki/Help:Label'>Help:Label</a>",
             ];
         }
@@ -415,7 +415,7 @@ 
                 'prio' => 3,
                 'name' => 'Wikidata',
                 'notice' => "Description for language <em>$lang</em> is missing", // FIXME: i18n
-                'explanation' => "See: <a target='_blank' " .
+                'explanation' => "See: <a target='_blank' ".
                     "href='//www.wikidata.org/wiki/Help:Description'>Help:Description</a>",
             ];
         }
@@ -432,7 +432,7 @@ 
         $query = "SELECT rev_id, rev_parent_id, rev_user_text, rev_user, rev_timestamp,
                   rev_minor_edit, rev_len, rev_comment
                   FROM $this->revisionTable
-                  WHERE rev_page = '" . $this->pageInfo['id'] . "' AND rev_timestamp > 1
+                  WHERE rev_page = '".$this->pageInfo['id']."' AND rev_timestamp > 1
                   ORDER BY rev_timestamp";
 
         $res = $this->conn->query($query)->fetchAll();
@@ -452,9 +452,9 @@ 
             return $rev['rev_len'];
         }
 
-        $lastRev = $this->pageHistory[$revIndex - 1];
+        $lastRev = $this->pageHistory[$revIndex-1];
 
-        return $rev['rev_len'] - $lastRev['rev_len'];
+        return $rev['rev_len']-$lastRev['rev_len'];
     }
 
     /**
@@ -474,12 +474,12 @@ 
         // The month of the first edit. Used as a comparison when building the per-month data
         $firstEditMonth = strtotime(date('Y-m-01, 00:00', strtotime($firstEdit['rev_timestamp'])));
 
-        $lastEdit = $this->pageHistory[ $revisionCount - 1 ];
-        $secondLastEdit = $revisionCount === 1 ? $lastEdit : $this->pageHistory[ $revisionCount - 2 ];
+        $lastEdit = $this->pageHistory[$revisionCount-1];
+        $secondLastEdit = $revisionCount === 1 ? $lastEdit : $this->pageHistory[$revisionCount-2];
 
         // Now we can start our master array. This one will be HUGE!
         $lastEditSize = ($revisionCount > 1)
-            ? $lastEdit['rev_len'] - $secondLastEdit['rev_len']
+            ? $lastEdit['rev_len']-$secondLastEdit['rev_len']
             : $lastEdit['rev_len'];
         $data = [
             'general' => [
@@ -576,7 +576,7 @@ 
             // Increment year and month counts for all edits
             $data['year_count'][$timestamp['year']]['all']++;
             $data['year_count'][$timestamp['year']]['months'][$timestamp['month']]['all']++;
-            $data['year_count'][$timestamp['year']]['size'] = (int) $rev['rev_len'];
+            $data['year_count'][$timestamp['year']]['size'] = (int)$rev['rev_len'];
 
             $editsThisMonth = $data['year_count'][$timestamp['year']]['months'][$timestamp['month']]['all'];
             if ($editsThisMonth > $data['max_edits_per_month']) {
@@ -620,9 +620,9 @@ 
                 }
 
                 // determine if the next revision was a revert
-                $nextRevision = isset($this->pageHistory[$i + 1]) ? $this->pageHistory[$i + 1] : null;
+                $nextRevision = isset($this->pageHistory[$i+1]) ? $this->pageHistory[$i+1] : null;
                 $nextRevisionIsRevert = $nextRevision &&
-                    $this->getDiffSize($i + 1) === -$diffSize &&
+                    $this->getDiffSize($i+1) === -$diffSize &&
                     $this->aeh->isRevert($nextRevision['rev_comment']);
 
                 // don't count this edit as content removal if the next edit reverted it

src/AppBundle/Twig/WikiExtension.php

Spacing +18 added lines, -18 removed lines

@@ -14,25 +14,25 @@ 
 
     public function intuitionMessage($message = "", $vars = [])
     {
-        return $this->getIntuition()->msg($message, [ "domain" => "xtools", "variables" => $vars ]);
+        return $this->getIntuition()->msg($message, ["domain" => "xtools", "variables" => $vars]);
     }
 
     /*********************************** FUNCTIONS ***********************************/
 
     public function getFunctions()
     {
-        $options = [ 'is_safe' => [ 'html']];
+        $options = ['is_safe' => ['html']];
         return [
-            new Twig_SimpleFunction('wiki_link', [ $this, 'wikiLink' ], $options),
-            new Twig_SimpleFunction('user_link', [ $this, 'userLink' ], $options),
-            new Twig_SimpleFunction('user_log_link', [ $this, 'userLogLink' ], $options),
-            new Twig_SimpleFunction('group_link', [ $this, 'groupLink' ], $options),
-            new Twig_SimpleFunction('wiki_history_link', [ $this, 'wikiHistoryLink' ], $options),
-            new Twig_SimpleFunction('wiki_log_link', [ $this, 'wikiLogLink' ], $options),
-            new Twig_SimpleFunction('pageviews_links', [ $this, 'pageviewsLinks' ], $options),
-            new Twig_SimpleFunction('diff_link', [ $this, 'diffLink' ], $options),
-            new Twig_SimpleFunction('perma_link', [ $this, 'permaLink' ], $options),
-            new Twig_SimpleFunction('edit_link', [ $this, 'editLink' ], $options),
+            new Twig_SimpleFunction('wiki_link', [$this, 'wikiLink'], $options),
+            new Twig_SimpleFunction('user_link', [$this, 'userLink'], $options),
+            new Twig_SimpleFunction('user_log_link', [$this, 'userLogLink'], $options),
+            new Twig_SimpleFunction('group_link', [$this, 'groupLink'], $options),
+            new Twig_SimpleFunction('wiki_history_link', [$this, 'wikiHistoryLink'], $options),
+            new Twig_SimpleFunction('wiki_log_link', [$this, 'wikiLogLink'], $options),
+            new Twig_SimpleFunction('pageviews_links', [$this, 'pageviewsLinks'], $options),
+            new Twig_SimpleFunction('diff_link', [$this, 'diffLink'], $options),
+            new Twig_SimpleFunction('perma_link', [$this, 'permaLink'], $options),
+            new Twig_SimpleFunction('edit_link', [$this, 'editLink'], $options),
         ];
     }
 
@@ -244,9 +244,9 @@ 
     public function getFilters()
     {
         return [
-            new \Twig_SimpleFilter('percent_format', [ $this, 'percentFormat' ]),
-            new \Twig_SimpleFilter('diff_format', [ $this, 'diffFormat' ], [ 'is_safe' => [ 'html' ] ]),
-            new \Twig_SimpleFilter('wikify_comment', [ $this, 'wikifyComment' ], [ 'is_safe' => [ 'html' ] ]),
+            new \Twig_SimpleFilter('percent_format', [$this, 'percentFormat']),
+            new \Twig_SimpleFilter('diff_format', [$this, 'diffFormat'], ['is_safe' => ['html']]),
+            new \Twig_SimpleFilter('wikify_comment', [$this, 'wikifyComment'], ['is_safe' => ['html']]),
         ];
     }
 
@@ -282,10 +282,10 @@ 
         if (!$denominator) {
             $quotient = $numerator;
         } else {
-            $quotient = ( $numerator / $denominator ) * 100;
+            $quotient = ($numerator / $denominator) * 100;
         }
 
-        return round($quotient, $precision) . '%';
+        return round($quotient, $precision).'%';
     }
 
     /**
@@ -303,7 +303,7 @@ 
         if ($isSection) {
             $sectionTitle = $sectionMatch[1][0];
             $sectionTitleLink = str_replace(' ', '_', $sectionTitle);
-            $sectionWikitext = "<a target='_blank' href='$projectUrl/wiki/$title#$sectionTitleLink'>&rarr;</a>" .
+            $sectionWikitext = "<a target='_blank' href='$projectUrl/wiki/$title#$sectionTitleLink'>&rarr;</a>".
                 "<em class='text-muted'>$sectionTitle:</em> ";
             $wikitext = str_replace($sectionMatch[0][0], $sectionWikitext, $wikitext);
         }

src/AppBundle/Controller/TopEditsController.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
                 'username' => $username,
             ]);
         } elseif ($project != "") {
-            return $this->redirectToRoute("TopEditsResults", [ 'project'=>$project ]);
+            return $this->redirectToRoute("TopEditsResults", ['project'=>$project]);
         }
 
         // set default wiki so we can populate the namespace selector
@@ -109,7 +109,7 @@ 
         $editData = $conn->executeQuery($query, $params)->fetchAll();
 
         // Get page info about these 100 pages, so we can use their display title.
-        $titles = array_map(function ($e) {
+        $titles = array_map(function($e) {
             return $e['page_title'];
         }, $editData);
         /** @var ApiHelper $apiHelper */

src/AppBundle/Helper/LabsHelper.php

Spacing +3 added lines, -3 removed lines

@@ -77,7 +77,7 @@ 
             // Create the query we're going to run against the meta database
             $wikiQuery = $this->client->createQueryBuilder();
             $wikiQuery
-                ->select([ 'dbName', 'name', 'url', 'lang' ])
+                ->select(['dbName', 'name', 'url', 'lang'])
                 ->from('wiki')
                 ->where($wikiQuery->expr()->eq('dbname', ':project'))
                 // The meta database will have the project's URL stored as https://en.wikipedia.org
@@ -113,7 +113,7 @@ 
         $this->dbName = $dbName;
         $this->url = $url;
 
-        $dbInfo = [ 'dbName' => $dbName, 'wikiName' => $wikiName, 'url' => $url, 'lang' => $lang ];
+        $dbInfo = ['dbName' => $dbName, 'wikiName' => $wikiName, 'url' => $url, 'lang' => $lang];
         $this->dbInfo[$project] = $dbInfo;
         return $dbInfo;
     }
@@ -124,7 +124,7 @@ 
     public function allProjects()
     {
         $wikiQuery = $this->client->createQueryBuilder();
-        $wikiQuery->select([ 'dbName', 'name', 'url' ])->from('wiki');
+        $wikiQuery->select(['dbName', 'name', 'url'])->from('wiki');
         $stmt = $wikiQuery->execute();
         $out = $stmt->fetchAll();
         return $out;

src/AppBundle/Helper/EditCounterHelper.php

Spacing +31 added lines, -31 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function getUserId($usernameOrIp)
     {
-        $cacheKey = 'userid.' . $usernameOrIp;
+        $cacheKey = 'userid.'.$usernameOrIp;
         if ($this->cacheHas($cacheKey)) {
             return $this->cacheGet($cacheKey);
         }
@@ -63,7 +63,7 @@ 
         /** @var ApiHelper */
         $api = $this->container->get('app.api_helper');
         foreach ($this->labsHelper->allProjects() as $project) {
-            $cacheKey = 'topprojects.' . $project['dbName'] . '.' . $username;
+            $cacheKey = 'topprojects.'.$project['dbName'].'.'.$username;
             if ($this->cacheHas($cacheKey)) {
                 $total = $this->cacheGet($cacheKey);
             } else {
@@ -83,8 +83,8 @@ 
             }
             $topEditCounts[$project['dbName']] = array_merge($project, ['total' => $total]);
         }
-        uasort($topEditCounts, function ($a, $b) {
-            return $b['total'] - $a['total'];
+        uasort($topEditCounts, function($a, $b) {
+            return $b['total']-$a['total'];
         });
         return array_slice($topEditCounts, 0, $numProjects);
     }
@@ -145,8 +145,8 @@ 
         // Count the number of days, accounting for when there's zero or one edit.
         $revisionCounts['days'] = 0;
         if ($revisionCounts['first'] && $revisionCounts['last']) {
-            $editingTimeInSeconds = ceil($revisionCounts['last'] - $revisionCounts['first']);
-            $revisionCounts['days'] = $editingTimeInSeconds ? $editingTimeInSeconds/(60*60*24) : 1;
+            $editingTimeInSeconds = ceil($revisionCounts['last']-$revisionCounts['first']);
+            $revisionCounts['days'] = $editingTimeInSeconds ? $editingTimeInSeconds / (60 * 60 * 24) : 1;
         }
 
         // Format the first and last dates.
@@ -158,7 +158,7 @@ 
             : 0;
 
         // Sum deleted and live to make the total.
-        $revisionCounts['total'] = $revisionCounts['deleted'] + $revisionCounts['live'];
+        $revisionCounts['total'] = $revisionCounts['deleted']+$revisionCounts['live'];
 
         // Calculate the average number of live edits per day.
         $revisionCounts['avg_per_day'] = 0;
@@ -205,16 +205,16 @@ 
         $results = $resultQuery->fetchAll();
 
         $pageCounts = array_combine(
-            array_map(function ($e) {
+            array_map(function($e) {
                 return $e['source'];
             }, $results),
-            array_map(function ($e) {
+            array_map(function($e) {
                 return $e['value'];
             }, $results)
         );
 
         // Total created.
-        $pageCounts['created'] = $pageCounts['created-live'] + $pageCounts['created-deleted'];
+        $pageCounts['created'] = $pageCounts['created-live']+$pageCounts['created-deleted'];
 
         // Calculate the average number of edits per page.
         $pageCounts['edits_per_page'] = 0;
@@ -243,17 +243,17 @@ 
         $resultQuery->execute();
         $results = $resultQuery->fetchAll();
         $logCounts = array_combine(
-            array_map(function ($e) {
+            array_map(function($e) {
                 return $e['source'];
             }, $results),
-            array_map(function ($e) {
+            array_map(function($e) {
                 return $e['value'];
             }, $results)
         );
 
         // Make sure there is some value for each of the wanted counts.
         $requiredCounts = [
-            'thanks-thank', 'review-approve', 'patrol-patrol','block-block', 'block-unblock',
+            'thanks-thank', 'review-approve', 'patrol-patrol', 'block-block', 'block-unblock',
             'protect-protect', 'protect-unprotect', 'delete-delete', 'delete-revision',
             'delete-restore', 'import-import', 'upload-upload', 'upload-overwrite',
         ];
@@ -264,9 +264,9 @@ 
         }
 
         // Merge approvals together.
-        $logCounts['review-approve'] = $logCounts['review-approve'] +
-            (!empty($logCounts['review-approve-a']) ? $logCounts['review-approve-a'] : 0) +
-            (!empty($logCounts['review-approve-i']) ? $logCounts['review-approve-i'] : 0) +
+        $logCounts['review-approve'] = $logCounts['review-approve']+
+            (!empty($logCounts['review-approve-a']) ? $logCounts['review-approve-a'] : 0)+
+            (!empty($logCounts['review-approve-i']) ? $logCounts['review-approve-i'] : 0)+
             (!empty($logCounts['review-approve-ia']) ? $logCounts['review-approve-ia'] : 0);
 
         // Add Commons upload count, if applicable.
@@ -292,7 +292,7 @@ 
     {
         $userId = $this->getUserId($username);
         $sql = "SELECT page_namespace, count(rev_id) AS total
-            FROM ".$this->labsHelper->getTable('revision') ." r
+            FROM ".$this->labsHelper->getTable('revision')." r
                 JOIN ".$this->labsHelper->getTable('page')." p on r.rev_page = p.page_id
             WHERE r.rev_user = :id GROUP BY page_namespace";
         $resultQuery = $this->replicas->prepare($sql);
@@ -300,10 +300,10 @@ 
         $resultQuery->execute();
         $results = $resultQuery->fetchAll();
         $namespaceTotals = array_combine(
-            array_map(function ($e) {
+            array_map(function($e) {
                 return $e['page_namespace'];
             }, $results),
-            array_map(function ($e) {
+            array_map(function($e) {
                 return $e['total'];
             }, $results)
         );
@@ -329,8 +329,8 @@ 
                     "SELECT rev_id, rev_timestamp, UNIX_TIMESTAMP(rev_timestamp) AS unix_timestamp, "
                     . " rev_minor_edit, rev_deleted, rev_len, rev_parent_id, rev_comment, "
                     . " page_title, page_namespace "
-                    . " FROM " . $this->labsHelper->getTable('revision', $project['dbName'])
-                    . "    JOIN " . $this->labsHelper->getTable('page', $project['dbName'])
+                    . " FROM ".$this->labsHelper->getTable('revision', $project['dbName'])
+                    . "    JOIN ".$this->labsHelper->getTable('page', $project['dbName'])
                     . "    ON (rev_page = page_id)"
                     . " WHERE rev_timestamp > NOW() - INTERVAL $days DAY AND rev_user_text LIKE :username"
                     . " ORDER BY rev_timestamp DESC"
@@ -345,7 +345,7 @@ 
                 continue;
             }
             $revsWithProject = array_map(
-                function (&$item) use ($project) {
+                function(&$item) use ($project) {
                     $item['project_name'] = $project['name'];
                     $item['project_url'] = $project['url'];
                     $item['project_db_name'] = $project['dbName'];
@@ -356,8 +356,8 @@ 
             );
             $allRevisions = array_merge($allRevisions, $revsWithProject);
         }
-        usort($allRevisions, function ($a, $b) {
-            return $b['rev_timestamp'] - $a['rev_timestamp'];
+        usort($allRevisions, function($a, $b) {
+            return $b['rev_timestamp']-$a['rev_timestamp'];
         });
         return array_slice($allRevisions, 0, $contribCount);
     }
@@ -379,8 +379,8 @@ 
             . "     MONTH(rev_timestamp) AS `month`,"
             . "     page_namespace,"
             . "     COUNT(rev_id) AS `count` "
-            . " FROM " . $this->labsHelper->getTable('revision')
-            . "    JOIN " . $this->labsHelper->getTable('page') . " ON (rev_page = page_id)"
+            . " FROM ".$this->labsHelper->getTable('revision')
+            . "    JOIN ".$this->labsHelper->getTable('page')." ON (rev_page = page_id)"
             . " WHERE rev_user_text = :username"
             . " GROUP BY YEAR(rev_timestamp), MONTH(rev_timestamp), page_namespace "
             . " ORDER BY rev_timestamp DESC";
@@ -436,10 +436,10 @@ 
             . "     SUBSTR(CAST(rev_timestamp AS CHAR(4)), 1, 4) AS `year`,"
             . "     page_namespace,"
             . "     COUNT(rev_id) AS `count` "
-            . " FROM " . $this->labsHelper->getTable('revision')
-            . "    JOIN " . $this->labsHelper->getTable('page') . " ON (rev_page = page_id)" .
-            " WHERE rev_user_text = :username" .
-            " GROUP BY SUBSTR(CAST(rev_timestamp AS CHAR(4)), 1, 4), page_namespace " .
+            . " FROM ".$this->labsHelper->getTable('revision')
+            . "    JOIN ".$this->labsHelper->getTable('page')." ON (rev_page = page_id)".
+            " WHERE rev_user_text = :username".
+            " GROUP BY SUBSTR(CAST(rev_timestamp AS CHAR(4)), 1, 4), page_namespace ".
             " ORDER BY rev_timestamp DESC ";
         $resultQuery = $this->replicas->prepare($sql);
         $resultQuery->bindParam(":username", $username);
@@ -480,7 +480,7 @@ 
             . "     DAYOFWEEK(rev_timestamp) AS `y`, "
             . "     $xCalc AS `x`, "
             . "     COUNT(rev_id) AS `r` "
-            . " FROM " . $this->labsHelper->getTable('revision')
+            . " FROM ".$this->labsHelper->getTable('revision')
             . " WHERE rev_user_text = :username"
             . " GROUP BY DAYOFWEEK(rev_timestamp), $xCalc "
             . " ";