x-tools / xtools

src/Model/User.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Model;
 
@@ -126,14 +126,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;
@@ -144,8 +144,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.

src/Controller/MetaController.php

Spacing +11 added lines, -11 removed lines

@@ -104,7 +104,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;
 
         // Generate array of date labels
@@ -114,17 +114,17 @@ 
 
         foreach ($data as $entry) {
             if (!isset($totals[$entry['tool']])) {
-                $totals[$entry['tool']] = (int) $entry['count'];
+                $totals[$entry['tool']] = (int)$entry['count'];
 
                 // Create arrays for each tool, filled with zeros for each date in the timeline
                 $timeline[$entry['tool']] = array_fill(0, $numDays, 0);
             } else {
-                $totals[$entry['tool']] += (int) $entry['count'];
+                $totals[$entry['tool']] += (int)$entry['count'];
             }
 
             $date = new DateTime($entry['date']);
-            $dateIndex = (int) $date->diff($startObj)->format("%a");
-            $timeline[$entry['tool']][$dateIndex] = (int) $entry['count'];
+            $dateIndex = (int)$date->diff($startObj)->format("%a");
+            $timeline[$entry['tool']][$dateIndex] = (int)$entry['count'];
 
             $grandSum += $entry['count'];
         }
@@ -159,7 +159,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;
 
         // Generate array of date labels
@@ -169,17 +169,17 @@ 
 
         foreach ($data as $entry) {
             if (!isset($totals[$entry['endpoint']])) {
-                $totals[$entry['endpoint']] = (int) $entry['count'];
+                $totals[$entry['endpoint']] = (int)$entry['count'];
 
                 // Create arrays for each endpoint, filled with zeros for each date in the timeline
                 $timeline[$entry['endpoint']] = array_fill(0, $numDays, 0);
             } else {
-                $totals[$entry['endpoint']] += (int) $entry['count'];
+                $totals[$entry['endpoint']] += (int)$entry['count'];
             }
 
             $date = new DateTime($entry['date']);
-            $dateIndex = (int) $date->diff($startObj)->format("%a");
-            $timeline[$entry['endpoint']][$dateIndex] = (int) $entry['count'];
+            $dateIndex = (int)$date->diff($startObj)->format("%a");
+            $timeline[$entry['endpoint']][$dateIndex] = (int)$entry['count'];
 
             $grandSum += $entry['count'];
         }
@@ -239,7 +239,7 @@ 
 
         /** @var Connection $conn */
         $conn = $managerRegistry->getConnection('default');
-        $date =  date('Y-m-d');
+        $date = date('Y-m-d');
 
         // Tool name needs to be lowercase.
         $tool = strtolower($tool);

src/Exception/BadGatewayException.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Exception;
 

src/Model/Page.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Model;
 
@@ -124,7 +124,7 @@ 
         $title = $info['title'] ?? $this->unnormalizedPageName;
         $nsName = $this->getNamespaceName();
         return $nsName
-            ? str_replace($nsName . ':', '', $title)
+            ? str_replace($nsName.':', '', $title)
             : $title;
     }
 
@@ -322,7 +322,7 @@ 
     {
         $content = $this->repository->getPagesWikitext(
             $this->getProject(),
-            [ $this->getTitle() ]
+            [$this->getTitle()]
         );
 
         return $content[$this->getTitle()] ?? null;
@@ -388,7 +388,7 @@ 
 
         $wikidataInfo = $this->repository->getWikidataInfo($this);
 
-        $terms = array_map(function ($entry) {
+        $terms = array_map(function($entry) {
             return $entry['term'];
         }, $wikidataInfo);
 
@@ -399,7 +399,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>",
             ];
         }
@@ -409,7 +409,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>",
             ];
         }
@@ -491,7 +491,7 @@ 
             return null;
         }
 
-        return array_sum(array_map(function ($item) {
+        return array_sum(array_map(function($item) {
             return (int)$item['views'];
         }, $pageviews['items']));
     }

src/Controller/ArticleInfoController.php

Spacing +1 added lines, -1 removed lines

@@ -267,7 +267,7 @@
         $responseCode = Response::HTTP_OK;
         $this->recordApiUsage('page/prose');
         $this->setupArticleInfo($articleInfoRepo, $autoEditsHelper);
-        $this->addFlash('info', 'The algorithm used by this API has recently changed. ' .
+        $this->addFlash('info', 'The algorithm used by this API has recently changed. '.
             'See https://www.mediawiki.org/wiki/XTools/Page_History#Prose for details.');
         $ret = $this->articleInfo->getProseStats();
         if (null === $ret) {

src/Repository/AuthorshipRepository.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Repository;
 
@@ -47,7 +47,7 @@ 
 
         try {
             $res = $this->guzzle->request('GET', $url, $opts);
-        } catch (ServerException|ConnectException $e) {
+        } catch (ServerException | ConnectException $e) {
             throw new BadGatewayException('api-error-wikimedia', ['WikiWho'], $e);
         }
 

src/Repository/PageRepository.php

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Repository;
 
@@ -308,7 +308,7 @@ 
 
         $wikidataId = ltrim($page->getWikidataId(), 'Q');
 
-        $sql = "SELECT " . ($count ? 'COUNT(*) AS count' : '*') . "
+        $sql = "SELECT ".($count ? 'COUNT(*) AS count' : '*')."
                 FROM wikidatawiki_p.wb_items_per_site
                 WHERE ips_item_id = :wikidataId";
 
@@ -316,7 +316,7 @@ 
             'wikidataId' => $wikidataId,
         ])->fetchAllAssociative();
 
-        return $count ? (int) $result[0]['count'] : $result;
+        return $count ? (int)$result[0]['count'] : $result;
     }
 
     /**
@@ -354,7 +354,7 @@ 
 
         // Transform to associative array by 'type'
         foreach ($res as $row) {
-            $data[$row['type'] . '_count'] = (int)$row['value'];
+            $data[$row['type'].'_count'] = (int)$row['value'];
         }
 
         return $data;
@@ -405,7 +405,7 @@ 
 
         $project = $page->getProject()->getDomain();
 
-        $url = 'https://wikimedia.org/api/rest_v1/metrics/pageviews/per-article/' .
+        $url = 'https://wikimedia.org/api/rest_v1/metrics/pageviews/per-article/'.
             "$project/all-access/user/$title/daily/$start/$end";
 
         try {
@@ -415,7 +415,7 @@ 
             ]);
             $pageviews = json_decode($res->getBody()->getContents(), true);
             return $pageviews;
-        } catch (ServerException|ConnectException $e) {
+        } catch (ServerException | ConnectException $e) {
             throw new BadGatewayException('api-error-wikimedia', ['Pageviews'], $e);
         }
     }
@@ -431,7 +431,7 @@ 
     {
         if ($this->isWMF) {
             $domain = $page->getProject()->getDomain();
-            $url = "https://$domain/api/rest_v1/page/html/" . urlencode(str_replace(' ', '_', $page->getTitle()));
+            $url = "https://$domain/api/rest_v1/page/html/".urlencode(str_replace(' ', '_', $page->getTitle()));
             if (null !== $revId) {
                 $url .= "/$revId";
             }
@@ -505,7 +505,7 @@ 
             $normalized = [];
             if (isset($result['query']['normalized'])) {
                 array_map(
-                    function ($e) use (&$normalized): void {
+                    function($e) use (&$normalized): void {
                         $normalized[$e['to']] = $e['from'];
                     },
                     $result['query']['normalized']

src/Model/EditCounter.php

Spacing +22 added lines, -22 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Model;
 
@@ -160,7 +160,7 @@ 
 
         // Filter out unblocks unless requested.
         if ($blocksOnly) {
-            $blocks = array_filter($blocks, function ($block) {
+            $blocks = array_filter($blocks, function($block) {
                 return 'block' === $block['log_action'];
             });
         }
@@ -194,7 +194,7 @@ 
      */
     public function countAllRevisions(): int
     {
-        return $this->countLiveRevisions() + $this->countDeletedRevisions();
+        return $this->countLiveRevisions()+$this->countDeletedRevisions();
     }
 
     /**
@@ -233,7 +233,7 @@ 
      */
     public function countAllPagesEdited(): int
     {
-        return $this->countLivePagesEdited() + $this->countDeletedPagesEdited();
+        return $this->countLivePagesEdited()+$this->countDeletedPagesEdited();
     }
 
     /**
@@ -243,7 +243,7 @@ 
      */
     public function countPagesCreated(): int
     {
-        return $this->countCreatedPagesLive() + $this->countPagesCreatedDeleted();
+        return $this->countCreatedPagesLive()+$this->countPagesCreatedDeleted();
     }
 
     /**
@@ -372,7 +372,7 @@ 
             } elseif ('unblock' === $block['log_action']) {
                 // The last block was lifted. So the duration will be the time from when the
                 // last block was set to the time of the unblock.
-                $timeSinceLastBlock = $timestamp - $lastBlock[0];
+                $timeSinceLastBlock = $timestamp-$lastBlock[0];
                 if ($timeSinceLastBlock > $this->longestBlockSeconds) {
                     $this->longestBlockSeconds = $timeSinceLastBlock;
 
@@ -383,8 +383,8 @@ 
                 // The last block was modified. So we will adjust $lastBlock to include
                 // the difference of the duration of the new reblock, and time since the last block.
                 // $lastBlock is left unchanged if its duration was indefinite.
-                $timeSinceLastBlock = $timestamp - $lastBlock[0];
-                $lastBlock[1] = $timeSinceLastBlock + $duration;
+                $timeSinceLastBlock = $timestamp-$lastBlock[0];
+                $lastBlock[1] = $timeSinceLastBlock+$duration;
             }
         }
 
@@ -394,7 +394,7 @@ 
         }
 
         // Test if the last block is still active, and if so use the expiry as the duration.
-        $lastBlockExpiry = $lastBlock[0] + $lastBlock[1];
+        $lastBlockExpiry = $lastBlock[0]+$lastBlock[1];
         if ($lastBlockExpiry > time() && $lastBlockExpiry > $this->longestBlockSeconds) {
             $this->longestBlockSeconds = $lastBlock[1];
         // Otherwise, test if the duration of the last block is now the longest overall.
@@ -438,7 +438,7 @@ 
         // If invalid, $duration is left as null.
         if (strtotime($durationStr)) {
             $expiry = strtotime($durationStr, $timestamp);
-            $duration = $expiry - $timestamp;
+            $duration = $expiry-$timestamp;
         }
 
         return [$timestamp, $duration];
@@ -525,7 +525,7 @@ 
         $import = $logCounts['import-import'] ?? 0;
         $interwiki = $logCounts['import-interwiki'] ?? 0;
         $upload = $logCounts['import-upload'] ?? 0;
-        return $import + $interwiki + $upload;
+        return $import+$interwiki+$upload;
     }
 
     /**
@@ -547,7 +547,7 @@ 
         $logCounts = $this->getLogCounts();
         $new = $logCounts['contentmodel-new'] ?? 0;
         $modified = $logCounts['contentmodel-change'] ?? 0;
-        return $new + $modified;
+        return $new+$modified;
     }
 
     /**
@@ -676,9 +676,9 @@ 
     public function approvals(): int
     {
         $logCounts = $this->getLogCounts();
-        return (!empty($logCounts['review-approve']) ? $logCounts['review-approve'] : 0) +
-            (!empty($logCounts['review-approve2']) ? $logCounts['review-approve2'] : 0) +
-            (!empty($logCounts['review-approve-i']) ? $logCounts['review-approve-i'] : 0) +
+        return (!empty($logCounts['review-approve']) ? $logCounts['review-approve'] : 0)+
+            (!empty($logCounts['review-approve2']) ? $logCounts['review-approve2'] : 0)+
+            (!empty($logCounts['review-approve-i']) ? $logCounts['review-approve-i'] : 0)+
             (!empty($logCounts['review-approve2-i']) ? $logCounts['review-approve2-i'] : 0);
     }
 
@@ -701,7 +701,7 @@ 
         $logCounts = $this->getLogCounts();
         $create2 = $logCounts['newusers-create2'] ?: 0;
         $byemail = $logCounts['newusers-byemail'] ?: 0;
-        return $create2 + $byemail;
+        return $create2+$byemail;
     }
 
     /**
@@ -803,7 +803,7 @@ 
 
         $totals = $this->repository->getMonthCounts($this->project, $this->user);
         $out = [
-            'yearLabels' => [],  // labels for years
+            'yearLabels' => [], // labels for years
             'monthLabels' => [], // labels for months
             'totals' => [], // actual totals, grouped by namespace, year and then month
         ];
@@ -897,7 +897,7 @@ 
                 $out['totals'][$ns][$total['year']] = [];
             }
 
-            $out['totals'][$ns][$total['year']][$total['month']] = (int) $total['count'];
+            $out['totals'][$ns][$total['year']][$total['month']] = (int)$total['count'];
         }
 
         return [$out, $firstEdit];
@@ -914,9 +914,9 @@ 
     private function fillInMonthTotalsAndLabels(array $out, DatePeriod $dateRange): array
     {
         foreach ($dateRange as $monthObj) {
-            $year = (int) $monthObj->format('Y');
+            $year = (int)$monthObj->format('Y');
             $yearLabel = $this->i18n->dateFormat($monthObj, 'yyyy');
-            $month = (int) $monthObj->format('n');
+            $month = (int)$monthObj->format('n');
             $monthLabel = $this->i18n->dateFormat($monthObj, 'yyyy-MM');
 
             // Fill in labels
@@ -1060,7 +1060,7 @@ 
     public function countSmallEdits(): int
     {
         $editSizeData = $this->getEditSizeData();
-        return isset($editSizeData['small_edits']) ? (int) $editSizeData['small_edits'] : 0;
+        return isset($editSizeData['small_edits']) ? (int)$editSizeData['small_edits'] : 0;
     }
 
     /**
@@ -1070,7 +1070,7 @@ 
     public function countLargeEdits(): int
     {
         $editSizeData = $this->getEditSizeData();
-        return isset($editSizeData['large_edits']) ? (int) $editSizeData['large_edits'] : 0;
+        return isset($editSizeData['large_edits']) ? (int)$editSizeData['large_edits'] : 0;
     }
 
     /**

src/Repository/Repository.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Repository;
 
@@ -196,7 +196,7 @@ 
                     'format' => 'json',
                 ], $params),
             ])->getBody()->getContents(), true);
-        } catch (ServerException|ConnectException $e) {
+        } catch (ServerException | ConnectException $e) {
             throw new BadGatewayException('api-error-wikimedia', ['Wikimedia'], $e);
         }
     }
@@ -218,7 +218,7 @@ 
         // $tableExtension in order to generate the new table name
         if ($this->isWMF && null !== $tableExtension) {
             $mapped = true;
-            $tableName .=('' === $tableExtension ? '' : '_'.$tableExtension);
+            $tableName .= ('' === $tableExtension ? '' : '_'.$tableExtension);
         } elseif ($this->parameterBag->has("app.table.$tableName")) {
             // Use the table specified in the table mapping configuration, if present.
             $mapped = true;
@@ -230,7 +230,7 @@ 
         // This is a safeguard in case table mapping isn't properly set up.
         $isLoggingOrRevision = in_array($tableName, ['revision', 'logging', 'archive']);
         if (!$mapped && $isLoggingOrRevision && $this->isWMF) {
-            $tableName .="_userindex";
+            $tableName .= "_userindex";
         }
 
         // Figure out database name.
@@ -349,7 +349,7 @@ 
             $offset = date('YmdHis', $offset);
             $datesConditions .= " AND $tableAlias{$field} <= '$offset'";
         } elseif (is_int($end)) {
-            $end = date('Ymd', $end) . '235959';
+            $end = date('Ymd', $end).'235959';
             $datesConditions .= " AND $tableAlias{$field} <= '$end'";
         }