x-tools / xtools

src/AppBundle/Controller/ArticleInfoController.php

Doc Comments -1 removed lines

@@ -380,7 +380,6 @@
 
     /**
      * Get the size of the diff
-     * @param  int $rev The index of the revision within $this->pageHistory
      * @return int Size of the diff
      */
     private function getDiffSize($revIndex)

Spacing +22 added lines, -22 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', [
@@ -101,7 +101,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'] : [];
 
@@ -163,8 +163,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'];
     }
@@ -196,7 +196,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();
 
@@ -205,14 +205,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;
@@ -248,10 +248,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'])) {
@@ -297,7 +297,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;
@@ -313,7 +313,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();
@@ -371,7 +371,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();
@@ -391,9 +391,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'];
     }
 
     /**
@@ -413,12 +413,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' => [
@@ -515,7 +515,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']) {
@@ -559,9 +559,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

var/SymfonyRequirements.php

Doc Comments +2 added lines, -2 removed lines

@@ -223,7 +223,7 @@ 
      * Adds a mandatory requirement in form of a php.ini configuration.
      *
      * @param string        $cfgName           The configuration name used for ini_get()
-     * @param bool|callback $evaluation        Either a boolean indicating whether the configuration should evaluate to true or false,
+     * @param boolean|string $evaluation        Either a boolean indicating whether the configuration should evaluate to true or false,
      *                                         or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
      * @param bool          $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
      *                                         This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
@@ -241,7 +241,7 @@ 
      * Adds an optional recommendation in form of a php.ini configuration.
      *
      * @param string        $cfgName           The configuration name used for ini_get()
-     * @param bool|callback $evaluation        Either a boolean indicating whether the configuration should evaluate to true or false,
+     * @param string|false $evaluation        Either a boolean indicating whether the configuration should evaluate to true or false,
      *                                         or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
      * @param bool          $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
      *                                         This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.

Spacing +9 added lines, -9 removed lines

@@ -49,11 +49,11 @@ 
      */
     public function __construct($fulfilled, $testMessage, $helpHtml, $helpText = null, $optional = false)
     {
-        $this->fulfilled = (bool) $fulfilled;
-        $this->testMessage = (string) $testMessage;
-        $this->helpHtml = (string) $helpHtml;
-        $this->helpText = null === $helpText ? strip_tags($this->helpHtml) : (string) $helpText;
-        $this->optional = (bool) $optional;
+        $this->fulfilled = (bool)$fulfilled;
+        $this->testMessage = (string)$testMessage;
+        $this->helpHtml = (string)$helpHtml;
+        $this->helpText = null === $helpText ? strip_tags($this->helpHtml) : (string)$helpText;
+        $this->optional = (bool)$optional;
     }
 
     /**
@@ -544,7 +544,7 @@ 
             );
         }
 
-        $pcreVersion = defined('PCRE_VERSION') ? (float) PCRE_VERSION : null;
+        $pcreVersion = defined('PCRE_VERSION') ? (float)PCRE_VERSION : null;
 
         $this->addRequirement(
             null !== $pcreVersion,
@@ -783,7 +783,7 @@ 
         $unit = '';
         if (!ctype_digit($size)) {
             $unit = strtolower(substr($size, -1, 1));
-            $size = (int) substr($size, 0, -1);
+            $size = (int)substr($size, 0, -1);
         }
         switch ($unit) {
             case 'g':
@@ -793,7 +793,7 @@ 
             case 'k':
                 return $size * 1024;
             default:
-                return (int) $size;
+                return (int)$size;
         }
     }
 
@@ -815,7 +815,7 @@ 
                 continue;
             }
 
-            return (int) $package['version'][1] > 2 ? self::REQUIRED_PHP_VERSION : self::LEGACY_REQUIRED_PHP_VERSION;
+            return (int)$package['version'][1] > 2 ? self::REQUIRED_PHP_VERSION : self::LEGACY_REQUIRED_PHP_VERSION;
         }
 
         return false;

web/app_dev.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 // Feel free to remove this, extend it, or make something more sophisticated.
 if (isset($_SERVER['HTTP_CLIENT_IP'])
     || isset($_SERVER['HTTP_X_FORWARDED_FOR'])
-    || !( in_array(@$_SERVER['REMOTE_ADDR'], [ '127.0.0.1', 'fe80::1', '::1' ]) || php_sapi_name() === 'cli-server' )
+    || !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1']) || php_sapi_name() === 'cli-server')
 ) {
     header('HTTP/1.0 403 Forbidden');
     exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');

xtools_utilities/nonautomated_edits_parse.php

Spacing +4 added lines, -4 removed lines

@@ -15,11 +15,11 @@
 $data = json_decode($file, true);
 
 // Output the contents to the piped file
-print ( "parameters:
+print ("parameters:
   automated_tools:\r\n" );
 foreach ($data as $row) {
-    print "  - " . $row["name"] . ": '" . $row["regex"] . "'\r\n";
+    print "  - ".$row["name"].": '".$row["regex"]."'\r\n";
 }
-print ( "
+print ("
 
-  semi-automated edits source: $url" );
+  semi-automated edits source: $url");

src/AppBundle/Controller/AdminScoreController.php

Spacing +16 added lines, -16 removed lines

@@ -27,9 +27,9 @@ 
         $username = $request->query->get('user');
 
         if ($projectQuery != "" && $username != "") {
-            return $this->redirectToRoute("AdminScoreResult", [ 'project'=>$projectQuery, 'username' => $username ]);
+            return $this->redirectToRoute("AdminScoreResult", ['project'=>$projectQuery, 'username' => $username]);
         } elseif ($projectQuery != "") {
-            return $this->redirectToRoute("AdminScoreProject", [ 'project'=>$projectQuery ]);
+            return $this->redirectToRoute("AdminScoreProject", ['project'=>$projectQuery]);
         }
 
         // Otherwise fall through.
@@ -67,20 +67,20 @@ 
         $archiveTable = $lh->getTable("archive", $dbName);
 
         // MULTIPLIERS (to review)
-        $ACCT_AGE_MULT = 1.25;   # 0 if = 365 jours
-        $EDIT_COUNT_MULT = 1.25;     # 0 if = 10 000
-        $USER_PAGE_MULT = 0.1;     # 0 if =
+        $ACCT_AGE_MULT = 1.25; # 0 if = 365 jours
+        $EDIT_COUNT_MULT = 1.25; # 0 if = 10 000
+        $USER_PAGE_MULT = 0.1; # 0 if =
         $PATROLS_MULT = 1; # 0 if =
-        $BLOCKS_MULT = 1.4;     # 0 if = 10
+        $BLOCKS_MULT = 1.4; # 0 if = 10
         $AFD_MULT = 1.15;
-        $RECENT_ACTIVITY_MULT = 0.9;     # 0 if =
+        $RECENT_ACTIVITY_MULT = 0.9; # 0 if =
         $AIV_MULT = 1.15;
-        $EDIT_SUMMARIES_MULT = 0.8;   # 0 if =
-        $NAMESPACES_MULT = 1.0;     # 0 if =
+        $EDIT_SUMMARIES_MULT = 0.8; # 0 if =
+        $NAMESPACES_MULT = 1.0; # 0 if =
         $PAGES_CREATED_LIVE_MULT = 1.4; # 0 if =
         $PAGES_CREATED_ARCHIVE_MULT = 1.4; # 0 if =
-        $RPP_MULT = 1.15;     # 0 if =
-        $USERRIGHTS_MULT = 0.75;   # 0 if =
+        $RPP_MULT = 1.15; # 0 if =
+        $USERRIGHTS_MULT = 0.75; # 0 if =
 
         // Grab the connection to the replica database (which is separate from the above)
         $conn = $this->get('doctrine')->getManager("replicas")->getConnection();
@@ -154,15 +154,15 @@ 
                 $now = new DateTime();
                 $date = new DateTime($value);
                 $diff = $date->diff($now);
-                $formula = 365*$diff->format("%y")+30*$diff->format("%m")+$diff->format("%d");
+                $formula = 365 * $diff->format("%y")+30 * $diff->format("%m")+$diff->format("%d");
                 $value = $formula-365;
             }
 
             if ($key == "id") {
                 $id = $value;
             } else {
-                $multiplierKey = strtoupper($row["source"] . "_MULT");
-                $multiplier = ( isset($$multiplierKey) ? $$multiplierKey : 1 );
+                $multiplierKey = strtoupper($row["source"]."_MULT");
+                $multiplier = (isset($$multiplierKey) ? $$multiplierKey : 1);
                 $score = max(min($value * $multiplier, 100), -100);
                 $master[$key]["mult"] = $multiplier;
                 $master[$key]["value"] = $value;
@@ -172,8 +172,8 @@ 
         }
 
         if ($id == 0) {
-            $this->addFlash("notice", [ "noresult", $username ]);
-            return $this->redirectToRoute("AdminScore", [ "project"=>$project ]);
+            $this->addFlash("notice", ["noresult", $username]);
+            return $this->redirectToRoute("AdminScore", ["project"=>$project]);
         }
 
         // replace this example code with whatever you need

src/AppBundle/Controller/SimpleEditCounterController.php

Spacing +8 added lines, -8 removed lines

@@ -31,10 +31,10 @@ 
         $username = $request->query->get('user');
 
         if ($projectQuery != "" && $username != "") {
-            $routeParams = [ 'project'=>$projectQuery, 'username' => $username ];
+            $routeParams = ['project'=>$projectQuery, 'username' => $username];
             return $this->redirectToRoute("SimpleEditCounterResult", $routeParams);
         } elseif ($projectQuery != "") {
-            return $this->redirectToRoute("SimpleEditCounterProject", [ 'project'=>$projectQuery ]);
+            return $this->redirectToRoute("SimpleEditCounterProject", ['project'=>$projectQuery]);
         }
 
         // Otherwise fall through.
@@ -89,8 +89,8 @@ 
         $resultQuery->execute();
 
         if ($resultQuery->errorCode() > 0) {
-            $this->addFlash("notice", [ "noresult", $username ]);
-            return $this->redirectToRoute("SimpleEditCounterProject", [ "project"=>$project ]);
+            $this->addFlash("notice", ["noresult", $username]);
+            return $this->redirectToRoute("SimpleEditCounterProject", ["project"=>$project]);
         }
 
         // Fetch the result data
@@ -114,16 +114,16 @@ 
                 $rev = $row["value"];
             }
             if ($row["source"] == "groups") {
-                $groups .= $row["value"]. ", ";
+                $groups .= $row["value"].", ";
             }
         }
 
         // Unknown user - If the user is created the $results variable will have 3 entries.
         // This is a workaround to detect non-existent IPs.
         if (count($results) < 3 && $arch == 0 && $rev == 0) {
-            $this->addFlash('notice', [ "noresult", $username ]);
+            $this->addFlash('notice', ["noresult", $username]);
 
-            return $this->redirectToRoute("SimpleEditCounterProject", [ "project"=>$project ]);
+            return $this->redirectToRoute("SimpleEditCounterProject", ["project"=>$project]);
         }
 
         // Remove the last comma and space
@@ -152,7 +152,7 @@ 
             'project_url' => $url,
             'id' => $id,
             'arch' => $arch,
-            'rev' => $rev + $arch,
+            'rev' => $rev+$arch,
             'live' => $rev,
             'groups' => $groups,
             'globalGroups' => $globalGroups,

src/AppBundle/Helper/PageviewsHelper.php

Spacing +3 added lines, -3 removed lines

@@ -12,8 +12,8 @@ 
         $title = str_replace(' ', '_', $title);
         $client = new GuzzleHttp\Client();
 
-        $url = 'https://wikimedia.org/api/rest_v1/metrics/pageviews/per-article/' .
-            "$project/all-access/user/" . rawurlencode($title) . '/daily/' . $start . '/' . $end;
+        $url = 'https://wikimedia.org/api/rest_v1/metrics/pageviews/per-article/'.
+            "$project/all-access/user/".rawurlencode($title).'/daily/'.$start.'/'.$end;
 
         $res = $client->request('GET', $url);
         return json_decode($res->getBody()->getContents());
@@ -32,7 +32,7 @@ 
         $data = $this->getLastDays($project, $title, $days);
 
         // FIXME: needs to handle gotchas
-        return array_sum(array_map(function ($item) {
+        return array_sum(array_map(function($item) {
             return $item->views;
         }, $data->items));
     }

src/AppBundle/Twig/Extension.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         }
 
         // Find the path, and complain if English doesn't exist.
-        $path = $this->container->getParameter("kernel.root_dir") . '/../i18n';
+        $path = $this->container->getParameter("kernel.root_dir").'/../i18n';
         if (!file_exists("$path/en.json")) {
             throw new Exception("Language directory doesn't exist: $path");
         }

src/AppBundle/Helper/EditCounterHelper.php

Doc Comments +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
 
     /**
      *
-     * @param $username
+     * @param string $username
      * @return integer
      */
     public function getPageCounts($username, $totalRevisions)

Spacing +32 added lines, -32 removed lines

@@ -59,7 +59,7 @@ 
     {
         $topEditCounts = [];
         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 {
@@ -75,8 +75,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);
     }
@@ -146,10 +146,10 @@ 
         }
 
         $revisionCounts = 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)
         );
@@ -157,8 +157,8 @@ 
         // Count the number of days, accounting for when there's zero or one edit.
         $revisionCounts['days'] = 0;
         if (isset($revisionCounts['first']) && isset($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.
@@ -170,7 +170,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'] = round(
@@ -214,16 +214,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;
@@ -252,17 +252,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',
         ];
@@ -273,9 +273,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.
@@ -301,7 +301,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);
@@ -309,10 +309,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)
         );
@@ -337,8 +337,8 @@ 
                 $sql =
                     "SELECT rev_id, rev_comment, rev_timestamp, rev_minor_edit, rev_deleted, "
                     . "     rev_len, rev_parent_id, page_title "
-                    . " 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"
@@ -353,7 +353,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'];
@@ -363,8 +363,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);
     }
@@ -386,8 +386,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";
@@ -443,10 +443,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);
@@ -487,7 +487,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 "
             . " ";