x-tools / xtools

src/AppBundle/Controller/ArticleInfoController.php

Doc Comments -1 removed lines

@@ -380,7 +380,6 @@
 
     /**
      * Get the size of the diff
-     * @param  int $rev The index of the revision within $this->pageHistory
      * @return int Size of the diff
      */
     private function getDiffSize($revIndex)

Unused Use Statements -5 removed lines

@@ -2,15 +2,10 @@
 
 namespace AppBundle\Controller;
 
-use DateTime;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use AppBundle\Helper\Apihelper;
-use AppBundle\Helper\PageviewsHelper;
-use AppBundle\Helper\AutomatedEditsHelper;
 use Xtools\ProjectRepository;
 use Xtools\Page;
 use Xtools\PagesRepository;

Spacing +23 added lines, -23 removed lines

@@ -59,9 +59,9 @@ 
         $article = $request->query->get('article');
 
         if ($projectQuery != '' && $article != '') {
-            return $this->redirectToRoute('ArticleInfoResult', [ 'project'=>$projectQuery, 'article' => $article ]);
+            return $this->redirectToRoute('ArticleInfoResult', ['project'=>$projectQuery, 'article' => $article]);
         } elseif ($article != '') {
-            return $this->redirectToRoute('ArticleInfoProject', [ 'project'=>$projectQuery ]);
+            return $this->redirectToRoute('ArticleInfoProject', ['project'=>$projectQuery]);
         }
 
         if ($projectQuery == '') {
@@ -130,7 +130,7 @@ 
         $this->pageInfo['firstEdit'] = new Edit($this->pageInfo['page'], $this->pageHistory[0]);
         $this->pageInfo['lastEdit'] = new Edit(
             $this->pageInfo['page'],
-            $this->pageHistory[$page->getNumRevisions() - 1]
+            $this->pageHistory[$page->getNumRevisions()-1]
         );
 
         // NOTE: bots are fetched first in case we want to restrict some stats to humans editors only
@@ -195,7 +195,7 @@ 
                   FROM $this->revisionTable
                   LEFT JOIN $userGroupsTable ON rev_user = ug_user
                   LEFT JOIN $userFromerGroupsTable ON rev_user = ufg_user
-                  WHERE rev_page = " . $this->pageInfo['page']->getId() . " AND (ug_group = 'bot' OR ufg_group = 'bot')
+                  WHERE rev_page = ".$this->pageInfo['page']->getId()." AND (ug_group = 'bot' OR ufg_group = 'bot')
                   GROUP BY rev_user_text";
         $res = $this->conn->query($query)->fetchAll();
 
@@ -204,14 +204,14 @@ 
         $sum = 0;
         foreach ($res as $bot) {
             $bots[$bot['username']] = [
-                'count' => (int) $bot['count'],
+                'count' => (int)$bot['count'],
                 'current' => $bot['current'] === 'bot'
             ];
             $sum += $bot['count'];
         }
 
-        uasort($bots, function ($a, $b) {
-            return $b['count'] - $a['count'];
+        uasort($bots, function($a, $b) {
+            return $b['count']-$a['count'];
         });
 
         $this->pageInfo['general']['bot_revision_count'] = $sum;
@@ -259,10 +259,10 @@ 
 
             if ($info['all'] > 1) {
                 // Number of seconds between first and last edit
-                $secs = intval(strtotime($info['last']) - strtotime($info['first']) / $info['all']);
+                $secs = intval(strtotime($info['last'])-strtotime($info['first']) / $info['all']);
 
                 // Average time between edits (in days)
-                $this->pageInfo['editors'][$editor]['atbe'] = $secs / ( 60 * 60 * 24 );
+                $this->pageInfo['editors'][$editor]['atbe'] = $secs / (60 * 60 * 24);
             }
 
             if (count($info['sizes'])) {
@@ -277,7 +277,7 @@ 
 
         // First sort editors array by the amount of text they added
         $topTenEditorsByAdded = $this->pageInfo['editors'];
-        uasort($topTenEditorsByAdded, function ($a, $b) {
+        uasort($topTenEditorsByAdded, function($a, $b) {
             if ($a['added'] === $b['added']) {
                 return 0;
             }
@@ -286,7 +286,7 @@ 
 
         // Then build a new array of top 10 editors by added text,
         //   in the data structure needed for the chart
-        $this->pageInfo['topTenEditorsByAdded'] = array_map(function ($editor) {
+        $this->pageInfo['topTenEditorsByAdded'] = array_map(function($editor) {
             $added = $this->pageInfo['editors'][$editor]['added'];
             return [
                 'label' => $editor,
@@ -332,7 +332,7 @@ 
 
         // Transform to associative array by 'type'
         foreach ($res as $row) {
-            $data[$row['type'] . '_count'] = $row['value'];
+            $data[$row['type'].'_count'] = $row['value'];
         }
 
         return $data;
@@ -348,7 +348,7 @@ 
         $title = str_replace(' ', '_', $this->pageInfo['page']->getTitle());
         $query = "SELECT log_action, log_type, log_timestamp AS timestamp
                   FROM $loggingTable
-                  WHERE log_namespace = '" . $this->pageInfo['page']->getNamespace() . "'
+                  WHERE log_namespace = '".$this->pageInfo['page']->getNamespace()."'
                   AND log_title = '$title' AND log_timestamp > 1
                   AND log_type IN ('delete', 'move', 'protect', 'stable')";
         $events = $this->conn->query($query)->fetchAll();
@@ -447,7 +447,7 @@ 
         $conn = $this->container->get('doctrine')->getManager('replicas')->getConnection();
         $res = $conn->query($query)->fetchAll();
 
-        $terms = array_map(function ($entry) {
+        $terms = array_map(function($entry) {
             return $entry['term'];
         }, $res);
 
@@ -458,7 +458,7 @@ 
                 'prio' => 2,
                 'name' => 'Wikidata',
                 'notice' => "Label for language <em>$lang</em> is missing", // FIXME: i18n
-                'explanation' => "See: <a target='_blank' " .
+                'explanation' => "See: <a target='_blank' ".
                     "href='//www.wikidata.org/wiki/Help:Label'>Help:Label</a>",
             ];
         }
@@ -467,7 +467,7 @@ 
                 'prio' => 3,
                 'name' => 'Wikidata',
                 'notice' => "Description for language <em>$lang</em> is missing", // FIXME: i18n
-                'explanation' => "See: <a target='_blank' " .
+                'explanation' => "See: <a target='_blank' ".
                     "href='//www.wikidata.org/wiki/Help:Description'>Help:Description</a>",
             ];
         }
@@ -488,14 +488,14 @@ 
             return $rev['length'];
         }
 
-        $lastRev = $this->pageHistory[$revIndex - 1];
+        $lastRev = $this->pageHistory[$revIndex-1];
 
         // TODO: Remove once T101631 is resolved
         // Treat as zero change in size if length of previous edit is missing
         if ($lastRev['length'] === null) {
             return 0;
         } else {
-            return $rev['length'] - $lastRev['length'];
+            return $rev['length']-$lastRev['length'];
         }
     }
 
@@ -515,10 +515,10 @@ 
 
         // Get UNIX timestamp of the first day of the month of the first edit
         // This is used as a comparison when building our array of per-month stats
-        $firstEditMonth = mktime(0, 0, 0, (int) $firstEdit->getMonth(), 1, $firstEdit->getYear());
+        $firstEditMonth = mktime(0, 0, 0, (int)$firstEdit->getMonth(), 1, $firstEdit->getYear());
 
         $lastEdit = $this->pageInfo['lastEdit'];
-        $secondLastEdit = $revisionCount === 1 ? $lastEdit : $this->pageHistory[ $revisionCount - 2 ];
+        $secondLastEdit = $revisionCount === 1 ? $lastEdit : $this->pageHistory[$revisionCount-2];
 
         // Now we can start our master array. This one will be HUGE!
         $data = [
@@ -589,7 +589,7 @@ 
             // Increment year and month counts for all edits
             $data['year_count'][$edit->getYear()]['all']++;
             $data['year_count'][$edit->getYear()]['months'][$edit->getMonth()]['all']++;
-            $data['year_count'][$edit->getYear()]['size'] = (int) $rev['length'];
+            $data['year_count'][$edit->getYear()]['size'] = (int)$rev['length'];
 
             $editsThisMonth = $data['year_count'][$edit->getYear()]['months'][$edit->getMonth()]['all'];
             if ($editsThisMonth > $data['max_edits_per_month']) {
@@ -633,9 +633,9 @@ 
                 }
 
                 // determine if the next revision was a revert
-                $nextRevision = isset($this->pageHistory[$i + 1]) ? $this->pageHistory[$i + 1] : null;
+                $nextRevision = isset($this->pageHistory[$i+1]) ? $this->pageHistory[$i+1] : null;
                 $nextRevisionIsRevert = $nextRevision &&
-                    $this->getDiffSize($i + 1) === -$edit->getSize() &&
+                    $this->getDiffSize($i+1) === -$edit->getSize() &&
                     $this->aeh->isRevert($nextRevision['comment']);
 
                 // don't count this edit as content removal if the next edit reverted it

web/app_dev.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 // Feel free to remove this, extend it, or make something more sophisticated.
 if (isset($_SERVER['HTTP_CLIENT_IP'])
     || isset($_SERVER['HTTP_X_FORWARDED_FOR'])
-    || !( in_array(@$_SERVER['REMOTE_ADDR'], [ '127.0.0.1', 'fe80::1', '::1' ]) || php_sapi_name() === 'cli-server' )
+    || !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1']) || php_sapi_name() === 'cli-server')
 ) {
     header('HTTP/1.0 403 Forbidden');
     exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');

xtools_utilities/nonautomated_edits_parse.php

Spacing +4 added lines, -4 removed lines

@@ -15,11 +15,11 @@
 $data = json_decode($file, true);
 
 // Output the contents to the piped file
-print ( "parameters:
+print ("parameters:
   automated_tools:\r\n" );
 foreach ($data as $row) {
-    print "  - " . $row["name"] . ": '" . $row["regex"] . "'\r\n";
+    print "  - ".$row["name"].": '".$row["regex"]."'\r\n";
 }
-print ( "
+print ("
 
-  semi-automated edits source: $url" );
+  semi-automated edits source: $url");

src/AppBundle/Helper/PageviewsHelper.php

Spacing +3 added lines, -3 removed lines

@@ -12,8 +12,8 @@ 
         $title = str_replace(' ', '_', $title);
         $client = new GuzzleHttp\Client();
 
-        $url = 'https://wikimedia.org/api/rest_v1/metrics/pageviews/per-article/' .
-            "$project/all-access/user/" . rawurlencode($title) . '/daily/' . $start . '/' . $end;
+        $url = 'https://wikimedia.org/api/rest_v1/metrics/pageviews/per-article/'.
+            "$project/all-access/user/".rawurlencode($title).'/daily/'.$start.'/'.$end;
 
         $res = $client->request('GET', $url);
         return json_decode($res->getBody()->getContents());
@@ -32,7 +32,7 @@ 
         $data = $this->getLastDays($project, $title, $days);
 
         // FIXME: needs to handle gotchas
-        return array_sum(array_map(function ($item) {
+        return array_sum(array_map(function($item) {
             return $item->views;
         }, $data->items));
     }

src/AppBundle/Twig/Extension.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         }
 
         // Find the path, and complain if English doesn't exist.
-        $path = $this->container->getParameter("kernel.root_dir") . '/../i18n';
+        $path = $this->container->getParameter("kernel.root_dir").'/../i18n';
         if (!file_exists("$path/en.json")) {
             throw new Exception("Language directory doesn't exist: $path");
         }

src/AppBundle/Controller/AdminStatsController.php

Spacing +1 added lines, -1 removed lines

@@ -176,7 +176,7 @@
 
         // Iterate over query results, loading each user id into the array
         while ($row = $res->fetch()) {
-            $adminIdArr[] = $row["user_id"] ;
+            $adminIdArr[] = $row["user_id"];
         }
 
         // Set the query results to be useful in a sql statement.

src/AppBundle/Controller/QuoteController.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Symfony\Component\Debug\Exception\ContextErrorException;
 use Symfony\Component\Routing\Exception\InvalidParameterException;
 use Symfony\Component\HttpFoundation\Request;
 

Spacing +2 added lines, -2 removed lines

@@ -111,7 +111,7 @@ 
             'quote/all.html.twig',
             [
                 'base_dir' => realpath(
-                    $this->getParameter('kernel.root_dir') . '/..'
+                    $this->getParameter('kernel.root_dir').'/..'
                 ),
                 'xtPage' => 'bash',
                 'quotes' => $quotes,
@@ -160,7 +160,7 @@ 
             'quote/view.html.twig',
             [
                 'base_dir' => realpath(
-                    $this->getParameter('kernel.root_dir') . '/..'
+                    $this->getParameter('kernel.root_dir').'/..'
                 ),
                 "xtPage" => "bash",
                 "text" => $text,

src/AppBundle/Twig/WikiExtension.php

Spacing +15 added lines, -15 removed lines

@@ -14,25 +14,25 @@ 
 
     public function intuitionMessage($message = "", $vars = [])
     {
-        return $this->getIntuition()->msg($message, [ "domain" => "xtools", "variables" => $vars ]);
+        return $this->getIntuition()->msg($message, ["domain" => "xtools", "variables" => $vars]);
     }
 
     /*********************************** FUNCTIONS ***********************************/
 
     public function getFunctions()
     {
-        $options = [ 'is_safe' => [ 'html']];
+        $options = ['is_safe' => ['html']];
         return [
-            new Twig_SimpleFunction('wiki_link', [ $this, 'wikiLink' ], $options),
-            new Twig_SimpleFunction('user_link', [ $this, 'userLink' ], $options),
-            new Twig_SimpleFunction('user_log_link', [ $this, 'userLogLink' ], $options),
-            new Twig_SimpleFunction('group_link', [ $this, 'groupLink' ], $options),
-            new Twig_SimpleFunction('wiki_history_link', [ $this, 'wikiHistoryLink' ], $options),
-            new Twig_SimpleFunction('wiki_log_link', [ $this, 'wikiLogLink' ], $options),
-            new Twig_SimpleFunction('pageviews_links', [ $this, 'pageviewsLinks' ], $options),
-            new Twig_SimpleFunction('diff_link', [ $this, 'diffLink' ], $options),
-            new Twig_SimpleFunction('perma_link', [ $this, 'permaLink' ], $options),
-            new Twig_SimpleFunction('edit_link', [ $this, 'editLink' ], $options),
+            new Twig_SimpleFunction('wiki_link', [$this, 'wikiLink'], $options),
+            new Twig_SimpleFunction('user_link', [$this, 'userLink'], $options),
+            new Twig_SimpleFunction('user_log_link', [$this, 'userLogLink'], $options),
+            new Twig_SimpleFunction('group_link', [$this, 'groupLink'], $options),
+            new Twig_SimpleFunction('wiki_history_link', [$this, 'wikiHistoryLink'], $options),
+            new Twig_SimpleFunction('wiki_log_link', [$this, 'wikiLogLink'], $options),
+            new Twig_SimpleFunction('pageviews_links', [$this, 'pageviewsLinks'], $options),
+            new Twig_SimpleFunction('diff_link', [$this, 'diffLink'], $options),
+            new Twig_SimpleFunction('perma_link', [$this, 'permaLink'], $options),
+            new Twig_SimpleFunction('edit_link', [$this, 'editLink'], $options),
         ];
     }
 
@@ -244,8 +244,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']]),
         ];
     }
 
@@ -284,7 +284,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);
         }

Doc Comments +1 added lines, -2 removed lines

@@ -80,7 +80,6 @@ 
 
     /**
      * Link to list of users who are in the given user group
-     * @param  string $username   Username
      * @param  string $projectUrl Project domain and protocol such as https://en.wikipedia.org
      * @param  string [$label]    The link text, defaults to $username
      * @return string Markup
@@ -230,7 +229,7 @@ 
     /**
      * Get links to pageviews tools for the given page
      * @param  string $title      Title of page
-     * @param  string $projectUrl Project domain such as en.wikipedia.org
+     * @param  string $project Project domain such as en.wikipedia.org
      * @return string Markup
      */
     public function pageviewsLinks($title, $project)

src/AppBundle/Helper/ApiHelper.php

Doc Comments +1 added lines, -1 removed lines

@@ -177,7 +177,7 @@
      * Get a list of namespaces on the given project.
      *
      * @param string    $project such as en.wikipedia.org
-     * @return string[] Array of namespace IDs (keys) to names (values).
+     * @return string Array of namespace IDs (keys) to names (values).
      */
     public function namespaces($project)
     {

Unused Use Statements -2 removed lines

@@ -2,13 +2,11 @@
 
 namespace AppBundle\Helper;
 
-use DateInterval;
 use Mediawiki\Api\MediawikiApi;
 use Mediawiki\Api\SimpleRequest;
 use Mediawiki\Api\FluentRequest;
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Config\Definition\Exception\Exception;
-use Symfony\Component\Debug\Exception\FatalErrorException;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Xtools\ProjectRepository;
 

Spacing +13 added lines, -13 removed lines

@@ -66,12 +66,12 @@ 
             throw new Exception("Unable to find project '$projectName'");
         }
 
-        $cacheKey = "siteinfo." . $project->getDatabaseName();
+        $cacheKey = "siteinfo.".$project->getDatabaseName();
         if ($this->cacheHas($cacheKey)) {
             return $this->cacheGet($cacheKey);
         }
 
-        $params = [ 'meta'=>'siteinfo', 'siprop'=>'general|namespaces' ];
+        $params = ['meta'=>'siteinfo', 'siprop'=>'general|namespaces'];
         $query = new SimpleRequest('query', $params);
 
         $result = [
@@ -135,7 +135,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 = [];
 
@@ -154,7 +154,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 = [];
 
@@ -202,7 +202,7 @@ 
                 $groups[] = "B";
             }
             if (in_array("steward", $admin["groups"])) {
-                $groups[] = "S" ;
+                $groups[] = "S";
             }
             if (in_array("checkuser", $admin["groups"])) {
                 $groups[] = "CU";
@@ -213,7 +213,7 @@ 
             if (in_array("bot", $admin["groups"])) {
                 $groups[] = "Bot";
             }
-            $result[ $admin["name"] ] = [
+            $result[$admin["name"]] = [
                 "groups" => implode('/', $groups)
             ];
         }
@@ -288,7 +288,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']
@@ -334,7 +334,7 @@ 
         ];
 
         // get assessments for this page from the API
-        $assessments = $this->massApi($params, $project, function ($data) {
+        $assessments = $this->massApi($params, $project, function($data) {
             return isset($data['pages'][0]['pageassessments']) ? $data['pages'][0]['pageassessments'] : [];
         }, 'pacontinue')['pages'];
 
@@ -358,7 +358,7 @@ 
                 $classAttrs = $config['class']['Unknown'];
                 $assessment['class']['value'] = '???';
                 $assessment['class']['category'] = $classAttrs['category'];
-                $assessment['class']['badge'] = "https://upload.wikimedia.org/wikipedia/commons/". $classAttrs['badge'];
+                $assessment['class']['badge'] = "https://upload.wikimedia.org/wikipedia/commons/".$classAttrs['badge'];
             } else {
                 $classAttrs = $config['class'][$classValue];
                 $assessment['class'] = [
@@ -369,7 +369,7 @@ 
 
                 // add full URL to badge icon
                 if ($classAttrs['badge'] !== '') {
-                    $assessment['class']['badge'] = "https://upload.wikimedia.org/wikipedia/commons/" .
+                    $assessment['class']['badge'] = "https://upload.wikimedia.org/wikipedia/commons/".
                         $classAttrs['badge'];
                 }
 
@@ -418,9 +418,9 @@ 
         $config = $this->getAssessmentsConfig();
 
         if (isset($config[$project]['class'][$class])) {
-            return "https://upload.wikimedia.org/wikipedia/commons/" . $config[$project]['class'][$class]['badge'];
+            return "https://upload.wikimedia.org/wikipedia/commons/".$config[$project]['class'][$class]['badge'];
         } elseif (isset($config[$project]['class']['Unknown'])) {
-            return "https://upload.wikimedia.org/wikipedia/commons/" . $config[$project]['class']['Unknown']['badge'];
+            return "https://upload.wikimedia.org/wikipedia/commons/".$config[$project]['class']['Unknown']['badge'];
         } else {
             return "";
         }
@@ -513,7 +513,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);