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)

Indentation +1 added lines, -1 removed lines

@@ -164,7 +164,7 @@
     private function getRevCount()
     {
         $query = "SELECT COUNT(*) AS count FROM " . $this->revisionTable
-                 . " WHERE rev_page = '" . $this->pageInfo['id'] . "'";
+                    . " WHERE rev_page = '" . $this->pageInfo['id'] . "'";
         $res = $this->conn->query($query)->fetchAll();
         return $res[0]['count'];
     }

Spacing +27 added lines, -27 removed lines

@@ -55,9 +55,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]);
         }
 
         return $this->render('articleInfo/index.html.twig', [
@@ -101,7 +101,7 @@ 
             'url' => $basicInfo['fullurl']
         ];
 
-        $this->pageInfo['watchers'] = ( isset($basicInfo['watchers']) ) ? $basicInfo['watchers'] : "< 30";
+        $this->pageInfo['watchers'] = (isset($basicInfo['watchers'])) ? $basicInfo['watchers'] : "< 30";
 
         $pageProps = isset($basicInfo['pageprops']) ? $basicInfo['pageprops'] : [];
 
@@ -164,8 +164,8 @@ 
      */
     private function getRevCount()
     {
-        $query = "SELECT COUNT(*) AS count FROM " . $this->revisionTable
-                 . " WHERE rev_page = '" . $this->pageInfo['id'] . "'";
+        $query = "SELECT COUNT(*) AS count FROM ".$this->revisionTable
+                 . " WHERE rev_page = '".$this->pageInfo['id']."'";
         $res = $this->conn->query($query)->fetchAll();
         return $res[0]['count'];
     }
@@ -197,7 +197,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['id'] . " AND (ug_group = 'bot' OR ufg_group = 'bot')
+                  WHERE rev_page = ".$this->pageInfo['id']." AND (ug_group = 'bot' OR ufg_group = 'bot')
                   GROUP BY rev_user_text";
         $res = $this->conn->query($query)->fetchAll();
 
@@ -206,14 +206,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;
@@ -261,10 +261,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'])) {
@@ -279,7 +279,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;
             }
@@ -288,7 +288,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,
@@ -334,7 +334,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;
@@ -350,7 +350,7 @@ 
         $title = str_replace(' ', '_', $this->pageInfo['title']);
         $query = "SELECT log_action, log_type, log_timestamp AS timestamp
                   FROM $loggingTable
-                  WHERE log_namespace = '" . $this->pageInfo['namespace'] . "'
+                  WHERE log_namespace = '".$this->pageInfo['namespace']."'
                   AND log_title = '$title' AND log_timestamp > 1
                   AND log_type IN ('delete', 'move', 'protect', 'stable')";
         $events = $this->conn->query($query)->fetchAll();
@@ -435,7 +435,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);
 
@@ -446,7 +446,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>",
             ];
         }
@@ -455,7 +455,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>",
             ];
         }
@@ -472,7 +472,7 @@ 
         $query = "SELECT rev_id, rev_parent_id, rev_user_text, rev_user, rev_timestamp,
                   rev_minor_edit, rev_len, rev_comment
                   FROM $this->revisionTable
-                  WHERE rev_page = '" . $this->pageInfo['id'] . "' AND rev_timestamp > 1
+                  WHERE rev_page = '".$this->pageInfo['id']."' AND rev_timestamp > 1
                   ORDER BY rev_timestamp";
 
         $res = $this->conn->query($query)->fetchAll();
@@ -492,14 +492,14 @@ 
             return $rev['rev_len'];
         }
 
-        $lastRev = $this->pageHistory[$revIndex - 1];
+        $lastRev = $this->pageHistory[$revIndex-1];
 
         // TODO: Remove once T101631 is resolved
         // Treat as zero change in size if rev_len of previous edit is missing
         if ($lastRev['rev_len'] === null) {
             return 0;
         } else {
-            return $rev['rev_len'] - $lastRev['rev_len'];
+            return $rev['rev_len']-$lastRev['rev_len'];
         }
     }
 
@@ -520,12 +520,12 @@ 
         // The month of the first edit. Used as a comparison when building the per-month data
         $firstEditMonth = strtotime(date('Y-m-01, 00:00', strtotime($firstEdit['rev_timestamp'])));
 
-        $lastEdit = $this->pageHistory[ $revisionCount - 1 ];
-        $secondLastEdit = $revisionCount === 1 ? $lastEdit : $this->pageHistory[ $revisionCount - 2 ];
+        $lastEdit = $this->pageHistory[$revisionCount-1];
+        $secondLastEdit = $revisionCount === 1 ? $lastEdit : $this->pageHistory[$revisionCount-2];
 
         // Now we can start our master array. This one will be HUGE!
         $lastEditSize = ($revisionCount > 1)
-            ? $lastEdit['rev_len'] - $secondLastEdit['rev_len']
+            ? $lastEdit['rev_len']-$secondLastEdit['rev_len']
             : $lastEdit['rev_len'];
         $data = [
             'general' => [
@@ -622,7 +622,7 @@ 
             // Increment year and month counts for all edits
             $data['year_count'][$timestamp['year']]['all']++;
             $data['year_count'][$timestamp['year']]['months'][$timestamp['month']]['all']++;
-            $data['year_count'][$timestamp['year']]['size'] = (int) $rev['rev_len'];
+            $data['year_count'][$timestamp['year']]['size'] = (int)$rev['rev_len'];
 
             $editsThisMonth = $data['year_count'][$timestamp['year']]['months'][$timestamp['month']]['all'];
             if ($editsThisMonth > $data['max_edits_per_month']) {
@@ -666,9 +666,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) === -$diffSize &&
+                    $this->getDiffSize($i+1) === -$diffSize &&
                     $this->aeh->isRevert($nextRevision['rev_comment']);
 
                 // don't count this edit as content removal if the next edit reverted it

Unused Use Statements -4 removed lines

@@ -6,11 +6,7 @@
 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;
 
 class ArticleInfoController extends Controller

src/AppBundle/Controller/DefaultController.php

Unused Use Statements -1 removed lines

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

var/SymfonyRequirements.php

Doc Comments +2 added lines, -2 removed lines

@@ -223,7 +223,7 @@ 
      * Adds a mandatory requirement in form of a php.ini configuration.
      *
      * @param string        $cfgName           The configuration name used for ini_get()
-     * @param bool|callback $evaluation        Either a boolean indicating whether the configuration should evaluate to true or false,
+     * @param boolean|string $evaluation        Either a boolean indicating whether the configuration should evaluate to true or false,
      *                                         or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
      * @param bool          $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
      *                                         This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
@@ -241,7 +241,7 @@ 
      * Adds an optional recommendation in form of a php.ini configuration.
      *
      * @param string        $cfgName           The configuration name used for ini_get()
-     * @param bool|callback $evaluation        Either a boolean indicating whether the configuration should evaluate to true or false,
+     * @param string|false $evaluation        Either a boolean indicating whether the configuration should evaluate to true or false,
      *                                         or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
      * @param bool          $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
      *                                         This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.

Spacing +9 added lines, -9 removed lines

@@ -49,11 +49,11 @@ 
      */
     public function __construct($fulfilled, $testMessage, $helpHtml, $helpText = null, $optional = false)
     {
-        $this->fulfilled = (bool) $fulfilled;
-        $this->testMessage = (string) $testMessage;
-        $this->helpHtml = (string) $helpHtml;
-        $this->helpText = null === $helpText ? strip_tags($this->helpHtml) : (string) $helpText;
-        $this->optional = (bool) $optional;
+        $this->fulfilled = (bool)$fulfilled;
+        $this->testMessage = (string)$testMessage;
+        $this->helpHtml = (string)$helpHtml;
+        $this->helpText = null === $helpText ? strip_tags($this->helpHtml) : (string)$helpText;
+        $this->optional = (bool)$optional;
     }
 
     /**
@@ -544,7 +544,7 @@ 
             );
         }
 
-        $pcreVersion = defined('PCRE_VERSION') ? (float) PCRE_VERSION : null;
+        $pcreVersion = defined('PCRE_VERSION') ? (float)PCRE_VERSION : null;
 
         $this->addRequirement(
             null !== $pcreVersion,
@@ -783,7 +783,7 @@ 
         $unit = '';
         if (!ctype_digit($size)) {
             $unit = strtolower(substr($size, -1, 1));
-            $size = (int) substr($size, 0, -1);
+            $size = (int)substr($size, 0, -1);
         }
         switch ($unit) {
             case 'g':
@@ -793,7 +793,7 @@ 
             case 'k':
                 return $size * 1024;
             default:
-                return (int) $size;
+                return (int)$size;
         }
     }
 
@@ -815,7 +815,7 @@ 
                 continue;
             }
 
-            return (int) $package['version'][1] > 2 ? self::REQUIRED_PHP_VERSION : self::LEGACY_REQUIRED_PHP_VERSION;
+            return (int)$package['version'][1] > 2 ? self::REQUIRED_PHP_VERSION : self::LEGACY_REQUIRED_PHP_VERSION;
         }
 
         return false;

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/Twig/WikiExtension.php

Doc Comments +1 added lines, -2 removed lines

@@ -72,7 +72,6 @@ 
 
     /**
      * Get a link to the given user's userpage, or to Special:Contribs if $username is an IP
-     * @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
@@ -176,7 +175,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)

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

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.