x-tools / xtools

src/AppBundle/Controller/DefaultController.php

Spacing +2 added lines, -2 removed lines

@@ -90,7 +90,7 @@ 
     public function loginAction()
     {
         try {
-            list( $next, $token ) = $this->getOauthClient()->initiate();
+            list($next, $token) = $this->getOauthClient()->initiate();
         } catch (Exception $oauthException) {
             throw $oauthException;
             // @TODO Make this work.
@@ -155,7 +155,7 @@ 
                     . '/index.php?title=Special:OAuth';
         $conf = new ClientConfig($endpoint);
         $consumerKey = $this->getParameter('oauth_key');
-        $consumerSecret =  $this->getParameter('oauth_secret');
+        $consumerSecret = $this->getParameter('oauth_secret');
         $conf->setConsumer(new Consumer($consumerKey, $consumerSecret));
         $this->oauthClient = new Client($conf);
         // Callback URL is hardcoded in the consumer registration.

src/AppBundle/Twig/AppExtension.php

Doc Comments +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
 
     /**
      * Get all functions that this class provides.
-     * @return array
+     * @return \Twig_SimpleFunction[]
      */
     public function getFunctions()
     {
@@ -520,7 +520,7 @@ 
 
     /**
      * Get all filters for this extension.
-     * @return array
+     * @return \Twig_SimpleFilter[]
      */
     public function getFilters()
     {

Spacing +35 added lines, -35 removed lines

@@ -30,32 +30,32 @@ 
     {
         $options = ['is_safe' => ['html']];
         return [
-            new \Twig_SimpleFunction('request_time', [ $this, 'requestTime' ], $options),
-            new \Twig_SimpleFunction('memory_usage', [ $this, 'requestMemory' ], $options),
-            new \Twig_SimpleFunction('year', [ $this, 'generateYear' ], $options),
-            new \Twig_SimpleFunction('msgPrintExists', [ $this, 'intuitionMessagePrintExists' ], $options),
-            new \Twig_SimpleFunction('msgExists', [ $this, 'intuitionMessageExists' ], $options),
-            new \Twig_SimpleFunction('msg', [ $this, 'intuitionMessage' ], $options),
-            new \Twig_SimpleFunction('lang', [ $this, 'getLang' ], $options),
-            new \Twig_SimpleFunction('langName', [ $this, 'getLangName' ], $options),
-            new \Twig_SimpleFunction('allLangs', [ $this, 'getAllLangs' ]),
-            new \Twig_SimpleFunction('isRTL', [ $this, 'intuitionIsRTL' ]),
-            new \Twig_SimpleFunction('isRTLLang', [ $this, 'intuitionIsRTLLang' ]),
-            new \Twig_SimpleFunction('shortHash', [ $this, 'gitShortHash' ]),
-            new \Twig_SimpleFunction('hash', [ $this, 'gitHash' ]),
-            new \Twig_SimpleFunction('enabled', [ $this, 'tabEnabled' ]),
-            new \Twig_SimpleFunction('tools', [ $this, 'allTools' ]),
-            new \Twig_SimpleFunction('color', [ $this, 'getColorList' ]),
-            new \Twig_SimpleFunction('chartColor', [ $this, 'chartColor' ]),
-            new \Twig_SimpleFunction('isWMFLabs', [ $this, 'isWMFLabs' ]),
-            new \Twig_SimpleFunction('isSingleWiki', [ $this, 'isSingleWiki' ]),
-            new \Twig_SimpleFunction('getReplagThreshold', [ $this, 'getReplagThreshold' ]),
-            new \Twig_SimpleFunction('loadStylesheetsFromCDN', [ $this, 'loadStylesheetsFromCDN' ]),
-            new \Twig_SimpleFunction('isWMFLabs', [ $this, 'isWMFLabs' ]),
-            new \Twig_SimpleFunction('replag', [ $this, 'replag' ]),
-            new \Twig_SimpleFunction('link', [ $this, 'link' ]),
-            new \Twig_SimpleFunction('quote', [ $this, 'quote' ]),
-            new \Twig_SimpleFunction('bugReportURL', [ $this, 'bugReportURL' ]),
+            new \Twig_SimpleFunction('request_time', [$this, 'requestTime'], $options),
+            new \Twig_SimpleFunction('memory_usage', [$this, 'requestMemory'], $options),
+            new \Twig_SimpleFunction('year', [$this, 'generateYear'], $options),
+            new \Twig_SimpleFunction('msgPrintExists', [$this, 'intuitionMessagePrintExists'], $options),
+            new \Twig_SimpleFunction('msgExists', [$this, 'intuitionMessageExists'], $options),
+            new \Twig_SimpleFunction('msg', [$this, 'intuitionMessage'], $options),
+            new \Twig_SimpleFunction('lang', [$this, 'getLang'], $options),
+            new \Twig_SimpleFunction('langName', [$this, 'getLangName'], $options),
+            new \Twig_SimpleFunction('allLangs', [$this, 'getAllLangs']),
+            new \Twig_SimpleFunction('isRTL', [$this, 'intuitionIsRTL']),
+            new \Twig_SimpleFunction('isRTLLang', [$this, 'intuitionIsRTLLang']),
+            new \Twig_SimpleFunction('shortHash', [$this, 'gitShortHash']),
+            new \Twig_SimpleFunction('hash', [$this, 'gitHash']),
+            new \Twig_SimpleFunction('enabled', [$this, 'tabEnabled']),
+            new \Twig_SimpleFunction('tools', [$this, 'allTools']),
+            new \Twig_SimpleFunction('color', [$this, 'getColorList']),
+            new \Twig_SimpleFunction('chartColor', [$this, 'chartColor']),
+            new \Twig_SimpleFunction('isWMFLabs', [$this, 'isWMFLabs']),
+            new \Twig_SimpleFunction('isSingleWiki', [$this, 'isSingleWiki']),
+            new \Twig_SimpleFunction('getReplagThreshold', [$this, 'getReplagThreshold']),
+            new \Twig_SimpleFunction('loadStylesheetsFromCDN', [$this, 'loadStylesheetsFromCDN']),
+            new \Twig_SimpleFunction('isWMFLabs', [$this, 'isWMFLabs']),
+            new \Twig_SimpleFunction('replag', [$this, 'replag']),
+            new \Twig_SimpleFunction('link', [$this, 'link']),
+            new \Twig_SimpleFunction('quote', [$this, 'quote']),
+            new \Twig_SimpleFunction('bugReportURL', [$this, 'bugReportURL']),
             new \Twig_SimpleFunction('logged_in_user', [$this, 'functionLoggedInUser']),
             new \Twig_SimpleFunction('isUserAnon', [$this, 'isUserAnon']),
             new \Twig_SimpleFunction('nsName', [$this, 'nsName']),
@@ -69,7 +69,7 @@ 
      */
     public function requestTime($decimals = 3)
     {
-        return number_format(microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'], $decimals);
+        return number_format(microtime(true)-$_SERVER['REQUEST_TIME_FLOAT'], $decimals);
     }
 
     /**
@@ -102,7 +102,7 @@ 
      */
     public function intuitionMessageExists($message = "")
     {
-        return $this->getIntuition()->msgExists($message, [ "domain" => "xtools" ]);
+        return $this->getIntuition()->msgExists($message, ["domain" => "xtools"]);
     }
 
     /**
@@ -133,7 +133,7 @@ 
      */
     public function intuitionMessage($message = "", $vars = [])
     {
-        return $this->getIntuition()->msg($message, [ "domain" => "xtools", "variables" => $vars ]);
+        return $this->getIntuition()->msg($message, ["domain" => "xtools", "variables" => $vars]);
     }
 
     /**
@@ -162,10 +162,10 @@ 
      */
     public function getAllLangs()
     {
-        $messageFiles = glob($this->container->getParameter("kernel.root_dir") . '/../i18n/*.json');
+        $messageFiles = glob($this->container->getParameter("kernel.root_dir").'/../i18n/*.json');
 
         $languages = array_values(array_unique(array_map(
-            function ($filename) {
+            function($filename) {
                 return basename($filename, '.json');
             },
             $messageFiles
@@ -513,8 +513,8 @@ 
     public function getFilters()
     {
         return [
-            new \Twig_SimpleFilter('capitalize_first', [ $this, 'capitalizeFirst' ]),
-            new \Twig_SimpleFilter('percent_format', [ $this, 'percentFormat' ]),
+            new \Twig_SimpleFilter('capitalize_first', [$this, 'capitalizeFirst']),
+            new \Twig_SimpleFilter('percent_format', [$this, 'percentFormat']),
         ];
     }
 
@@ -541,10 +541,10 @@ 
         if (!$denominator) {
             $quotient = $numerator;
         } else {
-            $quotient = ( $numerator / $denominator ) * 100;
+            $quotient = ($numerator / $denominator) * 100;
         }
 
-        return round($quotient, $precision) . '%';
+        return round($quotient, $precision).'%';
     }
 
     /**

src/AppBundle/Controller/EditCounterController.php

Unused Use Statements -1 removed lines

@@ -12,7 +12,6 @@
 use Symfony\Component\HttpFoundation\Response;
 use Xtools\EditCounter;
 use Xtools\EditCounterRepository;
-use Xtools\Page;
 use Xtools\Project;
 use Xtools\ProjectRepository;
 use Xtools\User;

Spacing +3 added lines, -3 removed lines

@@ -78,10 +78,10 @@ 
         $username = $request->query->get('username', $request->query->get('user'));
 
         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]);
         }
 
         $project = ProjectRepository::getProject($queryProject, $this->container);
@@ -116,7 +116,7 @@ 
         }
         $isSubRequest = $this->container->get('request_stack')->getParentRequest() !== null;
         return $this->render('editCounter/result.html.twig', [
-            'xtTitle' => $this->user->getUsername() . ' - ' . $this->project->getTitle(),
+            'xtTitle' => $this->user->getUsername().' - '.$this->project->getTitle(),
             'xtPage' => 'ec',
             'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..'),
             'is_sub_request' => $isSubRequest,

src/Xtools/Project.php

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 namespace Xtools;
 
 use Mediawiki\Api\MediawikiApi;
-use Symfony\Component\VarDumper\VarDumper;
 
 /**
  * A Project is a single wiki that XTools is querying.

Doc Comments +1 added lines, -1 removed lines

@@ -200,7 +200,7 @@
     /**
      * Get an array of this project's namespaces and their IDs.
      *
-     * @return string[] Keys are IDs, values are names.
+     * @return string Keys are IDs, values are names.
      */
     public function getNamespaces()
     {

Spacing +8 added lines, -8 removed lines

@@ -117,7 +117,7 @@ 
      */
     public function getUrl($withTrailingSlash = true)
     {
-        return rtrim($this->getBasicInfo()['url'], '/') . ($withTrailingSlash ? '/' : '');
+        return rtrim($this->getBasicInfo()['url'], '/').($withTrailingSlash ? '/' : '');
     }
 
     /**
@@ -174,7 +174,7 @@ 
         $metadata = $this->getMetadata();
         return isset($metadata['general']['script'])
             ? $metadata['general']['script']
-            : $this->getScriptPath() . '/index.php';
+            : $this->getScriptPath().'/index.php';
     }
 
     /**
@@ -184,7 +184,7 @@ 
      */
     public function getApiUrl()
     {
-        return rtrim($this->getUrl(), '/') . $this->getRepository()->getApiPath();
+        return rtrim($this->getUrl(), '/').$this->getRepository()->getApiPath();
     }
 
     /**
@@ -216,7 +216,7 @@ 
      */
     public function userOptInPage(User $user)
     {
-        $localPageName = 'User:' . $user->getUsername() . '/EditCounterOptIn.js';
+        $localPageName = 'User:'.$user->getUsername().'/EditCounterOptIn.js';
         return $localPageName;
     }
 
@@ -250,7 +250,7 @@ 
         }
 
         // 4. Lastly, see if they've opted in globally on the default project or Meta.
-        $globalPageName = $user->getUsername() . '/EditCounterGlobalOptIn.js';
+        $globalPageName = $user->getUsername().'/EditCounterGlobalOptIn.js';
         $globalProject = $this->getRepository()->getGlobalProject();
         if ($globalProject instanceof Project) {
             $globalExists = $globalProject->getRepository()
@@ -269,7 +269,7 @@ 
      */
     public function hasPageAssessments()
     {
-        return (bool) $this->getRepository()->getAssessmentsConfig($this->getDomain());
+        return (bool)$this->getRepository()->getAssessmentsConfig($this->getDomain());
     }
 
     /**
@@ -282,9 +282,9 @@ 
         $config = $this->getRepository()->getAssessmentsConfig($this->getDomain());
 
         if (isset($config['class'][$class])) {
-            return "https://upload.wikimedia.org/wikipedia/commons/" . $config['class'][$class]['badge'];
+            return "https://upload.wikimedia.org/wikipedia/commons/".$config['class'][$class]['badge'];
         } elseif (isset($config['class']['Unknown'])) {
-            return "https://upload.wikimedia.org/wikipedia/commons/" . $config['class']['Unknown']['badge'];
+            return "https://upload.wikimedia.org/wikipedia/commons/".$config['class']['Unknown']['badge'];
         } else {
             return "";
         }

src/AppBundle/Controller/MetaController.php

Spacing +6 added lines, -6 removed lines

@@ -31,7 +31,7 @@ 
         $end = $request->query->get('end');
 
         if ($start != '' && $end != '') {
-            return $this->redirectToRoute('MetaResult', [ 'start' => $start, 'end' => $end ]);
+            return $this->redirectToRoute('MetaResult', ['start' => $start, 'end' => $end]);
         }
 
         return $this->render('meta/index.html.twig', [
@@ -73,7 +73,7 @@ 
         $timeline = [];
         $startObj = new DateTime($start);
         $endObj = new DateTime($end);
-        $numDays = (int) $endObj->diff($startObj)->format("%a");
+        $numDays = (int)$endObj->diff($startObj)->format("%a");
         $grandSum = 0;
 
         // Generate array of date labels
@@ -85,17 +85,17 @@ 
 
         foreach ($data as $entry) {
             if (!isset($totals[$entry['tool']])) {
-                $totals[$entry['tool']] = (int) $entry['count'];
+                $totals[$entry['tool']] = (int)$entry['count'];
 
                 // Create arrays for each tool, filled with zeros for each date in the timeline
                 $timeline[$entry['tool']] = array_fill(0, $numDays, 0);
             } else {
-                $totals[$entry['tool']] += (int) $entry['count'];
+                $totals[$entry['tool']] += (int)$entry['count'];
             }
 
             $date = new DateTime($entry['date']);
-            $dateIndex = (int) $date->diff($startObj)->format("%a");
-            $timeline[$entry['tool']][$dateIndex] = (int) $entry['count'];
+            $dateIndex = (int)$date->diff($startObj)->format("%a");
+            $timeline[$entry['tool']][$dateIndex] = (int)$entry['count'];
 
             $grandSum += $entry['count'];
         }

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 +3 added lines, -3 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,7 +54,7 @@ 
     public function getFilters()
     {
         return [
-            new \Twig_SimpleFilter('diff_format', [ $this, 'diffFormat' ], [ 'is_safe' => [ 'html' ] ]),
+            new \Twig_SimpleFilter('diff_format', [$this, 'diffFormat'], ['is_safe' => ['html']]),
         ];
     }
 

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/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,