x-tools / xtools

src/AppBundle/Model/AdminStats.php

Spacing +6 added lines, -6 removed lines

@@ -3,7 +3,7 @@ 
  * This file contains only the AdminStats class.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace AppBundle\Model;
 
@@ -96,7 +96,7 @@ 
         $stats = $this->groupStatsByUsername($stats);
 
         // Resort, as for some reason the SQL doesn't do this properly.
-        uasort($stats, function ($a, $b) {
+        uasort($stats, function($a, $b) {
             if ($a['total'] === $b['total']) {
                 return 0;
             }
@@ -127,7 +127,7 @@ 
         $this->usersAndGroups = $this->project->getUsersInGroups($groupUserGroups['local'], $groupUserGroups['global']);
 
         // Populate $this->usersInGroup with users who are in the relevant user group for $this->group.
-        $this->usersInGroup = array_keys(array_filter($this->usersAndGroups, function ($groups) {
+        $this->usersInGroup = array_keys(array_filter($this->usersAndGroups, function($groups) {
             return in_array($this->getRelevantUserGroup(), $groups);
         }));
 
@@ -150,7 +150,7 @@ 
         }
 
         if ($wikiPath) {
-            $out = array_map(function ($url) {
+            $out = array_map(function($url) {
                 return str_replace('.svg.png', '.svg', preg_replace('/.*\/18px-/', '', $url));
             }, $out);
         }
@@ -164,7 +164,7 @@ 
      */
     public function numDays(): int
     {
-        return (int)(($this->end - $this->start) / 60 / 60 / 24) + 1;
+        return (int)(($this->end-$this->start) / 60 / 60 / 24)+1;
     }
 
     /**
@@ -254,6 +254,6 @@ 
      */
     public function getNumWithActionsNotInGroup(): int
     {
-        return count($this->adminStats) - $this->numWithActions;
+        return count($this->adminStats)-$this->numWithActions;
     }
 }

src/AppBundle/Controller/AutomatedEditsController.php

Spacing +2 added lines, -2 removed lines

@@ -267,7 +267,7 @@ 
             'total_editcount' => $this->autoEdits->getEditCount(),
             'automated_editcount' => $this->autoEdits->getAutomatedCount(),
         ];
-        $ret['nonautomated_editcount'] = $ret['total_editcount'] - $ret['automated_editcount'];
+        $ret['nonautomated_editcount'] = $ret['total_editcount']-$ret['automated_editcount'];
 
         if (isset($this->params['tools'])) {
             $tools = $this->autoEdits->getToolCounts();
@@ -355,7 +355,7 @@ 
     private function addFullPageTitlesAndContinue(string $type, array $out, array $data): array
     {
         // Add full_page_title (in addition to the existing page_title and page_namespace keys).
-        $out[$type] = array_map(function ($rev) {
+        $out[$type] = array_map(function($rev) {
             return array_merge([
                 'full_page_title' => $this->getPageFromNsAndTitle(
                     (int)$rev['page_namespace'],

src/AppBundle/Controller/DefaultController.php

Spacing +2 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
     public function loginAction(Request $request, SessionInterface $session): RedirectResponse
     {
         try {
-            [ $next, $token ] = $this->getOauthClient($request)->initiate();
+            [$next, $token] = $this->getOauthClient($request)->initiate();
         } catch (Exception $oauthException) {
             throw $oauthException;
             // @TODO Make this work.
@@ -175,7 +175,7 @@ 
                     . '?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);
 

src/AppBundle/EventSubscriber/RateLimitSubscriber.php

Spacing +5 added lines, -5 removed lines

@@ -3,7 +3,7 @@ 
  * This file contains only the RateLimitSubscriber class.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace AppBundle\EventSubscriber;
 
@@ -137,7 +137,7 @@ 
         $cacheItem = $this->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) {
@@ -177,7 +177,7 @@ 
         $cacheItem = $this->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, add a log entry.
         if ($count > 3) {
@@ -252,8 +252,8 @@ 
         $message = $this->i18n->msg('error-rate-limit', [
             $this->rateDuration,
             "<a href='/login'>".$this->i18n->msg('error-rate-limit-login')."</a>",
-            "<a href='https://www.mediawiki.org/wiki/Special:MyLanguage/XTools/API' target='_blank'>" .
-                $this->i18n->msg('api') .
+            "<a href='https://www.mediawiki.org/wiki/Special:MyLanguage/XTools/API' target='_blank'>".
+                $this->i18n->msg('api').
             "</a>",
         ]);
 

src/AppBundle/Controller/XtoolsController.php

Spacing +4 added lines, -4 removed lines

@@ -202,7 +202,7 @@ 
             throw new XtoolsHttpException(
                 $this->i18n->msg('not-opted-in', [
                     $this->getOptedInPage()->getTitle(),
-                    $this->i18n->msg('not-opted-in-link') .
+                    $this->i18n->msg('not-opted-in-link').
                         ' <https://www.mediawiki.org/wiki/XTools/Edit_Counter#restricted_stats>',
                     $this->i18n->msg('not-opted-in-login'),
                 ]),
@@ -642,7 +642,7 @@ 
         $params = $this->convertLegacyParams($params);
 
         // Remove blank values.
-        return array_filter($params, function ($param) {
+        return array_filter($params, function($param) {
             // 'namespace' or 'username' could be '0'.
             return null !== $param && '' !== $param;
         });
@@ -843,7 +843,7 @@ 
         }
 
         $elapsedTime = round(
-            microtime(true) - $this->request->server->get('REQUEST_TIME_FLOAT'),
+            microtime(true)-$this->request->server->get('REQUEST_TIME_FLOAT'),
             3
         );
 
@@ -886,7 +886,7 @@ 
         $conn = $this->container->get('doctrine')
             ->getManager('default')
             ->getConnection();
-        $date =  date('Y-m-d');
+        $date = date('Y-m-d');
 
         // Increment count in timeline
         $existsSql = "SELECT 1 FROM usage_api_timeline

src/AppBundle/Repository/SimpleEditCounterRepository.php

Spacing +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
  * This file contains only the SimpleEditCounterRepository class.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace AppBundle\Repository;
 
@@ -123,7 +123,7 @@ 
         $revDateConditions = $this->getDateConditions($start, $end, false, "$ipcTable.", 'ipc_rev_timestamp');
         [$startHex, $endHex] = IPUtils::parseRange($user->getUsername());
 
-        $revNamespaceJoinSql = 'all' === $namespace ? '' : "JOIN $revTable ON rev_id = ipc_rev_id " .
+        $revNamespaceJoinSql = 'all' === $namespace ? '' : "JOIN $revTable ON rev_id = ipc_rev_id ".
             "JOIN $pageTable ON rev_page = page_id";
         $revNamespaceWhereSql = 'all' === $namespace ? '' : "AND page_namespace = $namespace";
 

src/AppBundle/Repository/EditCounterRepository.php

Spacing +7 added lines, -7 removed lines

@@ -3,7 +3,7 @@ 
  * This file contains only the EditCounterRepository class.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace AppBundle\Repository;
 
@@ -140,10 +140,10 @@ 
         ])->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 (int)$e['value'];
             }, $results)
         );
@@ -221,10 +221,10 @@ 
         }
 
         $counts = array_combine(
-            array_map(function ($e) {
+            array_map(function($e) {
                 return $e['key'];
             }, $results),
-            array_map(function ($e) {
+            array_map(function($e) {
                 return (int)$e['val'];
             }, $results)
         );
@@ -380,9 +380,9 @@ 
 
         $results = $this->executeProjectsQuery($project, $sql, $params)->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 (int)$e['total'];
         }, $results));
 

src/AppBundle/Model/User.php

Spacing +6 added lines, -6 removed lines

@@ -3,7 +3,7 @@ 
  * This file contains only the User class.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace AppBundle\Model;
 
@@ -127,14 +127,14 @@ 
             $firstAddrUnpacked = unpack('H*', $firstAddrBin);
             $firstAddrHex = reset($firstAddrUnpacked);
             $range[0] = inet_ntop($firstAddrBin);
-            $flexBits = 128 - $prefixLen;
+            $flexBits = 128-$prefixLen;
             $lastAddrHex = $firstAddrHex;
 
             $pos = 31;
             while ($flexBits > 0) {
                 $orig = substr($lastAddrHex, $pos, 1);
                 $origVal = hexdec($orig);
-                $newVal = $origVal | (pow(2, min(4, $flexBits)) - 1);
+                $newVal = $origVal | (pow(2, min(4, $flexBits))-1);
                 $new = dechex($newVal);
                 $lastAddrHex = substr_replace($lastAddrHex, $new, $pos, 1);
                 $flexBits -= 4;
@@ -145,8 +145,8 @@ 
             $range[1] = inet_ntop($lastAddrBin);
         } else {
             $cidr = explode('/', $this->username);
-            $range[0] = long2ip(ip2long($cidr[0]) & -1 << (32 - (int)$cidr[1]));
-            $range[1] = long2ip(ip2long($range[0]) + pow(2, (32 - (int)$cidr[1])) - 1);
+            $range[0] = long2ip(ip2long($cidr[0]) & -1 << (32-(int)$cidr[1]));
+            $range[1] = long2ip(ip2long($range[0])+pow(2, (32-(int)$cidr[1]))-1);
         }
 
         // Find the leftmost common characters between the two addresses.
@@ -354,7 +354,7 @@ 
      */
     public function countEdits(Project $project, $namespace = 'all', $start = false, $end = false): int
     {
-        return (int) $this->getRepository()->countEdits($project, $this, $namespace, $start, $end);
+        return (int)$this->getRepository()->countEdits($project, $this, $namespace, $start, $end);
     }
 
     /**

src/AppBundle/Repository/GlobalContribsRepository.php

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace AppBundle\Repository;
 
@@ -174,7 +174,7 @@ 
             $slice = $this->getDbList()[$dbName];
             // actor_revision table only includes users who have made at least one edit.
             $actorTable = $this->getTableName($dbName, 'actor', 'revision');
-            $queriesBySlice[$slice][] = "SELECT '$dbName' AS `dbName`, actor_id " .
+            $queriesBySlice[$slice][] = "SELECT '$dbName' AS `dbName`, actor_id ".
                 "FROM $actorTable WHERE $whereClause";
         }
 
@@ -293,13 +293,13 @@ 
         // Re-assemble into UNIONed queries, executing as many per slice as possible.
         $revisions = [];
         foreach ($queriesBySlice as $slice => $queries) {
-            $sql = "SELECT * FROM ((\n" . join("\n) UNION (\n", $queries) . ")) a ORDER BY timestamp DESC LIMIT $limit";
+            $sql = "SELECT * FROM ((\n".join("\n) UNION (\n", $queries).")) a ORDER BY timestamp DESC LIMIT $limit";
             $revisions = array_merge($revisions, $this->executeProjectsQuery($slice, $sql)->fetchAll());
         }
 
         // If there are more than $limit results, re-sort by timestamp.
         if (count($revisions) > $limit) {
-            usort($revisions, function ($a, $b) {
+            usort($revisions, function($a, $b) {
                 if ($a['unix_timestamp'] === $b['unix_timestamp']) {
                     return 0;
                 }