x-tools / xtools

src/AppBundle/Controller/EditSummaryController.php

Unused Use Statements -1 removed lines

@@ -10,7 +10,6 @@
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Psr\Cache\CacheItemPoolInterface;
 use Xtools\Project;
 use Xtools\ProjectRepository;
 use Xtools\User;

Spacing +4 added lines, -6 removed lines

@@ -143,8 +143,8 @@ 
     {
         $dbName = $project->getDatabaseName();
 
-        $cacheKey = 'editsummaryusage.' . $dbName . '.'
-            . $user->getCacheKey() . '.' . $namespace;
+        $cacheKey = 'editsummaryusage.'.$dbName.'.'
+            . $user->getCacheKey().'.'.$namespace;
 
         $cache = $this->container->get('cache.app');
         if ($cache->hasItem($cacheKey)) {
@@ -231,8 +231,7 @@ 
             if ($row['rev_minor_edit'] == 0) {
                 if ($row['rev_comment'] !== '') {
                     isset($monthEditsummaryTotals[$monthkey]) ?
-                        $monthEditsummaryTotals[$monthkey]++ :
-                        $monthEditsummaryTotals[$monthkey] = 1;
+                        $monthEditsummaryTotals[$monthkey]++ : $monthEditsummaryTotals[$monthkey] = 1;
                     $totalSummariesMajor++;
                 }
 
@@ -249,8 +248,7 @@ 
                 // If there is a comment, count it
                 if ($row['rev_comment'] !== '') {
                     isset($monthEditsummaryTotals[$monthkey]) ?
-                        $monthEditsummaryTotals[$monthkey]++ :
-                        $monthEditsummaryTotals[$monthkey] = 1;
+                        $monthEditsummaryTotals[$monthkey]++ : $monthEditsummaryTotals[$monthkey] = 1;
                     $totalSummariesMinor++;
                     $totalEditsMinor++;
                 } else {

src/Xtools/UserRepository.php

Doc Comments +1 added lines, -1 removed lines

@@ -695,7 +695,7 @@
      * Get the combined regex and tags for all semi-automated tools,
      *   ready to be used in a query.
      * @param string $projectDomain Such as en.wikipedia.org
-     * @param $conn Doctrine\DBAL\Connection Used for proper escaping
+     * @param \Doctrine\DBAL\Connection $conn Doctrine\DBAL\Connection Used for proper escaping
      * @return string[] In the format:
      *    ['combined|regex', 'combined,tags']
      */

Spacing +26 added lines, -26 removed lines

@@ -78,7 +78,7 @@ 
 
         $this->stopwatch->start($cacheKey, 'XTools');
         $api = $this->getMediawikiApi($project);
-        $params = [ "list"=>"users", "ususers"=>$username, "usprop"=>"groups" ];
+        $params = ["list"=>"users", "ususers"=>$username, "usprop"=>"groups"];
         $query = new SimpleRequest('query', $params);
         $result = [];
         $res = $api->getRequest($query);
@@ -113,7 +113,7 @@ 
 
         // Create the API query.
         $api = $this->getMediawikiApi($project);
-        $params = [ "meta"=>"globaluserinfo", "guiuser"=>$username, "guiprop"=>"groups" ];
+        $params = ["meta"=>"globaluserinfo", "guiuser"=>$username, "guiprop"=>"groups"];
         $query = new SimpleRequest('query', $params);
 
         // Get the result.
@@ -157,8 +157,8 @@ 
     {
         $username = $user->getUsername();
 
-        $cacheKey = 'pages.' . $project->getDatabaseName() . '.'
-            . $user->getCacheKey() . '.' . $namespace . '.' . $redirects;
+        $cacheKey = 'pages.'.$project->getDatabaseName().'.'
+            . $user->getCacheKey().'.'.$namespace.'.'.$redirects;
         if ($this->cache->hasItem($cacheKey)) {
             return $this->cache->getItem($cacheKey)->get();
         }
@@ -216,7 +216,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
@@ -263,21 +263,21 @@ 
      */
     public function countEdits(Project $project, User $user, $namespace = 'all', $start = '', $end = '')
     {
-        $cacheKey = 'editcount.' . $project->getDatabaseName() . '.'
-            . $user->getCacheKey() . '.' . $namespace;
+        $cacheKey = 'editcount.'.$project->getDatabaseName().'.'
+            . $user->getCacheKey().'.'.$namespace;
 
         $condBegin = '';
         $condEnd = '';
 
         if (!empty($start)) {
-            $cacheKey .= '.' . $start;
+            $cacheKey .= '.'.$start;
 
             // For the query
             $start = date('Ymd000000', strtotime($start));
             $condBegin = 'AND rev_timestamp >= :start ';
         }
         if (!empty($end)) {
-            $cacheKey .= '.' . $end;
+            $cacheKey .= '.'.$end;
 
             // For the query
             $end = date('Ymd235959', strtotime($end));
@@ -337,21 +337,21 @@ 
      */
     public function countAutomatedEdits(Project $project, User $user, $namespace = 'all', $start = '', $end = '')
     {
-        $cacheKey = 'autoeditcount.' . $project->getDatabaseName() . '.'
-            . $user->getCacheKey() . '.' . $namespace;
+        $cacheKey = 'autoeditcount.'.$project->getDatabaseName().'.'
+            . $user->getCacheKey().'.'.$namespace;
 
         $condBegin = '';
         $condEnd = '';
 
         if (!empty($start)) {
-            $cacheKey .= '.' . $start;
+            $cacheKey .= '.'.$start;
 
             // For the query
             $start = date('Ymd000000', strtotime($start));
             $condBegin = 'AND rev_timestamp >= :start ';
         }
         if (!empty($end)) {
-            $cacheKey .= '.' . $end;
+            $cacheKey .= '.'.$end;
 
             // For the query
             $end = date('Ymd235959', strtotime($end));
@@ -382,7 +382,7 @@ 
             $tagJoin = $tags != '' ? "LEFT OUTER JOIN $tagTable ON ct_rev_id = rev_id" : '';
             $condTools[] = "ct_tag IN ($tags)";
         }
-        $condTool = 'AND (' . implode(' OR ', $condTools) . ')';
+        $condTool = 'AND ('.implode(' OR ', $condTools).')';
 
         $sql = "SELECT COUNT(DISTINCT(rev_id))
                 FROM $revisionTable
@@ -439,21 +439,21 @@ 
         $end = '',
         $offset = 0
     ) {
-        $cacheKey = 'nonautoedits.' . $project->getDatabaseName() . '.'
-            . $user->getCacheKey() . '.' . $namespace . '.' . $offset;
+        $cacheKey = 'nonautoedits.'.$project->getDatabaseName().'.'
+            . $user->getCacheKey().'.'.$namespace.'.'.$offset;
 
         $condBegin = '';
         $condEnd = '';
 
         if (!empty($start)) {
-            $cacheKey .= '.' . $start;
+            $cacheKey .= '.'.$start;
 
             // For the query
             $start = date('Ymd000000', strtotime($start));
             $condBegin = 'AND revs.rev_timestamp >= :start ';
         }
         if (!empty($end)) {
-            $cacheKey .= '.' . $end;
+            $cacheKey .= '.'.$end;
 
             // For the query
             $end = date('Ymd235959', strtotime($end));
@@ -546,21 +546,21 @@ 
         $start = '',
         $end = ''
     ) {
-        $cacheKey = 'autotoolcounts.' . $project->getDatabaseName() . '.'
-            . $user->getCacheKey() . '.' . $namespace;
+        $cacheKey = 'autotoolcounts.'.$project->getDatabaseName().'.'
+            . $user->getCacheKey().'.'.$namespace;
 
         $condBegin = '';
         $condEnd = '';
 
         if (!empty($start)) {
-            $cacheKey .= '.' . $start;
+            $cacheKey .= '.'.$start;
 
             // For the query
             $start = date('Ymd000000', strtotime($start));
             $condBegin = 'AND rev_timestamp >= :start ';
         }
         if (!empty($end)) {
-            $cacheKey .= '.' . $end;
+            $cacheKey .= '.'.$end;
 
             // For the query
             $end = date('Ymd235959', strtotime($end));
@@ -608,13 +608,13 @@ 
                 if ($condTool === '') {
                     $condTool = "ct_tag = $tag";
                 } else {
-                    $condTool = '(' . $condTool . " OR ct_tag = $tag)";
+                    $condTool = '('.$condTool." OR ct_tag = $tag)";
                 }
             }
 
             // Developer error, no regex or tag provided for this tool.
             if ($condTool === '') {
-                throw new Exception("No regex or tag found for the tool $toolname. " .
+                throw new Exception("No regex or tag found for the tool $toolname. ".
                     "Please verify this entry in semi_automated.yml");
             }
 
@@ -666,8 +666,8 @@ 
         }
 
         // Sort the array by count
-        uasort($results, function ($a, $b) {
-            return $b['count'] - $a['count'];
+        uasort($results, function($a, $b) {
+            return $b['count']-$a['count'];
         });
 
         // Cache for 10 minutes, and return.

tests/Xtools/EditTest.php

Unused Use Statements -1 removed lines

@@ -11,7 +11,6 @@
 use Xtools\Project;
 use Xtools\ProjectRepository;
 use Symfony\Component\DependencyInjection\Container;
-use AppBundle\Helper\AutomatedEditsHelper;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
         ]);
 
         $this->assertEquals(
-            "<script>alert("XSS baby")</script> " .
+            "<script>alert("XSS baby")</script> ".
                 "<a target='_blank' href='https://test.example.org/wiki/Test_page'>test page</a>",
             $edit->getWikifiedSummary()
         );

src/AppBundle/Helper/AutomatedEditsHelper.php

Spacing +3 added lines, -3 removed lines

@@ -57,7 +57,7 @@ 
      */
     public function isAutomated($summary, $projectDomain)
     {
-        return (bool) $this->getTool($summary, $projectDomain);
+        return (bool)$this->getTool($summary, $projectDomain);
     }
 
     /**
@@ -109,14 +109,14 @@ 
 
         $revertEntries = array_filter(
             $this->getTools($projectDomain),
-            function ($tool) {
+            function($tool) {
                 return isset($tool['revert']);
             }
         );
 
         // If 'revert' is set to `true`, the use 'regex' as the regular expression,
         //  otherwise 'revert' is assumed to be the regex string.
-        $this->revertTools[$projectDomain] = array_map(function ($revertTool) {
+        $this->revertTools[$projectDomain] = array_map(function($revertTool) {
             return [
                 'link' => $revertTool['link'],
                 'regex' => $revertTool['revert'] === true ? $revertTool['regex'] : $revertTool['revert']

src/Xtools/Edit.php

Spacing +10 added lines, -10 removed lines

@@ -49,7 +49,7 @@ 
         $this->page = $page;
 
         // Copy over supported attributes
-        $this->id = (int) $attrs['id'];
+        $this->id = (int)$attrs['id'];
 
         // Allow DateTime or string (latter assumed to be of format YmdHis)
         if ($attrs['timestamp'] instanceof DateTime) {
@@ -198,7 +198,7 @@ 
         $isSection = preg_match_all("/^\/\* (.*?) \*\//", $summary, $sectionMatch);
 
         if ($isSection) {
-            $pageUrl = $this->getProject()->getUrl(false) . str_replace(
+            $pageUrl = $this->getProject()->getUrl(false).str_replace(
                 '$1',
                 $this->getPage()->getTitle(),
                 $this->getProject()->getArticlePath()
@@ -208,8 +208,8 @@ 
             // Must have underscores for the link to properly go to the section
             $sectionTitleLink = htmlspecialchars(str_replace(' ', '_', $sectionTitle));
 
-            $sectionWikitext = "<a target='_blank' href='$pageUrl#$sectionTitleLink'>&rarr;</a>" .
-                "<em class='text-muted'>" . htmlspecialchars($sectionTitle) . ":</em> ";
+            $sectionWikitext = "<a target='_blank' href='$pageUrl#$sectionTitleLink'>&rarr;</a>".
+                "<em class='text-muted'>".htmlspecialchars($sectionTitle).":</em> ";
             $summary = str_replace($sectionMatch[0][0], $sectionWikitext, $summary);
         }
 
@@ -223,7 +223,7 @@ 
             );
 
             // Use normalized page title (underscored, capitalized)
-            $pageUrl = $this->getProject()->getUrl(false) . str_replace(
+            $pageUrl = $this->getProject()->getUrl(false).str_replace(
                 '$1',
                 ucfirst(str_replace(' ', '_', $wikiLinkPath)),
                 $this->getProject()->getArticlePath()
@@ -261,8 +261,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;
     }
 
     /**
@@ -272,8 +272,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;
     }
 
     /**
@@ -305,7 +305,7 @@ 
      */
     public function isAutomated(Container $container)
     {
-        return (bool) $this->getTool($container);
+        return (bool)$this->getTool($container);
     }
 
     /**

src/AppBundle/EventSubscriber/RateLimitSubscriber.php

Spacing +10 added lines, -10 removed lines

@@ -56,8 +56,8 @@ 
      */
     public function onKernelController(FilterControllerEvent $event)
     {
-        $this->rateLimit = (int) $this->container->getParameter('app.rate_limit_count');
-        $this->rateDuration = (int) $this->container->getParameter('app.rate_limit_time');
+        $this->rateLimit = (int)$this->container->getParameter('app.rate_limit_count');
+        $this->rateDuration = (int)$this->container->getParameter('app.rate_limit_time');
 
         // Zero values indicate the rate limiting feature should be disabled.
         if ($this->rateLimit === 0 || $this->rateDuration === 0) {
@@ -65,7 +65,7 @@ 
         }
 
         $controller = $event->getController();
-        $loggedIn = (bool) $this->container->get('session')->get('logged_in_user');
+        $loggedIn = (bool)$this->container->get('session')->get('logged_in_user');
 
         // No rate limits on index pages or if they are logged in.
         if ($controller[1] === 'indexAction' || $loggedIn) {
@@ -85,7 +85,7 @@ 
         $cacheItem = $cache->getItem($cacheKey);
 
         // If increment value already in cache, or start with 1.
-        $count = $cacheItem->isHit() ? (int) $cacheItem->get() + 1 : 1;
+        $count = $cacheItem->isHit() ? (int)$cacheItem->get()+1 : 1;
 
         // Check if limit has been exceeded, and if so, throw an error.
         if ($count > $this->rateLimit) {
@@ -137,14 +137,14 @@ 
         // Log the denied request
         $logger = $this->container->get('monolog.logger.rate_limit');
         $logger->info(
-            "<URI>: " . $request->getRequestUri() .
-            ($logComment != '' ? "\t<Reason>: $logComment" : '') .
-            "\t<User agent>: " . $request->headers->get('User-Agent')
+            "<URI>: ".$request->getRequestUri().
+            ($logComment != '' ? "\t<Reason>: $logComment" : '').
+            "\t<User agent>: ".$request->headers->get('User-Agent')
         );
 
-        throw new AccessDeniedHttpException("Possible spider crawl detected. " .
-            'If you are human, you are making too many requests during a short period of time. ' .
-            "Please wait $this->rateDuration minutes before reloading this tool. You can then " .
+        throw new AccessDeniedHttpException("Possible spider crawl detected. ".
+            'If you are human, you are making too many requests during a short period of time. '.
+            "Please wait $this->rateDuration minutes before reloading this tool. You can then ".
             'login to prevent this from happening again.');
     }
 }