x-tools / xtools

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/Xtools/Project.php

Unused Use Statements -1 removed lines

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

Spacing +5 added lines, -5 removed lines

@@ -79,7 +79,7 @@ 
      */
     public function getUrl($withTrailingSlash = true)
     {
-        return rtrim($this->getMetadata()['url'], '/') . ($withTrailingSlash ? '/' : '');
+        return rtrim($this->getMetadata()['url'], '/').($withTrailingSlash ? '/' : '');
     }
 
     /**
@@ -136,7 +136,7 @@ 
         $metadata = $this->getRepository()->getMetadata($this->getUrl());
         return isset($metadata['general']['script'])
             ? $metadata['general']['script']
-            : $this->getScriptPath() . '/index.php';
+            : $this->getScriptPath().'/index.php';
     }
 
     /**
@@ -146,7 +146,7 @@ 
      */
     public function getApiUrl()
     {
-        return rtrim($this->getUrl(), '/') . $this->getRepository()->getApiPath();
+        return rtrim($this->getUrl(), '/').$this->getRepository()->getApiPath();
     }
 
     /**
@@ -178,7 +178,7 @@ 
      */
     public function userOptInPage(User $user)
     {
-        $localPageName = 'User:' . $user->getUsername() . '/EditCounterOptIn.js';
+        $localPageName = 'User:'.$user->getUsername().'/EditCounterOptIn.js';
         return $localPageName;
     }
 
@@ -207,7 +207,7 @@ 
         }
 
         // 3. 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()

src/Xtools/ProjectRepository.php

Indentation +3 added lines, -3 removed lines

@@ -251,9 +251,9 @@
         $conn = $this->getProjectsConnection();
         $pageTable = $this->getTableName($project->getDatabaseName(), 'page');
         $query = "SELECT page_id "
-             . " FROM $pageTable "
-             . " WHERE page_namespace = :ns AND page_title = :title AND page_len > 0 "
-             . " LIMIT 1";
+                . " FROM $pageTable "
+                . " WHERE page_namespace = :ns AND page_title = :title AND page_len > 0 "
+                . " LIMIT 1";
         $params = [
             'ns' => $namespaceId,
             'title' => $pageTitle,

Spacing +1 added lines, -1 removed lines

@@ -250,7 +250,7 @@
     {
         $pageRepo = new PagesRepository();
         if (!$this->container) {
-            dump($project);exit();
+            dump($project); exit();
         }
         $pageRepo->setContainer($this->container);
         $page = new Page($project, $pageName);

src/Xtools/Edit.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace Xtools;
 
 use Xtools\User;
-use AppBundle\Helper\AutomatedEditsHelper;
 use DateTime;
 
 /**

Spacing +7 added lines, -7 removed lines

@@ -46,11 +46,11 @@ 
         $this->page = $page;
 
         // Copy over supported attributes
-        $this->id = (int) $attrs['id'];
+        $this->id = (int)$attrs['id'];
         $this->timestamp = DateTime::createFromFormat('YmdHis', $attrs['timestamp']);
         $this->minor = $attrs['minor'] === '1';
-        $this->length = (int) $attrs['length'];
-        $this->length_change = (int) $attrs['length_change'];
+        $this->length = (int)$attrs['length'];
+        $this->length_change = (int)$attrs['length_change'];
         $this->user = new User($attrs['username']);
         $this->comment = $attrs['comment'];
     }
@@ -179,8 +179,8 @@ 
     public function getDiffUrl()
     {
         $project = $this->getProject();
-        $path = str_replace('$1', 'Special:Diff/' . $this->id, $project->getArticlePath());
-        return rtrim($project->getUrl(), '/') . $path;
+        $path = str_replace('$1', 'Special:Diff/'.$this->id, $project->getArticlePath());
+        return rtrim($project->getUrl(), '/').$path;
     }
 
     /**
@@ -190,8 +190,8 @@ 
     public function getPermaUrl()
     {
         $project = $this->getProject();
-        $path = str_replace('$1', 'Special:PermaLink/' . $this->id, $project->getArticlePath());
-        return rtrim($project->getUrl(), '/') . $path;
+        $path = str_replace('$1', 'Special:PermaLink/'.$this->id, $project->getArticlePath());
+        return rtrim($project->getUrl(), '/').$path;
     }
 
     /**

src/AppBundle/Controller/EditCounterController.php

Spacing +2 added lines, -2 removed lines

@@ -76,10 +76,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);

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']),
             new \Twig_SimpleFunction('isUserAnon', [$this, 'isUserAnon']),
         ];
@@ -50,7 +50,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()
@@ -70,7 +70,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 = [])
@@ -89,7 +89,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()
@@ -110,10 +110,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
@@ -170,41 +170,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',
@@ -225,8 +225,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',
@@ -241,18 +241,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',
@@ -413,8 +413,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']),
         ];
     }
 
@@ -441,10 +441,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/SimpleEditCounterController.php

Unused Use Statements -3 removed lines

@@ -4,12 +4,9 @@
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\Config\Definition\Exception\Exception;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Xtools\ProjectRepository;
 use Xtools\User;
-use Xtools\UserRepository;
 
 class SimpleEditCounterController extends Controller
 {

Spacing +8 added lines, -8 removed lines

@@ -34,10 +34,10 @@ 
         $username = $request->query->get('username', $request->query->get('user'));
 
         if ($projectQuery != '' && $username != '') {
-            $routeParams = [ 'project' => $projectQuery, 'username' => $username ];
+            $routeParams = ['project' => $projectQuery, 'username' => $username];
             return $this->redirectToRoute('SimpleEditCounterResult', $routeParams);
         } elseif ($projectQuery != '') {
-            return $this->redirectToRoute('SimpleEditCounterProject', [ 'project' => $projectQuery ]);
+            return $this->redirectToRoute('SimpleEditCounterProject', ['project' => $projectQuery]);
         }
 
         // Otherwise fall through.
@@ -94,8 +94,8 @@ 
         $resultQuery->execute();
 
         if ($resultQuery->errorCode() > 0) {
-            $this->addFlash('notice', [ 'no-result', $username ]);
-            return $this->redirectToRoute('SimpleEditCounterProject', [ 'project' => $projectQuery ]);
+            $this->addFlash('notice', ['no-result', $username]);
+            return $this->redirectToRoute('SimpleEditCounterProject', ['project' => $projectQuery]);
         }
 
         // Fetch the result data
@@ -119,16 +119,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' => $projectQuery ]);
+            return $this->redirectToRoute('SimpleEditCounterProject', ['project' => $projectQuery]);
         }
 
         // Remove the last comma and space
@@ -158,7 +158,7 @@ 
             'project_url' => $url,
             'id' => $id,
             'arch' => $arch,
-            'rev' => $rev + $arch,
+            'rev' => $rev+$arch,
             'live' => $rev,
             'groups' => $groups,
             'globalGroups' => $globalGroups,

src/Xtools/Page.php

Doc Comments +5 added lines, -5 removed lines

@@ -55,7 +55,7 @@ 
 
     /**
      * Get this page's database ID.
-     * @return int
+     * @return \string|null
      */
     public function getId()
     {
@@ -65,7 +65,7 @@ 
 
     /**
      * Get this page's length in bytes.
-     * @return int
+     * @return \string|null
      */
     public function getLength()
     {
@@ -88,7 +88,7 @@ 
     }
 
     /**
-     * @return string
+     * @return \string|null
      */
     public function getUrl()
     {
@@ -98,7 +98,7 @@ 
 
     /**
      * Get the numerical value for the namespace
-     * @return int
+     * @return \string|null
      */
     public function getNamespace()
     {
@@ -108,7 +108,7 @@ 
 
     /**
      * Get the number of page watchers
-     * @return int
+     * @return \string|null
      */
     public function getWatchers()
     {