x-tools / xtools

src/AppBundle/Helper/ApiHelper.php

Doc Comments +1 added lines, -1 removed lines

@@ -255,7 +255,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  string $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.

Spacing +6 added lines, -6 removed lines

@@ -65,7 +65,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 = [];
 
@@ -91,7 +91,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 = [];
 
@@ -141,7 +141,7 @@ 
                 $groups[] = "B";
             }
             if (in_array("steward", $admin["groups"])) {
-                $groups[] = "S" ;
+                $groups[] = "S";
             }
             if (in_array("checkuser", $admin["groups"])) {
                 $groups[] = "CU";
@@ -152,7 +152,7 @@ 
             if (in_array("bot", $admin["groups"])) {
                 $groups[] = "Bot";
             }
-            $result[ $admin["name"] ] = [
+            $result[$admin["name"]] = [
                 "groups" => implode('/', $groups)
             ];
         }
@@ -227,7 +227,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']
@@ -312,7 +312,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);

tests/Xtools/PageTest.php

Unused Use Statements -1 removed lines

@@ -10,7 +10,6 @@
 use Xtools\Page;
 use Xtools\PagesRepository;
 use Xtools\Project;
-use Xtools\ProjectRepository;
 use Xtools\User;
 
 /**

src/AppBundle/Controller/AutomatedEditsController.php

Spacing +3 added lines, -3 removed lines

@@ -168,7 +168,7 @@ 
         $archiveTable = $projectData->getRepository()->getTableName($dbName, 'archive');
 
         $condBegin = $start ? " AND rev_timestamp > :start " : null;
-        $condEnd = $end ? " AND rev_timestamp < :end ": null;
+        $condEnd = $end ? " AND rev_timestamp < :end " : null;
 
         $regexes = [];
 
@@ -262,8 +262,8 @@ 
         }
 
         // Sort the array and do some simple math.
-        uasort($results, function ($a, $b) {
-            return $b['count'] - $a['count'];
+        uasort($results, function($a, $b) {
+            return $b['count']-$a['count'];
         });
 
         if ($total != 0) {

src/AppBundle/Controller/SimpleEditCounterController.php

Spacing +7 added lines, -7 removed lines

@@ -48,7 +48,7 @@ 
 
         // If we've got a project and user, redirect to results.
         if ($projectName != '' && $username != '') {
-            $routeParams = [ 'project' => $projectName, 'username' => $username ];
+            $routeParams = ['project' => $projectName, 'username' => $username];
             return $this->redirectToRoute('SimpleEditCounterResult', $routeParams);
         }
 
@@ -120,8 +120,8 @@ 
         $resultQuery->execute();
 
         if ($resultQuery->errorCode() > 0) {
-            $this->addFlash('notice', [ 'no-result', $username ]);
-            return $this->redirectToRoute('SimpleEditCounterProject', [ 'project' => $project->getDomain() ]);
+            $this->addFlash('notice', ['no-result', $username]);
+            return $this->redirectToRoute('SimpleEditCounterProject', ['project' => $project->getDomain()]);
         }
 
         // Fetch the result data
@@ -145,16 +145,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', [ 'no-result', $username ]);
+            $this->addFlash('notice', ['no-result', $username]);
 
-            return $this->redirectToRoute('SimpleEditCounterProject', [ 'project' => $project->getDomain() ]);
+            return $this->redirectToRoute('SimpleEditCounterProject', ['project' => $project->getDomain()]);
         }
 
         // Remove the last comma and space
@@ -183,7 +183,7 @@ 
             'project' => $project,
             'id' => $id,
             'arch' => $arch,
-            'rev' => $rev + $arch,
+            'rev' => $rev+$arch,
             'live' => $rev,
             'groups' => $groups,
             'globalGroups' => $globalGroups,

src/Xtools/Repository.php

Spacing +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
         // $tableExtension in order to generate the new table name
         if ($this->isLabs() && $tableExtension !== null) {
             $mapped = true;
-            $tableName = $tableName . '_' . $tableExtension;
+            $tableName = $tableName.'_'.$tableExtension;
         } elseif ($this->container->hasParameter("app.table.$tableName")) {
             // Use the table specified in the table mapping configuration, if present.
             $mapped = true;

src/Xtools/EditCounterRepository.php

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 
 use AppBundle\Helper\AutomatedEditsHelper;
 use DateInterval;
-use DateTime;
 use Mediawiki\Api\SimpleRequest;
 
 /**

Spacing +6 added lines, -6 removed lines

@@ -27,7 +27,7 @@ 
     public function getPairData(Project $project, User $user)
     {
         // Set up cache.
-        $cacheKey = 'pairdata.' . $project->getDatabaseName() . '.' . $user->getUsername();
+        $cacheKey = 'pairdata.'.$project->getDatabaseName().'.'.$user->getUsername();
         if ($this->cache->hasItem($cacheKey)) {
             return $this->cache->getItem($cacheKey)->get();
         }
@@ -153,10 +153,10 @@ 
         $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)
         );
@@ -378,9 +378,9 @@ 
         $resultQuery->bindParam(":id", $userId);
         $resultQuery->execute();
         $results = $resultQuery->fetchAll();
-        $namespaceTotals = array_combine(array_map(function ($e) {
+        $namespaceTotals = array_combine(array_map(function($e) {
             return $e['page_namespace'];
-        }, $results), array_map(function ($e) {
+        }, $results), array_map(function($e) {
             return $e['total'];
         }, $results));
 
@@ -439,7 +439,7 @@ 
             }
             $queries[] = $sql;
         }
-        $sql = "(\n" . join("\n) UNION (\n", $queries) . ")\n";
+        $sql = "(\n".join("\n) UNION (\n", $queries).")\n";
         $resultQuery = $this->getProjectsConnection()->prepare($sql);
         $resultQuery->bindParam(":username", $username);
         $resultQuery->execute();

tests/AppBundle/Controller/ApiControllerTest.php

Spacing +2 added lines, -2 removed lines

@@ -47,8 +47,8 @@
             $this->assertEquals(200, $client->getResponse()->getStatusCode());
 
             // Check that a correct namespace value was returned
-            $response = (array) json_decode($client->getResponse()->getContent());
-            $namespaces = (array) $response['namespaces'];
+            $response = (array)json_decode($client->getResponse()->getContent());
+            $namespaces = (array)$response['namespaces'];
             $this->assertEquals('Utilisateur', array_values($namespaces)[2]); // User in French
         }
     }

src/Xtools/EditCounter.php

Spacing +18 added lines, -18 removed lines

@@ -61,7 +61,7 @@ 
      */
     protected function getPairData()
     {
-        if (! is_array($this->pairData)) {
+        if (!is_array($this->pairData)) {
             $this->pairData = $this->getRepository()
                 ->getPairData($this->project, $this->user);
         }
@@ -74,7 +74,7 @@ 
      */
     protected function getLogCounts()
     {
-        if (! is_array($this->logCounts)) {
+        if (!is_array($this->logCounts)) {
             $this->logCounts = $this->getRepository()
                 ->getLogCounts($this->project, $this->user);
         }
@@ -123,7 +123,7 @@ 
      */
     public function countAllRevisions()
     {
-        return $this->countLiveRevisions() + $this->countDeletedRevisions();
+        return $this->countLiveRevisions()+$this->countDeletedRevisions();
     }
 
     /**
@@ -142,7 +142,7 @@ 
      */
     public function countRevisionsWithoutComments()
     {
-        return $this->countAllRevisions() - $this->countRevisionsWithComments();
+        return $this->countAllRevisions()-$this->countRevisionsWithComments();
     }
 
     /**
@@ -212,7 +212,7 @@ 
      */
     public function countAllPagesEdited()
     {
-        return $this->countLivePagesEdited() + $this->countDeletedPagesEdited();
+        return $this->countLivePagesEdited()+$this->countDeletedPagesEdited();
     }
 
     /**
@@ -222,7 +222,7 @@ 
      */
     public function countPagesCreated()
     {
-        return $this->countCreatedPagesLive() + $this->countPagesCreatedDeleted();
+        return $this->countCreatedPagesLive()+$this->countPagesCreatedDeleted();
     }
 
     /**
@@ -350,7 +350,7 @@ 
             // Try block just in case there are older, unpredictable formats
             try {
                 $expiry = strtotime($durationStr, $timestamp);
-                $duration = ($expiry - $timestamp) / (60 * 60 * 24);
+                $duration = ($expiry-$timestamp) / (60 * 60 * 24);
 
                 if (!$duration || $duration > $this->longestBlockDays) {
                     $this->longestBlockDays = $duration;
@@ -434,7 +434,7 @@ 
         $import = isset($logCounts['import-import']) ? (int)$logCounts['import-import'] : 0;
         $interwiki = isset($logCounts['import-interwiki']) ? (int)$logCounts['import-interwiki'] : 0;
         $upload = isset($logCounts['import-upload']) ? (int)$logCounts['import-upload'] : 0;
-        return $import + $interwiki + $upload;
+        return $import+$interwiki+$upload;
     }
 
     /**
@@ -567,9 +567,9 @@ 
     public function approvals()
     {
         $logCounts = $this->getLogCounts();
-        $total = $logCounts['review-approve'] +
-        (!empty($logCounts['review-approve-a']) ? $logCounts['review-approve-a'] : 0) +
-        (!empty($logCounts['review-approve-i']) ? $logCounts['review-approve-i'] : 0) +
+        $total = $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);
         return $total;
     }
@@ -593,7 +593,7 @@ 
         $logCounts = $this->getLogCounts();
         $create2 = $logCounts['newusers-create2'] ?: 0;
         $byemail = $logCounts['newusers-byemail'] ?: 0;
-        return $create2 + $byemail;
+        return $create2+$byemail;
     }
 
     /**
@@ -663,14 +663,14 @@ 
             if (!isset($out['totals'][$ns])) {
                 $out['totals'][$ns] = [];
             }
-            $out['totals'][$ns][$total['year'] . $total['month']] = $total['count'];
+            $out['totals'][$ns][$total['year'].$total['month']] = $total['count'];
         }
         // Fill in the blanks (where no edits were made in a given month for a namespace).
         for ($y = $out['min_year']; $y <= $out['max_year']; $y++) {
             for ($m = 1; $m <= 12; $m++) {
                 foreach ($out['totals'] as $nsId => &$total) {
-                    if (!isset($total[$y . $m])) {
-                        $total[$y . $m] = 0;
+                    if (!isset($total[$y.$m])) {
+                        $total[$y.$m] = 0;
                     }
                 }
             }
@@ -732,8 +732,8 @@ 
                 ->globalEditCounts($this->user, $this->project);
             if ($sorted) {
                 // Sort.
-                uasort($this->globalEditCounts, function ($a, $b) {
-                    return $b['total'] - $a['total'];
+                uasort($this->globalEditCounts, function($a, $b) {
+                    return $b['total']-$a['total'];
                 });
             }
         }
@@ -771,7 +771,7 @@ 
                 $nsName = $project->getNamespaces()[$revision['page_namespace']];
             }
             $page = $project->getRepository()
-                ->getPage($project, $nsName . ':' . $revision['page_title']);
+                ->getPage($project, $nsName.':'.$revision['page_title']);
             $edit = new Edit($page, $revision);
             $globalEdits[$edit->getTimestamp()->getTimestamp().'-'.$edit->getId()] = $edit;
         }

src/AppBundle/Controller/PagesController.php

Spacing +3 added lines, -3 removed lines

@@ -78,7 +78,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
@@ -207,8 +207,8 @@ 
         }
 
         if ($total < 1) {
-            $this->addFlash('notice', [ 'no-result', $username ]);
-            return $this->redirectToRoute('PagesProject', [ 'project' => $project ]);
+            $this->addFlash('notice', ['no-result', $username]);
+            return $this->redirectToRoute('PagesProject', ['project' => $project]);
         }
 
         ksort($pagesByNamespaceByDate);