x-tools / xtools

src/Model/Model.php

Spacing +1 added lines, -1 removed lines

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

src/Model/EditSummary.php

Spacing +1 added lines, -1 removed lines

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

src/Model/Project.php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Model;
 
@@ -155,7 +155,7 @@ 
      */
     public function getUrl(bool $withTrailingSlash = true): string
     {
-        return rtrim($this->getBasicInfo()['url'], '/') . ($withTrailingSlash ? '/' : '');
+        return rtrim($this->getBasicInfo()['url'], '/').($withTrailingSlash ? '/' : '');
     }
 
     /**
@@ -191,7 +191,7 @@ 
     public function getScript(): string
     {
         $metadata = $this->getMetadata();
-        return $metadata['general']['script'] ?? $this->getScriptPath() . '/index.php';
+        return $metadata['general']['script'] ?? $this->getScriptPath().'/index.php';
     }
 
     /**
@@ -200,7 +200,7 @@ 
      */
     public function getApiUrl(): string
     {
-        return rtrim($this->getUrl(), '/') . $this->getRepository()->getApiPath();
+        return rtrim($this->getUrl(), '/').$this->getRepository()->getApiPath();
     }
 
     /**
@@ -275,7 +275,7 @@ 
      */
     public function userOptInPage(User $user): string
     {
-        return 'User:' . $user->getUsername() . '/EditCounterOptIn.js';
+        return 'User:'.$user->getUsername().'/EditCounterOptIn.js';
     }
 
     /**
@@ -309,7 +309,7 @@ 
         }
 
         // 4. Lastly, see if they've opted in globally on the default project or Meta.
-        $globalPageName = $user->getUsername() . '/EditCounterGlobalOptIn.js';
+        $globalPageName = $user->getUsername().'/EditCounterGlobalOptIn.js';
         $globalProject = $this->getRepository()->getGlobalProject();
         $globalExists = $globalProject->getRepository()
             ->pageHasContent($globalProject, $userNsId, $globalPageName);

src/Model/Edit.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Model;
 
@@ -98,7 +98,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;
@@ -320,7 +320,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()
@@ -330,8 +330,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);
         }
 
@@ -345,7 +345,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()
@@ -383,8 +383,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;
     }
 
     /**
@@ -394,8 +394,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;
     }
 
     /**
@@ -474,10 +474,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/AdminScore.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Model;
 
@@ -103,8 +103,8 @@ 
                     $now = new DateTime();
                     $date = new DateTime($value);
                     $diff = $date->diff($now);
-                    $formula = 365 * (int)$diff->format('%y') + 30 *
-                        (int)$diff->format('%m') + (int)$diff->format('%d');
+                    $formula = 365 * (int)$diff->format('%y')+30 *
+                        (int)$diff->format('%m')+(int)$diff->format('%d');
                     if ($formula < 365) {
                         $this->multipliers['account-age-mult'] = 0;
                     }
@@ -112,7 +112,7 @@ 
                 }
             }
 
-            $multiplierKey = $row['source'] . '-mult';
+            $multiplierKey = $row['source'].'-mult';
             $multiplier = $this->multipliers[$multiplierKey] ?? 1;
             $score = max(min($value * $multiplier, 100), -100);
             $this->scores[$key]['mult'] = $multiplier;

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/PageAssessments.php

Spacing +1 added lines, -1 removed lines

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

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']));
     }