x-tools / xtools

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/EditCounterHelper.php

Spacing +33 added lines, -33 removed lines

@@ -35,7 +35,7 @@ 
      */
     public function getUserId($usernameOrIp)
     {
-        $cacheKey = 'userid.' . $usernameOrIp;
+        $cacheKey = 'userid.'.$usernameOrIp;
         if ($this->cacheHas($cacheKey)) {
             return $cacheKey;
         }
@@ -60,7 +60,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 {
@@ -76,8 +76,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);
     }
@@ -147,10 +147,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)
         );
@@ -158,8 +158,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.
@@ -171,7 +171,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(
@@ -215,16 +215,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;
@@ -253,17 +253,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',
         ];
@@ -274,9 +274,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.
@@ -302,7 +302,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);
@@ -310,10 +310,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)
         );
@@ -339,8 +339,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"
@@ -355,7 +355,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'];
@@ -366,8 +366,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);
     }
@@ -389,8 +389,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";
@@ -446,10 +446,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);
@@ -490,7 +490,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 "
             . " ";