x-tools / xtools

src/Model/AdminStats.php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Model;
 
@@ -98,7 +98,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;
             }
@@ -126,7 +126,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);
         }));
 
@@ -149,7 +149,7 @@ 
         }
 
         if ($wikiPath) {
-            $out = array_map(function ($url) {
+            $out = array_map(function($url) {
                 return str_replace('.svg.png', '.svg', preg_replace('/.*\/18px-/', '', $url));
             }, $out);
         }
@@ -163,7 +163,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;
     }
 
     /**
@@ -253,6 +253,6 @@ 
      */
     public function getNumWithActionsNotInGroup(): int
     {
-        return count($this->adminStats) - $this->numWithActions;
+        return count($this->adminStats)-$this->numWithActions;
     }
 }

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();
     }
 
     /**
@@ -382,7 +382,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;
 
@@ -393,8 +393,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;
             }
         }
 
@@ -404,7 +404,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.
@@ -448,7 +448,7 @@ 
         // If invalid, $duration is left as null.
         if (strtotime($durationStr)) {
             $expiry = strtotime($durationStr, $timestamp);
-            $duration = $expiry - $timestamp;
+            $duration = $expiry-$timestamp;
         }
 
         return [$timestamp, $duration];
@@ -535,7 +535,7 @@ 
         $import = $logCounts['import-import'] ?? 0;
         $interwiki = $logCounts['import-interwiki'] ?? 0;
         $upload = $logCounts['import-upload'] ?? 0;
-        return $import + $interwiki + $upload;
+        return $import+$interwiki+$upload;
     }
 
     /**
@@ -557,7 +557,7 @@ 
         $logCounts = $this->getLogCounts();
         $new = $logCounts['contentmodel-new'] ?? 0;
         $modified = $logCounts['contentmodel-change'] ?? 0;
-        return $new + $modified;
+        return $new+$modified;
     }
 
     /**
@@ -686,9 +686,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['review2-approve-i'] : 0);
     }
 
@@ -711,7 +711,7 @@ 
         $logCounts = $this->getLogCounts();
         $create2 = $logCounts['newusers-create2'] ?: 0;
         $byemail = $logCounts['newusers-byemail'] ?: 0;
-        return $create2 + $byemail;
+        return $create2+$byemail;
     }
 
     /**
@@ -813,7 +813,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
         ];
@@ -907,7 +907,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];
@@ -924,9 +924,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
@@ -1070,7 +1070,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;
     }
 
     /**
@@ -1080,7 +1080,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/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>",
             ];
         }
@@ -487,7 +487,7 @@ 
             return 0;
         }
 
-        return array_sum(array_map(function ($item) {
+        return array_sum(array_map(function($item) {
             return (int)$item['views'];
         }, $pageviews['items']));
     }

src/Model/ArticleInfo.php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Model;
 
@@ -958,7 +958,7 @@ 
 
             if ($info['all'] > 1) {
                 // Number of seconds/days between first and last edit.
-                $secs = $info['last']->getTimestamp() - $info['first']->getTimestamp();
+                $secs = $info['last']->getTimestamp()-$info['first']->getTimestamp();
                 $days = $secs / (60 * 60 * 24);
 
                 // Average time between edits (in days).
@@ -967,7 +967,7 @@ 
         }
 
         // Loop through again and add percentages.
-        $this->topTenEditorsByEdits = array_map(function ($editor) use ($topTenCount) {
+        $this->topTenEditorsByEdits = array_map(function($editor) use ($topTenCount) {
             $editor['percentage'] = 100 * ($editor['value'] / $topTenCount);
             return $editor;
         }, $topTenEditorsByEdits);
@@ -985,7 +985,7 @@ 
     {
         // First sort editors array by the amount of text they added.
         $topTenEditorsByAdded = $this->editors;
-        uasort($topTenEditorsByAdded, function ($a, $b) {
+        uasort($topTenEditorsByAdded, function($a, $b) {
             if ($a['added'] === $b['added']) {
                 return 0;
             }
@@ -996,12 +996,12 @@ 
         $topTenEditorsByAdded = array_keys(array_slice($topTenEditorsByAdded, 0, 10, true));
 
          // Get the sum of added text so that we can add in percentages.
-         $topTenTotalAdded = array_sum(array_map(function ($editor) {
+         $topTenTotalAdded = array_sum(array_map(function($editor) {
              return $this->editors[$editor]['added'];
          }, $topTenEditorsByAdded));
 
         // Then build a new array of top 10 editors by added text in the data structure needed for the chart.
-        return array_map(function ($editor) use ($topTenTotalAdded) {
+        return array_map(function($editor) use ($topTenTotalAdded) {
             $added = $this->editors[$editor]['added'];
             return [
                 'label' => $editor,

src/Model/TopEdits.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Model;
 
@@ -163,7 +163,7 @@ 
     {
         $firstDateTime = $this->topEdits[0]->getTimestamp();
         $lastDateTime = end($this->topEdits)->getTimestamp();
-        $secs = $firstDateTime->getTimestamp() - $lastDateTime->getTimestamp();
+        $secs = $firstDateTime->getTimestamp()-$lastDateTime->getTimestamp();
         $days = $secs / (60 * 60 * 24);
         return $days / count($this->topEdits);
     }

src/Model/User.php

Spacing +6 added lines, -6 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.
@@ -353,7 +353,7 @@ 
      */
     public function countEdits(Project $project, $namespace = 'all', $start = false, $end = false): int
     {
-        return (int) $this->repository->countEdits($project, $this, $namespace, $start, $end);
+        return (int)$this->repository->countEdits($project, $this, $namespace, $start, $end);
     }
 
     /**

src/Model/ArticleInfoApi.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Model;
 
@@ -169,7 +169,7 @@ 
 
         $refs = $crawler->filter('#mw-content-text .reference');
         $refContent = [];
-        $refs->each(function ($ref) use (&$refContent): void {
+        $refs->each(function($ref) use (&$refContent): void {
             $refContent[] = $ref->text();
         });
         $uniqueRefs = count(array_unique($refContent));
@@ -197,7 +197,7 @@ 
         $totalChars = 0;
         $totalWords = 0;
         $paragraphs = $crawler->filter($selector);
-        $paragraphs->each(function ($node) use (&$totalChars, &$totalWords): void {
+        $paragraphs->each(function($node) use (&$totalChars, &$totalWords): void {
             /** @var Crawler $node */
             $text = preg_replace('/\[\d+]/', '', trim($node->text(null, true)));
             $totalChars += strlen($text);
@@ -261,7 +261,7 @@ 
         $data = [
             'project' => $project->getDomain(),
             'page' => $page->getTitle(),
-            'watchers' => (int) $page->getWatchers(),
+            'watchers' => (int)$page->getWatchers(),
             'pageviews' => $page->getLastPageviews($pageviewsOffset),
             'pageviews_offset' => $pageviewsOffset,
         ];
@@ -284,7 +284,7 @@ 
         if (false !== $info) {
             $creationDateTime = DateTime::createFromFormat('YmdHis', $info['created_at']);
             $modifiedDateTime = DateTime::createFromFormat('YmdHis', $info['modified_at']);
-            $secsSinceLastEdit = (new DateTime)->getTimestamp() - $modifiedDateTime->getTimestamp();
+            $secsSinceLastEdit = (new DateTime)->getTimestamp()-$modifiedDateTime->getTimestamp();
 
             // Some wikis (such foundation.wikimedia.org) may be missing the creation date.
             $creationDateTime = false === $creationDateTime
@@ -296,16 +296,16 @@ 
                 ->getAssessment($page);
 
             $data = array_merge($data, [
-                'revisions' => (int) $info['num_edits'],
-                'editors' => (int) $info['num_editors'],
-                'minor_edits' => (int) $info['minor_edits'],
+                'revisions' => (int)$info['num_edits'],
+                'editors' => (int)$info['num_editors'],
+                'minor_edits' => (int)$info['minor_edits'],
                 'author' => $info['author'],
-                'author_editcount' => null === $info['author_editcount'] ? null : (int) $info['author_editcount'],
+                'author_editcount' => null === $info['author_editcount'] ? null : (int)$info['author_editcount'],
                 'created_at' => $creationDateTime,
                 'created_rev_id' => $info['created_rev_id'],
                 'modified_at' => $modifiedDateTime->format('Y-m-d H:i'),
                 'secs_since_last_edit' => $secsSinceLastEdit,
-                'last_edit_id' => (int) $info['modified_rev_id'],
+                'last_edit_id' => (int)$info['modified_rev_id'],
                 'assessment' => $assessment,
             ]);
         }
@@ -455,8 +455,8 @@ 
         }
 
         // Sort by edit count.
-        uasort($this->bots, function ($a, $b) {
-            return $b['count'] - $a['count'];
+        uasort($this->bots, function($a, $b) {
+            return $b['count']-$a['count'];
         });
 
         return $this->bots;

src/Model/SimpleEditCounter.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Model;
 
@@ -154,7 +154,7 @@ 
      */
     public function getTotalEditCount(): int
     {
-        return $this->data['total_edit_count'] ?? $this->data['deleted_edit_count'] + $this->data['live_edit_count'];
+        return $this->data['total_edit_count'] ?? $this->data['deleted_edit_count']+$this->data['live_edit_count'];
     }
 
     /**

src/Twig/AppExtension.php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Twig;
 
@@ -117,7 +117,7 @@ 
     public function requestTime(): float
     {
         if (!isset($this->requestTime)) {
-            $this->requestTime = microtime(true) - $this->getRequest()->server->get('REQUEST_TIME_FLOAT');
+            $this->requestTime = microtime(true)-$this->getRequest()->server->get('REQUEST_TIME_FLOAT');
         }
 
         return $this->requestTime;
@@ -544,7 +544,7 @@ 
         }
 
         $sizeMessage = $this->numberFormat(
-            pow(1024, $base - floor($base)),
+            pow(1024, $base-floor($base)),
             $precision
         );
 
@@ -701,15 +701,15 @@ 
 
         if ($seconds >= 86400) {
             // Over a day
-            $val = (int) floor($seconds / 86400);
+            $val = (int)floor($seconds / 86400);
             $key = 'days';
         } elseif ($seconds >= 3600) {
             // Over an hour, less than a day
-            $val = (int) floor($seconds / 3600);
+            $val = (int)floor($seconds / 3600);
             $key = 'hours';
         } elseif ($seconds >= 60) {
             // Over a minute, less than an hour
-            $val = (int) floor($seconds / 60);
+            $val = (int)floor($seconds / 60);
             $key = 'minutes';
         }