x-tools / xtools

src/AppBundle/Helper/ApiHelper.php

Doc Comments +7 added lines, -1 removed lines

@@ -34,6 +34,9 @@ 
         }
     }
 
+    /**
+     * @param string $username
+     */
     public function groups($project, $username)
     {
         $cacheKey = "groups.$project.$username";
@@ -59,6 +62,9 @@ 
         return $result;
     }
 
+    /**
+     * @param string $username
+     */
     public function globalGroups($project, $username)
     {
         $cacheKey = "globalgroups.$project.$username";
@@ -363,7 +369,7 @@ 
      * Adapted from https://github.com/MusikAnimal/pageviews
      * @param  array       $params        Associative array of params to pass to API
      * @param  string      $project       Project to query, e.g. en.wikipedia.org
-     * @param  string|func $dataKey       The key for the main chunk of data, in the query hash
+     * @param  \Closure $dataKey       The key for the main chunk of data, in the query hash
      *                                    (e.g. 'categorymembers' for API:Categorymembers).
      *                                    If this is a function it is given the response data,
      *                                    and expected to return the data we want to concatentate.

Unused Use Statements -2 removed lines

@@ -2,11 +2,9 @@
 
 namespace AppBundle\Helper;
 
-use DateInterval;
 use Mediawiki\Api\MediawikiApi;
 use Mediawiki\Api\SimpleRequest;
 use Mediawiki\Api\FluentRequest;
-use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Config\Definition\Exception\Exception;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 

Spacing +8 added lines, -8 removed lines

@@ -42,7 +42,7 @@ 
         }
 
         $this->setUp($project);
-        $params = [ "list"=>"users", "ususers"=>$username, "usprop"=>"groups" ];
+        $params = ["list"=>"users", "ususers"=>$username, "usprop"=>"groups"];
         $query = new SimpleRequest('query', $params);
         $result = [];
 
@@ -67,7 +67,7 @@ 
         }
 
         $this->setUp($project);
-        $params = [ "meta"=>"globaluserinfo", "guiuser"=>$username, "guiprop"=>"groups" ];
+        $params = ["meta"=>"globaluserinfo", "guiuser"=>$username, "guiprop"=>"groups"];
         $query = new SimpleRequest('query', $params);
         $result = [];
 
@@ -98,7 +98,7 @@ 
         }
 
         $this->setUp($project);
-        $query = new SimpleRequest('query', [ "meta"=>"siteinfo", "siprop"=>"namespaces" ]);
+        $query = new SimpleRequest('query', ["meta"=>"siteinfo", "siprop"=>"namespaces"]);
         $result = [];
 
         try {
@@ -211,7 +211,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']
@@ -255,7 +255,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'];
 
@@ -283,7 +283,7 @@ 
                 $assessment['class']['value'] = '???';
                 // $1 is used to substitute the WikiProject name, e.g. Category:FA-Class Wikipedia 1.0 articles
                 $assessment['class']['category'] = str_replace('$1', $wikiproject, $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'] = [
@@ -294,7 +294,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'];
                 }
 
@@ -420,7 +420,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/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 +18 added lines, -18 removed lines

@@ -34,7 +34,7 @@ 
     public function getUserId($usernameOrIp)
     {
         // Use cache if possible.
-        $cacheKey = 'usernameOrIp.' . $usernameOrIp;
+        $cacheKey = 'usernameOrIp.'.$usernameOrIp;
         if ($this->cacheHas($cacheKey)) {
             return $this->cacheGet($cacheKey);
         }
@@ -115,24 +115,24 @@ 
         }
 
         $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)
         );
 
         // Count the number of days, accounting for when there's only one edit.
-        $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.
         $revisionCounts['first'] = date('Y-m-d H:i', strtotime($revisionCounts['first']));
         $revisionCounts['last'] = date('Y-m-d H:i', strtotime($revisionCounts['last']));
 
         // 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(
@@ -176,16 +176,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;
@@ -219,17 +219,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',
         ];
@@ -240,9 +240,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.
@@ -274,7 +274,7 @@ 
         }
 
         $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);
@@ -282,10 +282,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)
         );