x-tools / xtools

src/AppBundle/Controller/PagesController.php

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Xtools\ProjectRepository;
 
 class PagesController extends Controller

Spacing +4 added lines, -4 removed lines

@@ -57,7 +57,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
@@ -183,7 +183,7 @@ 
             JOIN $revisionTable ON page_id = rev_page
             $paJoin
             WHERE $whereRev AND rev_parent_id = '0' $namespaceConditionRev $redirectCondition
-            " . ($hasPageAssessments ? "GROUP BY rev_page" : "") . "
+            ".($hasPageAssessments ? "GROUP BY rev_page" : "")."
             )
 
             UNION
@@ -267,8 +267,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);

src/AppBundle/Helper/LabsHelper.php

Unused Use Statements -2 removed lines

@@ -2,10 +2,8 @@
 
 namespace AppBundle\Helper;
 
-use Symfony\Component\Config\Definition\Exception\Exception;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\VarDumper\VarDumper;
 
 class LabsHelper
 {

Spacing +3 added lines, -3 removed lines

@@ -78,7 +78,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
@@ -129,7 +129,7 @@ 
     public function allProjects()
     {
         $wikiQuery = $this->client->createQueryBuilder();
-        $wikiQuery->select([ 'dbName', 'name', 'url' ])->from('wiki');
+        $wikiQuery->select(['dbName', 'name', 'url'])->from('wiki');
         $stmt = $wikiQuery->execute();
         $out = $stmt->fetchAll();
         return $out;
@@ -152,7 +152,7 @@ 
         // as required by Labs.  We combine $table with
         // $table_extension in order to generate the new table name
         if ($this->isLabs() && $table_extension !== null) {
-            $table = $table . "_" . $table_extension;
+            $table = $table."_".$table_extension;
         }
 
         // Use the table specified in the table mapping configuration, if present.

tests/AppBundle/Controller/ApiControllerTest.php

Spacing +1 added lines, -1 removed lines

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

app/autoload.php

Spacing +1 added lines, -1 removed lines

@@ -8,6 +8,6 @@
  */
 $loader = require __DIR__.'/../vendor/autoload.php';
 
-AnnotationRegistry::registerLoader([ $loader, 'loadClass' ]);
+AnnotationRegistry::registerLoader([$loader, 'loadClass']);
 
 return $loader;

app/AppKernel.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
             new AppBundle\AppBundle(),
         ];
 
-        if (in_array($this->getEnvironment(), [ 'dev', 'test' ], true)) {
+        if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
             $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
             $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
             $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();

src/Xtools/EditCounterRepository.php

Doc Comments +1 added lines, -3 removed lines

@@ -251,7 +251,6 @@ 
      * Get a user's total edit count on one or more project.
      * Requires the CentralAuth extension to be installed on the project.
      *
-     * @param string $username The username.
      * @param Project $project The project to start from.
      * @return mixed[]|boolean Array of total edit counts, or false if none could be found.
      */
@@ -301,7 +300,7 @@ 
 
     /**
      * Get total edit counts for the top 10 projects for this user.
-     * @param string $username The username.
+     * @param string $stopwatchName
      * @return string[] Elements are arrays with 'dbName', 'url', 'name', and 'total'.
      */
     protected function getRevisionCountsAllProjectsNoCentralAuth(
@@ -413,7 +412,6 @@ 
 
     /**
      * Get data for a bar chart of monthly edit totals per namespace.
-     * @param string $username The username.
      * @return string[]
      */
     public function getMonthCounts(Project $project, User $user)

Spacing +9 added lines, -9 removed lines

@@ -19,7 +19,7 @@ 
     public function getRevisionCounts(Project $project, User $user)
     {
         // Set up cache.
-        $cacheKey = 'revisioncounts.' . $project->getDatabaseName() . '.' . $user->getUsername();
+        $cacheKey = 'revisioncounts.'.$project->getDatabaseName().'.'.$user->getUsername();
         if ($this->cache->hasItem($cacheKey)) {
             return $this->cache->getItem($cacheKey)->get();
         }
@@ -80,7 +80,7 @@ 
     public function getRevisionDates(Project $project, User $user)
     {
         // Set up cache.
-        $cacheKey = 'revisiondates.' . $project->getDatabaseName() . '.' . $user->getUsername();
+        $cacheKey = 'revisiondates.'.$project->getDatabaseName().'.'.$user->getUsername();
         if ($this->cache->hasItem($cacheKey)) {
             return $this->cache->getItem($cacheKey)->get();
         }
@@ -152,10 +152,10 @@ 
         $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)
         );
@@ -186,7 +186,7 @@ 
 
         // Query.
         $sql = "SELECT CONCAT(log_type, '-', log_action) AS source, COUNT(log_id) AS value
-            FROM " . $this->getTableName($project->getDatabaseName(), 'logging') . "
+            FROM " . $this->getTableName($project->getDatabaseName(), 'logging')."
             WHERE log_user = :userId
             GROUP BY log_type, log_action";
         $resultQuery = $this->getProjectsConnection()->prepare($sql);
@@ -195,10 +195,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)
         );
@@ -355,9 +355,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));
 

src/AppBundle/Controller/MetaController.php

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,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', [
@@ -45,7 +45,7 @@ 
             ->getConnection();
 
         $query = $this->client->createQueryBuilder();
-        $query->select([ 'date', 'tool', 'count' ])
+        $query->select(['date', 'tool', 'count'])
             ->where($query->expr()->gte('date', ':start'))
             ->where($query->expr()->lte('date', ':end'))
             ->where($query->expr()->neq('tool', '""'))
@@ -61,7 +61,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;
 
         foreach ($data as $entry) {
@@ -76,7 +76,7 @@ 
             }
 
             $date = new DateTime($entry['date']);
-            $dateIndex = (int) $date->diff($startObj)->format("%a");
+            $dateIndex = (int)$date->diff($startObj)->format("%a");
             $timeline[$entry['tool']][$dateIndex] = $entry['count'];
 
             $grandSum += $entry['count'];

src/AppBundle/Controller/DefaultController.php

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
     public function loginAction(Request $request)
     {
         try {
-            list( $next, $token ) = $this->getOauthClient()->initiate();
+            list($next, $token) = $this->getOauthClient()->initiate();
         } catch (Exception $oauthException) {
             throw $oauthException;
             // @TODO Make this work.
@@ -141,7 +141,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

Spacing +57 added lines, -57 removed lines

@@ -16,32 +16,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']),
         ];
     }
@@ -49,7 +49,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);
     }
 
     public function requestMemory()
@@ -69,7 +69,7 @@ 
     // TODO: refactor all intuition stuff so it can be used anywhere
     public function intuitionMessageExists($message = "")
     {
-        return $this->getIntuition()->msgExists($message, [ "domain" => "xtools" ]);
+        return $this->getIntuition()->msgExists($message, ["domain" => "xtools"]);
     }
 
     public function intuitionMessagePrintExists($message = "", $vars = [])
@@ -88,7 +88,7 @@ 
 
     public function intuitionMessage($message = "", $vars = [])
     {
-        return $this->getIntuition()->msg($message, [ "domain" => "xtools", "variables" => $vars ]);
+        return $this->getIntuition()->msg($message, ["domain" => "xtools", "variables" => $vars]);
     }
 
     public function getLang()
@@ -109,10 +109,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
@@ -169,41 +169,41 @@ 
     public static function getColorList($num = false)
     {
         $colors = [
-            0 => '#Cc0000',# '#FF005A', #red '#FF5555',
+            0 => '#Cc0000', # '#FF005A', #red '#FF5555',
             1 => '#F7b7b7',
-            2 => '#5c8d20',# '#008800', #green'#55FF55',
+            2 => '#5c8d20', # '#008800', #green'#55FF55',
             3 => '#85eD82',
             4 => '#2E97E0', # blue
             5 => '#B9E3F9',
-            6 => '#e1711d',  # orange
+            6 => '#e1711d', # orange
             7 => '#ffc04c',
             8 => '#FDFF98', # yellow
             9 => '#5555FF',
             10 => '#55FFFF',
-            11 => '#0000C0',  #
-            12 => '#008800',  # green
+            11 => '#0000C0', #
+            12 => '#008800', # green
             13 => '#00C0C0',
-            14 => '#FFAFAF',  # rosé
-            15 => '#808080',  # gray
+            14 => '#FFAFAF', # rosé
+            15 => '#808080', # gray
             16 => '#00C000',
             17 => '#404040',
-            18 => '#C0C000',  # green
+            18 => '#C0C000', # green
             19 => '#C000C0',
-            100 => '#75A3D1',  # blue
-            101 => '#A679D2',  # purple
+            100 => '#75A3D1', # blue
+            101 => '#A679D2', # purple
             102 => '#660000',
             103 => '#000066',
-            104 => '#FAFFAF',  # caramel
+            104 => '#FAFFAF', # caramel
             105 => '#408345',
             106 => '#5c8d20',
-            107 => '#e1711d',  # red
-            108 => '#94ef2b',  # light green
-            109 => '#756a4a',  # brown
+            107 => '#e1711d', # red
+            108 => '#94ef2b', # light green
+            109 => '#756a4a', # brown
             110 => '#6f1dab',
             111 => '#301e30',
             112 => '#5c9d96',
-            113 => '#a8cd8c',  # earth green
-            114 => '#f2b3f1',  # light purple
+            113 => '#a8cd8c', # earth green
+            114 => '#f2b3f1', # light purple
             115 => '#9b5828',
             118 => '#99FFFF',
             119 => '#99BBFF',
@@ -224,8 +224,8 @@ 
             446 => '#06DCFB',
             447 => '#892EE4',
             460 => '#99FF66',
-            461 => '#99CC66',  # green
-            470 => '#CCCC33',  # ocker
+            461 => '#99CC66', # green
+            470 => '#CCCC33', # ocker
             471 => '#CCFF33',
             480 => '#6699FF',
             481 => '#66FFFF',
@@ -240,18 +240,18 @@ 
             1198 => '#FF34B3',
             1199 => '#8B1C62',
 
-            '#61a9f3',# blue
-            '#f381b9',# pink
+            '#61a9f3', # blue
+            '#f381b9', # pink
             '#61E3A9',
             '#D56DE2',
             '#85eD82',
             '#F7b7b7',
             '#CFDF49',
             '#88d8f2',
-            '#07AF7B',# green
+            '#07AF7B', # green
             '#B9E3F9',
             '#FFF3AD',
-            '#EF606A',# red
+            '#EF606A', # red
             '#EC8833',
             '#FFF100',
             '#87C9A5',
@@ -412,8 +412,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']),
         ];
     }
 
@@ -440,9 +440,9 @@ 
         if (!$denominator) {
             $quotient = $numerator;
         } else {
-            $quotient = ( $numerator / $denominator ) * 100;
+            $quotient = ($numerator / $denominator) * 100;
         }
 
-        return round($quotient, $precision) . '%';
+        return round($quotient, $precision).'%';
     }
 }