x-tools / xtools

src/AppBundle/Twig/AppExtension.php

Spacing +56 added lines, -56 removed lines

@@ -16,39 +16,39 @@ 
     {
         $options = ['is_safe' => ['html']];
         return [
-            new \Twig_SimpleFunction('request_time', [ $this, 'requestTime' ], $options),
-            new \Twig_SimpleFunction('memory_usage', [ $this, 'requestMemory' ], $options),
-            new \Twig_SimpleFunction('year', [ $this, 'generateYear' ], $options),
-            new \Twig_SimpleFunction('linkWiki', [ $this, 'linkToWiki' ], $options),
-            new \Twig_SimpleFunction('linkWikiScript', [ $this, 'linkToWikiScript' ], $options),
-            new \Twig_SimpleFunction('msgPrintExists', [ $this, 'intuitionMessagePrintExists' ], $options),
-            new \Twig_SimpleFunction('msgExists', [ $this, 'intuitionMessageExists' ], $options),
-            new \Twig_SimpleFunction('msg', [ $this, 'intuitionMessage' ], $options),
-            new \Twig_SimpleFunction('msg_footer', [ $this, 'intuitionMessageFooter' ], $options),
-            new \Twig_SimpleFunction('lang', [ $this, 'getLang' ], $options),
-            new \Twig_SimpleFunction('langName', [ $this, 'getLangName' ], $options),
-            new \Twig_SimpleFunction('allLangs', [ $this, 'getAllLangs' ]),
-            new \Twig_SimpleFunction('isRTL', [ $this, 'intuitionIsRTL' ]),
-            new \Twig_SimpleFunction('isRTLLang', [ $this, 'intuitionIsRTLLang' ]),
-            new \Twig_SimpleFunction('shortHash', [ $this, 'gitShortHash' ]),
-            new \Twig_SimpleFunction('hash', [ $this, 'gitHash' ]),
-            new \Twig_SimpleFunction('enabled', [ $this, 'tabEnabled' ]),
-            new \Twig_SimpleFunction('tools', [ $this, 'allTools' ]),
-            new \Twig_SimpleFunction('color', [ $this, 'getColorList' ]),
-            new \Twig_SimpleFunction('isWMFLabs', [ $this, 'isWMFLabs' ]),
-            new \Twig_SimpleFunction('isSingleWiki', [ $this, 'isSingleWiki' ]),
-            new \Twig_SimpleFunction('getReplagThreshold', [ $this, 'getReplagThreshold' ]),
-            new \Twig_SimpleFunction('loadStylesheetsFromCDN', [ $this, 'loadStylesheetsFromCDN' ]),
-            new \Twig_SimpleFunction('isWMFLabs', [ $this, 'isWMFLabs' ]),
-            new \Twig_SimpleFunction('replag', [ $this, 'replag' ]),
-            new \Twig_SimpleFunction('link', [ $this, 'link' ]),
+            new \Twig_SimpleFunction('request_time', [$this, 'requestTime'], $options),
+            new \Twig_SimpleFunction('memory_usage', [$this, 'requestMemory'], $options),
+            new \Twig_SimpleFunction('year', [$this, 'generateYear'], $options),
+            new \Twig_SimpleFunction('linkWiki', [$this, 'linkToWiki'], $options),
+            new \Twig_SimpleFunction('linkWikiScript', [$this, 'linkToWikiScript'], $options),
+            new \Twig_SimpleFunction('msgPrintExists', [$this, 'intuitionMessagePrintExists'], $options),
+            new \Twig_SimpleFunction('msgExists', [$this, 'intuitionMessageExists'], $options),
+            new \Twig_SimpleFunction('msg', [$this, 'intuitionMessage'], $options),
+            new \Twig_SimpleFunction('msg_footer', [$this, 'intuitionMessageFooter'], $options),
+            new \Twig_SimpleFunction('lang', [$this, 'getLang'], $options),
+            new \Twig_SimpleFunction('langName', [$this, 'getLangName'], $options),
+            new \Twig_SimpleFunction('allLangs', [$this, 'getAllLangs']),
+            new \Twig_SimpleFunction('isRTL', [$this, 'intuitionIsRTL']),
+            new \Twig_SimpleFunction('isRTLLang', [$this, 'intuitionIsRTLLang']),
+            new \Twig_SimpleFunction('shortHash', [$this, 'gitShortHash']),
+            new \Twig_SimpleFunction('hash', [$this, 'gitHash']),
+            new \Twig_SimpleFunction('enabled', [$this, 'tabEnabled']),
+            new \Twig_SimpleFunction('tools', [$this, 'allTools']),
+            new \Twig_SimpleFunction('color', [$this, 'getColorList']),
+            new \Twig_SimpleFunction('isWMFLabs', [$this, 'isWMFLabs']),
+            new \Twig_SimpleFunction('isSingleWiki', [$this, 'isSingleWiki']),
+            new \Twig_SimpleFunction('getReplagThreshold', [$this, 'getReplagThreshold']),
+            new \Twig_SimpleFunction('loadStylesheetsFromCDN', [$this, 'loadStylesheetsFromCDN']),
+            new \Twig_SimpleFunction('isWMFLabs', [$this, 'isWMFLabs']),
+            new \Twig_SimpleFunction('replag', [$this, 'replag']),
+            new \Twig_SimpleFunction('link', [$this, 'link']),
         ];
     }
 
     public function requestTime($decimals = 3)
     {
 
-        return number_format(microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'], $decimals);
+        return number_format(microtime(true)-$_SERVER['REQUEST_TIME_FLOAT'], $decimals);
     }
 
     public function requestMemory()
@@ -74,7 +74,7 @@ 
      */
     public function linkToWiki($url, $page, $secondary = "")
     {
-        $link = $url . "/";
+        $link = $url."/";
 
         if ($this->isWMFLabs()) {
             $link .= "wiki/";
@@ -91,7 +91,7 @@ 
 
     public function linkToWikiScript($url, $secondary)
     {
-        $link = $url . "/";
+        $link = $url."/";
 
         if ($this->isWMFLabs()) {
             $link .= "w/";
@@ -107,7 +107,7 @@ 
     // TODO: refactor all intuition stuff so it can be used anywhere
     public function intuitionMessageExists($message = "")
     {
-        return $this->getIntuition()->msgExists($message, [ "domain" => "xtools" ]);
+        return $this->getIntuition()->msgExists($message, ["domain" => "xtools"]);
     }
 
     public function intuitionMessagePrintExists($message = "", $vars = [])
@@ -126,7 +126,7 @@ 
 
     public function intuitionMessage($message = "", $vars = [])
     {
-        return $this->getIntuition()->msg($message, [ "domain" => "xtools", "variables" => $vars ]);
+        return $this->getIntuition()->msg($message, ["domain" => "xtools", "variables" => $vars]);
     }
 
     public function intuitionMessageFooter()
@@ -154,10 +154,10 @@ 
      */
     public function getAllLangs()
     {
-        $messageFiles = glob($this->container->getParameter("kernel.root_dir") . '/../i18n/*.json');
+        $messageFiles = glob($this->container->getParameter("kernel.root_dir").'/../i18n/*.json');
 
         $languages = array_values(array_unique(array_map(
-            function ($filename) {
+            function($filename) {
                 return basename($filename, '.json');
             },
             $messageFiles
@@ -214,41 +214,41 @@ 
     public static function getColorList($num = false)
     {
         $colors = [
-            0 => '#Cc0000',# '#FF005A', #red '#FF5555',
+            0 => '#Cc0000', # '#FF005A', #red '#FF5555',
             1 => '#F7b7b7',
-            2 => '#5c8d20',# '#008800', #green'#55FF55',
+            2 => '#5c8d20', # '#008800', #green'#55FF55',
             3 => '#85eD82',
             4 => '#2E97E0', # blue
             5 => '#B9E3F9',
-            6 => '#e1711d',  # orange
+            6 => '#e1711d', # orange
             7 => '#ffc04c',
             8 => '#FDFF98', # yellow
             9 => '#5555FF',
             10 => '#55FFFF',
-            11 => '#0000C0',  #
-            12 => '#008800',  # green
+            11 => '#0000C0', #
+            12 => '#008800', # green
             13 => '#00C0C0',
-            14 => '#FFAFAF',  # rosé
-            15 => '#808080',  # gray
+            14 => '#FFAFAF', # rosé
+            15 => '#808080', # gray
             16 => '#00C000',
             17 => '#404040',
-            18 => '#C0C000',  # green
+            18 => '#C0C000', # green
             19 => '#C000C0',
-            100 => '#75A3D1',  # blue
-            101 => '#A679D2',  # purple
+            100 => '#75A3D1', # blue
+            101 => '#A679D2', # purple
             102 => '#660000',
             103 => '#000066',
-            104 => '#FAFFAF',  # caramel
+            104 => '#FAFFAF', # caramel
             105 => '#408345',
             106 => '#5c8d20',
-            107 => '#e1711d',  # red
-            108 => '#94ef2b',  # light green
-            109 => '#756a4a',  # brown
+            107 => '#e1711d', # red
+            108 => '#94ef2b', # light green
+            109 => '#756a4a', # brown
             110 => '#6f1dab',
             111 => '#301e30',
             112 => '#5c9d96',
-            113 => '#a8cd8c',  # earth green
-            114 => '#f2b3f1',  # light purple
+            113 => '#a8cd8c', # earth green
+            114 => '#f2b3f1', # light purple
             115 => '#9b5828',
             118 => '#99FFFF',
             119 => '#99BBFF',
@@ -269,8 +269,8 @@ 
             446 => '#06DCFB',
             447 => '#892EE4',
             460 => '#99FF66',
-            461 => '#99CC66',  # green
-            470 => '#CCCC33',  # ocker
+            461 => '#99CC66', # green
+            470 => '#CCCC33', # ocker
             471 => '#CCFF33',
             480 => '#6699FF',
             481 => '#66FFFF',
@@ -285,18 +285,18 @@ 
             1198 => '#FF34B3',
             1199 => '#8B1C62',
 
-            '#61a9f3',# blue
-            '#f381b9',# pink
+            '#61a9f3', # blue
+            '#f381b9', # pink
             '#61E3A9',
             '#D56DE2',
             '#85eD82',
             '#F7b7b7',
             '#CFDF49',
             '#88d8f2',
-            '#07AF7B',# green
+            '#07AF7B', # green
             '#B9E3F9',
             '#FFF3AD',
-            '#EF606A',# red
+            '#EF606A', # red
             '#EC8833',
             '#FFF100',
             '#87C9A5',
@@ -413,7 +413,7 @@ 
     public function getFilters()
     {
         return [
-            new \Twig_SimpleFilter('capitalize_first', [ $this, 'capitalizeFirst' ]),
+            new \Twig_SimpleFilter('capitalize_first', [$this, 'capitalizeFirst']),
         ];
     }
 

src/AppBundle/Controller/PagesController.php

Spacing +5 added lines, -5 removed lines

@@ -56,7 +56,7 @@ 
                 'username' => $username,
             ]);
         } elseif ($projectQuery != "") {
-            return $this->redirectToRoute("PagesProject", [ 'project'=>$projectQuery ]);
+            return $this->redirectToRoute("PagesProject", ['project'=>$projectQuery]);
         }
 
         // set default wiki so we can populate the namespace selector
@@ -74,7 +74,7 @@ 
             // show error message and redirect back to default project
             $this->addFlash("notice", [$e->getMessage()]);
             $project = $this->container->getParameter('default_project');
-            return $this->redirectToRoute("PagesProject", [ 'project'=>$project ]);
+            return $this->redirectToRoute("PagesProject", ['project'=>$project]);
         }
 
         // Otherwise fall through.
@@ -183,7 +183,7 @@ 
             JOIN $revisionTable ON page_id = rev_page
             $paJoin
             WHERE $whereRev AND rev_parent_id = '0' $namespaceConditionRev $redirectCondition
-            " . ($hasPageAssessments ? "GROUP BY rev_page" : "") . "
+            ".($hasPageAssessments ? "GROUP BY rev_page" : "")."
             )
 
             UNION
@@ -267,8 +267,8 @@ 
         }
 
         if ($total < 1) {
-            $this->addFlash("notice", [ "noresult", $username ]);
-            return $this->redirectToRoute("PagesProject", [ "project"=>$project ]);
+            $this->addFlash("notice", ["noresult", $username]);
+            return $this->redirectToRoute("PagesProject", ["project"=>$project]);
         }
 
         ksort($pagesByNamespaceByDate);

src/AppBundle/Controller/TopEditsController.php

Spacing +3 added lines, -3 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
@@ -66,7 +66,7 @@ 
             // show error message and redirect back to default project
             $this->addFlash("notice", [$e->getMessage()]);
             $project = $this->container->getParameter('default_project');
-            return $this->redirectToRoute("PagesProject", [ 'project'=>$project ]);
+            return $this->redirectToRoute("PagesProject", ['project'=>$project]);
         }
 
         return $this->render('topedits/index.html.twig', [
@@ -119,7 +119,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/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/Helper/LabsHelper.php

Spacing +4 added lines, -4 removed lines

@@ -61,7 +61,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
@@ -97,7 +97,7 @@ 
         $this->dbName = $dbName;
         $this->url = $url;
 
-        return [ 'dbName' => $dbName, 'wikiName' => $wikiName, 'url' => $url, 'lang' => $lang ];
+        return ['dbName' => $dbName, 'wikiName' => $wikiName, 'url' => $url, 'lang' => $lang];
     }
 
     /**
@@ -106,7 +106,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;
@@ -118,7 +118,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 +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 "
             . " ";