x-tools / xtools

src/AppBundle/Twig/WikiExtension.php

Doc Comments +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 
     /**
      * Get all functions provided by this extension.
-     * @return array
+     * @return \Twig_SimpleFilter[]
      */
     public function getFilters()
     {

Unused Use Statements -2 removed lines

@@ -5,8 +5,6 @@
 
 namespace AppBundle\Twig;
 
-use Twig_SimpleFunction;
-
 /**
  * Twig extension filters and functions for MediaWiki project links.
  */

Spacing +5 added lines, -5 removed lines

@@ -30,7 +30,7 @@ 
      */
     public function intuitionMessage($message = "", $vars = [])
     {
-        return $this->getIntuition()->msg($message, [ "domain" => "xtools", "variables" => $vars ]);
+        return $this->getIntuition()->msg($message, ["domain" => "xtools", "variables" => $vars]);
     }
 
     /*********************************** FUNCTIONS ***********************************/
@@ -41,7 +41,7 @@ 
      */
     public function getFunctions()
     {
-        $options = [ 'is_safe' => [ 'html']];
+        $options = ['is_safe' => ['html']];
         return [];
     }
 
@@ -54,8 +54,8 @@ 
     public function getFilters()
     {
         return [
-            new \Twig_SimpleFilter('diff_format', [ $this, 'diffFormat' ], [ 'is_safe' => [ 'html' ] ]),
-            new \Twig_SimpleFilter('wikify_comment', [ $this, 'wikifyComment' ], [ 'is_safe' => [ 'html' ] ]),
+            new \Twig_SimpleFilter('diff_format', [$this, 'diffFormat'], ['is_safe' => ['html']]),
+            new \Twig_SimpleFilter('wikify_comment', [$this, 'wikifyComment'], ['is_safe' => ['html']]),
         ];
     }
 
@@ -94,7 +94,7 @@ 
         if ($isSection) {
             $sectionTitle = $sectionMatch[1][0];
             $sectionTitleLink = str_replace(' ', '_', $sectionTitle);
-            $sectionWikitext = "<a target='_blank' href='$projectUrl/wiki/$title#$sectionTitleLink'>&rarr;</a>" .
+            $sectionWikitext = "<a target='_blank' href='$projectUrl/wiki/$title#$sectionTitleLink'>&rarr;</a>".
                 "<em class='text-muted'>$sectionTitle:</em> ";
             $wikitext = str_replace($sectionMatch[0][0], $sectionWikitext, $wikitext);
         }

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);

src/Xtools/PagesRepository.php

Doc Comments +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
      * Get metadata about a single page from the API.
      * @param Project $project The project to which the page belongs.
      * @param string $pageTitle Page title.
-     * @return string[] Array with some of the following keys: pageid, title, missing, displaytitle,
+     * @return string|null Array with some of the following keys: pageid, title, missing, displaytitle,
      * url.
      */
     public function getPageInfo(Project $project, $pageTitle)

Spacing +2 added lines, -2 removed lines

@@ -257,7 +257,7 @@ 
 
         $wikidataId = ltrim($page->getWikidataId(), 'Q');
 
-        $sql = "SELECT " . ($count ? 'COUNT(*) AS count' : '*') . "
+        $sql = "SELECT ".($count ? 'COUNT(*) AS count' : '*')."
                 FROM wikidatawiki_p.wb_items_per_site
                 WHERE ips_item_id = :wikidataId";
 
@@ -267,7 +267,7 @@ 
 
         $result = $resultQuery->fetchAll();
 
-        return $count ? (int) $result[0]['count'] : $result;
+        return $count ? (int)$result[0]['count'] : $result;
     }
 
     /**

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
         }
     }