x-tools / xtools

src/Model/EditCounter.php

Spacing +19 added lines, -19 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
         ];
@@ -1022,7 +1022,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;
     }
 
     /**
@@ -1032,7 +1032,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/Helper/I18nHelper.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Helper;
 
@@ -54,7 +54,7 @@ 
         }
 
         // Find the path, and complain if English doesn't exist.
-        $path = $this->projectDir . '/i18n';
+        $path = $this->projectDir.'/i18n';
         if (!file_exists("$path/en.json")) {
             throw new Exception("Language directory doesn't exist: $path");
         }
@@ -105,7 +105,7 @@ 
         $messageFiles = glob($this->projectDir.'/i18n/*.json');
 
         $languages = array_values(array_unique(array_map(
-            function ($filename) {
+            function($filename) {
                 return basename($filename, '.json');
             },
             $messageFiles
@@ -149,7 +149,7 @@ 
             $this->getIntuition()->getLangFallbacks($useLang)
         );
 
-        return array_filter($fallbacks, function ($lang) use ($i18nPath) {
+        return array_filter($fallbacks, function($lang) use ($i18nPath) {
             return is_file($i18nPath.$lang.'.json');
         });
     }
@@ -287,7 +287,7 @@ 
      */
     private function getLangForTranslatingNumerals(): string
     {
-        return 'ar' === $this->getIntuition()->getLang() ? 'en': $this->getIntuition()->getLang();
+        return 'ar' === $this->getIntuition()->getLang() ? 'en' : $this->getIntuition()->getLang();
     }
 
     /**

src/Model/PageInfo.php

Indentation +4 added lines, -4 removed lines

@@ -1319,10 +1319,10 @@
         // Slice to the top 10.
         $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) {
-             return $this->editors[$editor]['added'];
-         }, $topTenEditorsByAdded));
+            // Get the sum of added text so that we can add in percentages.
+            $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) {

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Model;
 
@@ -958,16 +958,16 @@ 
 
             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).
-                $this->editors[$editor]['atbe'] = round($days / ($info['all'] - 1), 1);
+                $this->editors[$editor]['atbe'] = round($days / ($info['all']-1), 1);
             }
         }
 
         // 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/Repository/PageInfoRepository.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Repository;
 
@@ -173,7 +173,7 @@ 
 
         $sql = "SELECT log_action, log_type, log_timestamp AS 'timestamp'
                 FROM $loggingTable
-                WHERE log_namespace = '" . $page->getNamespace() . "'
+                WHERE log_namespace = '".$page->getNamespace()."'
                 AND log_title = :title AND log_timestamp > 1 $datesConditions
                 AND log_type IN ('delete', 'move', 'protect', 'stable')";
         $title = str_replace(' ', '_', $page->getTitle());
@@ -358,7 +358,7 @@ 
         $time2 = time();
 
         // If it took over 5 seconds, cache the result for 20 minutes.
-        if ($time2 - $time1 > 5) {
+        if ($time2-$time1 > 5) {
             $this->setCache($cacheKey, $result, 'PT20M');
         }
 
@@ -429,8 +429,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'];
         });
 
         return $this->setCache($cacheKey, $results);

src/Model/Pages.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Model;
 
@@ -134,7 +134,7 @@ 
         }
 
         $numResults = count($this->getResults()[$this->getNamespace()]);
-        $timestamp = new DateTime($this->getResults()[$this->getNamespace()][$numResults - 1]['timestamp']);
+        $timestamp = new DateTime($this->getResults()[$this->getNamespace()][$numResults-1]['timestamp']);
         return $timestamp->format('Y-m-d\TH:i:s\Z');
     }
 
@@ -342,7 +342,7 @@ 
         $summaryColumns[] = 'average-page-size';
 
         // Re-sort based on $order
-        return array_values(array_filter($order, static function ($column) use ($summaryColumns) {
+        return array_values(array_filter($order, static function($column) use ($summaryColumns) {
             return in_array($column, $summaryColumns);
         }));
     }

src/Model/PageInfoApi.php

Spacing +13 added lines, -13 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Model;
 
@@ -180,7 +180,7 @@ 
         [$bytes, $chars, $words] = $this->countCharsAndWords($crawler);
 
         $refContent = [];
-        $refs->each(function ($ref) use (&$refContent): void {
+        $refs->each(function($ref) use (&$refContent): void {
             $refContent[] = $ref->text();
         });
         $uniqueRefs = count(array_unique($refContent));
@@ -215,13 +215,13 @@ 
             '[typeof~="mw:Extension/templatestyles"]',
             '[typeof~="mw:Extension/math"]',
             '[typeof~="mw:Extension/ref"]',
-        ]))->each(function (Crawler $subCrawler) {
+        ]))->each(function(Crawler $subCrawler) {
             foreach ($subCrawler as $subNode) {
                 $subNode->parentNode->removeChild($subNode);
             }
         });
 
-        $paragraphs->each(function ($node) use (&$totalBytes, &$totalChars, &$totalWords): void {
+        $paragraphs->each(function($node) use (&$totalBytes, &$totalChars, &$totalWords): void {
             /** @var Crawler $node */
             $text = $node->text();
             $totalBytes += strlen($text);
@@ -306,24 +306,24 @@ 
         if ($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();
 
             $assessment = $page->getProject()
                 ->getPageAssessments()
                 ->getAssessment($page);
 
             $data = array_merge($data, [
-                'revisions' => (int) $info['num_edits'],
-                'editors' => (int) $info['num_editors'],
-                'ip_edits' => (int) $info['ip_edits'],
-                'minor_edits' => (int) $info['minor_edits'],
+                'revisions' => (int)$info['num_edits'],
+                'editors' => (int)$info['num_editors'],
+                'ip_edits' => (int)$info['ip_edits'],
+                'minor_edits' => (int)$info['minor_edits'],
                 'creator' => $info['creator'],
-                'creator_editcount' => null === $info['creator_editcount'] ? null : (int) $info['creator_editcount'],
+                'creator_editcount' => null === $info['creator_editcount'] ? null : (int)$info['creator_editcount'],
                 'created_at' => $creationDateTime,
                 'created_rev_id' => $info['created_rev_id'],
                 'modified_at' => $modifiedDateTime,
                 'secs_since_last_edit' => $secsSinceLastEdit,
-                'modified_rev_id' => (int) $info['modified_rev_id'],
+                'modified_rev_id' => (int)$info['modified_rev_id'],
                 'assessment' => $assessment,
             ]);
         }
@@ -473,8 +473,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/Edit.php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Model;
 
@@ -112,7 +112,7 @@ 
         User $user,
         array $revs
     ): array {
-        return array_map(function ($rev) use ($pageRepo, $editRepo, $userRepo, $project, $user) {
+        return array_map(function($rev) use ($pageRepo, $editRepo, $userRepo, $project, $user) {
             /** Page object to be passed to the Edit constructor. */
             $page = Page::newFromRow($pageRepo, $project, $rev);
             $rev['user'] = $user;
@@ -358,8 +358,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);
         }
 
@@ -406,7 +406,7 @@ 
      */
     public function getDiffUrl(): string
     {
-        return rtrim($this->getProject()->getUrlForPage('Special:Diff/' . $this->id), '/');
+        return rtrim($this->getProject()->getUrlForPage('Special:Diff/'.$this->id), '/');
     }
 
     /**
@@ -415,7 +415,7 @@ 
      */
     public function getPermaUrl(): string
     {
-        return rtrim($this->getProject()->getUrlForPage('Special:PermaLink/' . $this->id), '/');
+        return rtrim($this->getProject()->getUrlForPage('Special:PermaLink/'.$this->id), '/');
     }
 
     /**

src/Controller/PageInfoController.php

Spacing +1 added lines, -1 removed lines

@@ -361,7 +361,7 @@
         $responseCode = Response::HTTP_OK;
         $this->recordApiUsage('page/prose');
         $this->setupPageInfo($pageInfoRepo, $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->pageInfo->getProseStats();
         if (null === $ret) {

src/Controller/GlobalContribsController.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Controller;
 
@@ -230,7 +230,7 @@ 
         $this->project = $defaultProject;
 
         $results = $globalContribs->globalEdits();
-        $results = array_map(function (Edit $edit) {
+        $results = array_map(function(Edit $edit) {
             return $edit->getForJson(true);
         }, array_values($results));
         $results = $this->addFullPageTitlesAndContinue('globalcontribs', [], $results);