x-tools / xtools

src/Model/CategoryEdits.php

Spacing +3 added lines, -3 removed lines

@@ -3,7 +3,7 @@ 
  * This file contains only the CategoryEdits class.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Model;
 
@@ -46,7 +46,7 @@ 
     ) {
         $this->project = $project;
         $this->user = $user;
-        $this->categories = array_map(function ($category) {
+        $this->categories = array_map(function($category) {
             return str_replace(' ', '_', $category);
         }, $categories);
         $this->start = $start;
@@ -78,7 +78,7 @@ 
      */
     public function getCategoriesNormalized(): array
     {
-        return array_map(function ($category) {
+        return array_map(function($category) {
             return str_replace('_', ' ', $category);
         }, $this->categories);
     }

src/Model/AutoEdits.php

Spacing +3 added lines, -3 removed lines

@@ -3,7 +3,7 @@ 
  * This file contains only the AutoEdits class.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Model;
 
@@ -232,8 +232,8 @@ 
     public function getToolsTotal(): int
     {
         if (!is_int($this->toolsTotal)) {
-            $this->toolsTotal = array_reduce($this->getToolCounts(), function ($a, $b) {
-                return $a + $b['count'];
+            $this->toolsTotal = array_reduce($this->getToolCounts(), function($a, $b) {
+                return $a+$b['count'];
             });
         }
 

src/Model/EditCounter.php

Spacing +22 added lines, -22 removed lines

@@ -3,7 +3,7 @@ 
  * This file contains only the EditCounter class.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Model;
 
@@ -144,7 +144,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'];
             });
         }
@@ -178,7 +178,7 @@ 
      */
     public function countAllRevisions(): int
     {
-        return $this->countLiveRevisions() + $this->countDeletedRevisions();
+        return $this->countLiveRevisions()+$this->countDeletedRevisions();
     }
 
     /**
@@ -217,7 +217,7 @@ 
      */
     public function countAllPagesEdited(): int
     {
-        return $this->countLivePagesEdited() + $this->countDeletedPagesEdited();
+        return $this->countLivePagesEdited()+$this->countDeletedPagesEdited();
     }
 
     /**
@@ -227,7 +227,7 @@ 
      */
     public function countPagesCreated(): int
     {
-        return $this->countCreatedPagesLive() + $this->countPagesCreatedDeleted();
+        return $this->countCreatedPagesLive()+$this->countPagesCreatedDeleted();
     }
 
     /**
@@ -367,7 +367,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;
 
@@ -378,8 +378,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;
             }
         }
 
@@ -389,7 +389,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.
@@ -433,7 +433,7 @@ 
         // If invalid, $duration is left as null.
         if (strtotime($durationStr)) {
             $expiry = strtotime($durationStr, $timestamp);
-            $duration = $expiry - $timestamp;
+            $duration = $expiry-$timestamp;
         }
 
         return [$timestamp, $duration];
@@ -520,7 +520,7 @@ 
         $import = isset($logCounts['import-import']) ? (int)$logCounts['import-import'] : 0;
         $interwiki = isset($logCounts['import-interwiki']) ? (int)$logCounts['import-interwiki'] : 0;
         $upload = isset($logCounts['import-upload']) ? (int)$logCounts['import-upload'] : 0;
-        return $import + $interwiki + $upload;
+        return $import+$interwiki+$upload;
     }
 
     /**
@@ -542,7 +542,7 @@ 
         $logCounts = $this->getLogCounts();
         $new = isset($logCounts['contentmodel-new']) ? (int)$logCounts['contentmodel-new'] : 0;
         $modified = isset($logCounts['contentmodel-change']) ? (int)$logCounts['contentmodel-change'] : 0;
-        return $new + $modified;
+        return $new+$modified;
     }
 
     /**
@@ -674,9 +674,9 @@ 
     public function approvals(): int
     {
         $logCounts = $this->getLogCounts();
-        $total = (!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) +
+        $total = (!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);
         return $total;
     }
@@ -700,7 +700,7 @@ 
         $logCounts = $this->getLogCounts();
         $create2 = $logCounts['newusers-create2'] ?: 0;
         $byemail = $logCounts['newusers-byemail'] ?: 0;
-        return $create2 + $byemail;
+        return $create2+$byemail;
     }
 
     /**
@@ -802,7 +802,7 @@ 
 
         $totals = $this->getRepository()->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
         ];
@@ -896,7 +896,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];
@@ -913,9 +913,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
@@ -1059,7 +1059,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;
     }
 
     /**
@@ -1069,7 +1069,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/UserRights.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
  * This file contains only the UserRights class.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Model;
 

src/Model/Edit.php

Spacing +12 added lines, -12 removed lines

@@ -3,7 +3,7 @@ 
  * This file contains only the Edit class.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Model;
 
@@ -86,7 +86,7 @@ 
      */
     public static function getEditsFromRevs(Project $project, User $user, array $revs): array
     {
-        return array_map(function ($rev) use ($project, $user) {
+        return array_map(function($rev) use ($project, $user) {
             /** @var Page $page Page object to be passed to the Edit constructor. */
             $page = Page::newFromRow($project, $rev);
             $rev['user'] = $user;
@@ -308,7 +308,7 @@ 
         $isSection = preg_match_all("/^\/\* (.*?) \*\//", $summary, $sectionMatch);
 
         if ($isSection && isset($page)) {
-            $pageUrl = $project->getUrl(false) . str_replace(
+            $pageUrl = $project->getUrl(false).str_replace(
                 '$1',
                 $page->getTitle($useUnnormalizedPageTitle),
                 $project->getArticlePath()
@@ -318,8 +318,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);
         }
 
@@ -333,7 +333,7 @@ 
             );
 
             // Use normalized page title (underscored, capitalized).
-            $pageUrl = $project->getUrl(false) . str_replace(
+            $pageUrl = $project->getUrl(false).str_replace(
                 '$1',
                 ucfirst(str_replace(' ', '_', $wikiLinkPath)),
                 $project->getArticlePath()
@@ -371,8 +371,8 @@ 
     public function getDiffUrl(): string
     {
         $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;
     }
 
     /**
@@ -382,8 +382,8 @@ 
     public function getPermaUrl(): string
     {
         $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;
     }
 
     /**
@@ -466,10 +466,10 @@ 
             $ret['reverted'] = $this->reverted;
         }
         if ($includeUsername) {
-            $ret = [ 'username' => $this->getUser()->getUsername() ] + $ret;
+            $ret = ['username' => $this->getUser()->getUsername()]+$ret;
         }
         if ($includeProject) {
-            $ret = [ 'project' => $this->getProject()->getDomain() ] + $ret;
+            $ret = ['project' => $this->getProject()->getDomain()]+$ret;
         }
 
         return $ret;

src/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 App\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/Model/ArticleInfo.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 +6 added lines, -6 removed lines

@@ -3,7 +3,7 @@ 
  * This file contains only the ArticleInfo class.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Model;
 
@@ -975,7 +975,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).
@@ -984,7 +984,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);
@@ -1002,7 +1002,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;
             }
@@ -1013,12 +1013,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/SimpleEditCounter.php

Spacing +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
  * This file contains only the SimpleEditCounter class.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Model;
 
@@ -148,7 +148,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/Model/EditSummary.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
  * This file contains only the EditSummary class.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Model;