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

Spacing +13 added lines, -13 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);
@@ -535,7 +535,7 @@ 
         // calls LabsHelper::databasePrepare() and we've already got that info.
         if ($this->labsHelper->isLabs()) {
             // @TODO This assumes too much. Can be removed after T163527.
-            $projectUrl = $projectUrl . '/w/api.php';
+            $projectUrl = $projectUrl.'/w/api.php';
             $api = MediawikiApi::newFromApiEndpoint($projectUrl);
         } else {
             $api = MediawikiApi::newFromPage($projectUrl);

src/AppBundle/Helper/EditCounterHelper.php

Doc Comments +2 added lines, -1 removed lines

@@ -53,6 +53,7 @@ 
     /**
      * Get total edit counts for the top 10 projects for this user.
      * @param string $username The username.
+     * @param string $projectUrl
      * @return string[] Elements are arrays with 'dbName', 'url', 'name', and 'total'.
      */
     public function getTopProjectsEditCounts($projectUrl, $username, $numProjects = 10)
@@ -176,7 +177,7 @@ 
 
     /**
      *
-     * @param $username
+     * @param string $username
      * @return integer
      */
     public function getPageCounts($username, $totalRevisions)

Spacing +32 added lines, -32 removed lines

@@ -36,7 +36,7 @@ 
     public function getUserId($usernameOrIp)
     {
         $this->debug("Getting ID of $usernameOrIp");
-        $cacheKey = 'userid.' . $usernameOrIp;
+        $cacheKey = 'userid.'.$usernameOrIp;
         if ($this->cacheHas($cacheKey)) {
             return $this->cacheGet($cacheKey);
         }
@@ -60,7 +60,7 @@ 
     public function getTopProjectsEditCounts($projectUrl, $username, $numProjects = 10)
     {
         $this->debug("Getting top project edit counts for $username");
-        $cacheKey = 'topprojectseditcounts.' . $username;
+        $cacheKey = 'topprojectseditcounts.'.$username;
         if ($this->cacheHas($cacheKey)) {
             return $this->cacheGet($cacheKey);
         }
@@ -72,7 +72,7 @@ 
         if (false === $topEditCounts) {
             // If no CentralAuth, fall back to querying each database in turn.
             foreach ($this->labsHelper->getProjectsInfo() as $project) {
-                $this->container->get('logger')->debug('Getting edit count for ' . $project['url']);
+                $this->container->get('logger')->debug('Getting edit count for '.$project['url']);
                 $revisionTableName = $this->labsHelper->getTable('revision', $project['dbName']);
                 $sql = "SELECT COUNT(rev_id) FROM $revisionTableName WHERE rev_user_text=:username";
                 $stmt = $this->replicas->prepare($sql);
@@ -82,8 +82,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'];
         });
         $out = array_slice($topEditCounts, 0, $numProjects);
 
@@ -148,8 +148,8 @@ 
         // Count the number of days, accounting for when there's zero or one edit.
         $revisionCounts['days'] = 0;
         if ($revisionCounts['first'] && $revisionCounts['last']) {
-            $editingTimeInSeconds = strtotime($revisionCounts['last']) - strtotime($revisionCounts['first']);
-            $revisionCounts['days'] = $editingTimeInSeconds ? $editingTimeInSeconds/(60*60*24) : 1;
+            $editingTimeInSeconds = strtotime($revisionCounts['last'])-strtotime($revisionCounts['first']);
+            $revisionCounts['days'] = $editingTimeInSeconds ? $editingTimeInSeconds / (60 * 60 * 24) : 1;
         }
 
         // Format the first and last dates.
@@ -161,7 +161,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;
@@ -208,16 +208,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;
@@ -246,17 +246,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',
         ];
@@ -267,9 +267,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.
@@ -295,7 +295,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);
@@ -303,10 +303,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)
         );
@@ -332,8 +332,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"
@@ -348,7 +348,7 @@ 
                 continue;
             }
             $revsWithProject = array_map(
-                function (&$item) use ($project) {
+                function(&$item) use ($project) {
                     $item['project_name'] = $project['wikiName'];
                     $item['project_url'] = $project['url'];
                     $item['project_db_name'] = $project['dbName'];
@@ -359,8 +359,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, $topN);
     }
@@ -382,8 +382,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";
@@ -439,10 +439,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);
@@ -483,7 +483,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 "
             . " ";

src/AppBundle/Helper/LabsHelper.php

Spacing +4 added lines, -4 removed lines

@@ -76,7 +76,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
@@ -112,7 +112,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;
     }
@@ -125,9 +125,9 @@ 
     public function getProjectsInfo($projectNames = [])
     {
         $wikiQuery = $this->client->createQueryBuilder();
-        $wikiQuery->select([ 'dbName', 'name', 'url', 'lang' ])->from('wiki');
+        $wikiQuery->select(['dbName', 'name', 'url', 'lang'])->from('wiki');
         if ($projectNames) {
-            $wikiQuery->andWhere('dbName IN (:' . join(', :', $projectNames) . ')');
+            $wikiQuery->andWhere('dbName IN (:'.join(', :', $projectNames).')');
         }
         foreach ($projectNames as $projectName) {
             $wikiQuery->setParameter(":$projectName", $projectName);