x-tools / xtools

src/AppBundle/Model/User.php

Spacing +6 added lines, -6 removed lines

@@ -3,7 +3,7 @@ 
  * This file contains only the User class.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace AppBundle\Model;
 
@@ -127,14 +127,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;
@@ -145,8 +145,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.
@@ -354,7 +354,7 @@ 
      */
     public function countEdits(Project $project, $namespace = 'all', $start = false, $end = false): int
     {
-        return (int) $this->getRepository()->countEdits($project, $this, $namespace, $start, $end);
+        return (int)$this->getRepository()->countEdits($project, $this, $namespace, $start, $end);
     }
 
     /**

src/AppBundle/Repository/GlobalContribsRepository.php

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace AppBundle\Repository;
 
@@ -174,7 +174,7 @@ 
             $slice = $this->getDbList()[$dbName];
             // actor_revision table only includes users who have made at least one edit.
             $actorTable = $this->getTableName($dbName, 'actor', 'revision');
-            $queriesBySlice[$slice][] = "SELECT '$dbName' AS `dbName`, actor_id " .
+            $queriesBySlice[$slice][] = "SELECT '$dbName' AS `dbName`, actor_id ".
                 "FROM $actorTable WHERE $whereClause";
         }
 
@@ -293,13 +293,13 @@ 
         // Re-assemble into UNIONed queries, executing as many per slice as possible.
         $revisions = [];
         foreach ($queriesBySlice as $slice => $queries) {
-            $sql = "SELECT * FROM ((\n" . join("\n) UNION (\n", $queries) . ")) a ORDER BY timestamp DESC LIMIT $limit";
+            $sql = "SELECT * FROM ((\n".join("\n) UNION (\n", $queries).")) a ORDER BY timestamp DESC LIMIT $limit";
             $revisions = array_merge($revisions, $this->executeProjectsQuery($slice, $sql)->fetchAll());
         }
 
         // If there are more than $limit results, re-sort by timestamp.
         if (count($revisions) > $limit) {
-            usort($revisions, function ($a, $b) {
+            usort($revisions, function($a, $b) {
                 if ($a['unix_timestamp'] === $b['unix_timestamp']) {
                     return 0;
                 }

src/AppBundle/Repository/TopEditsRepository.php

Spacing +3 added lines, -3 removed lines

@@ -3,7 +3,7 @@ 
  * This file contains only the TopEditsRepository class.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace AppBundle\Repository;
 
@@ -65,7 +65,7 @@ 
         $hasPageAssessments = $this->isLabs() && $project->hasPageAssessments() && 0 === $namespace;
         $paTable = $project->getTableName('page_assessments');
         $paSelect = $hasPageAssessments
-            ?  ", (
+            ? ", (
                     SELECT pa_class
                     FROM $paTable
                     WHERE pa_page_id = page_id
@@ -179,7 +179,7 @@ 
         $hasPageAssessments = $this->isLabs() && $project->hasPageAssessments();
         $pageAssessmentsTable = $this->getTableName($project->getDatabaseName(), 'page_assessments');
         $paSelect = $hasPageAssessments
-            ?  ", (
+            ? ", (
                     SELECT pa_class
                     FROM $pageAssessmentsTable
                     WHERE pa_page_id = e.page_id

src/AppBundle/Model/LargestPages.php

Spacing +1 added lines, -1 removed lines

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

src/AppBundle/Repository/LargestPagesRepository.php

Spacing +1 added lines, -1 removed lines

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

src/AppBundle/Controller/LargestPagesController.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace AppBundle\Controller;
 
@@ -128,7 +128,7 @@ 
         $pages = [];
         foreach ($lp->getResults() as $index => $page) {
             $pages[] = [
-                'rank' => $index + 1,
+                'rank' => $index+1,
                 'page_title' => $page->getTitle(true),
                 'length' => $page->getLength(),
             ];

src/AppBundle/Repository/Repository.php

Spacing +4 added lines, -4 removed lines

@@ -3,7 +3,7 @@ 
  * This file contains only the Repository class.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace AppBundle\Repository;
 
@@ -221,7 +221,7 @@ 
         // $tableExtension in order to generate the new table name
         if ($this->isLabs() && null !== $tableExtension) {
             $mapped = true;
-            $tableName .=('' === $tableExtension ? '' : '_'.$tableExtension);
+            $tableName .= ('' === $tableExtension ? '' : '_'.$tableExtension);
         } elseif ($this->container->hasParameter("app.table.$tableName")) {
             // Use the table specified in the table mapping configuration, if present.
             $mapped = true;
@@ -233,7 +233,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->isLabs()) {
-            $tableName .="_userindex";
+            $tableName .= "_userindex";
         }
 
         // Figure out database name.
@@ -352,7 +352,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'";
         }
 

src/AppBundle/Model/GlobalContribs.php

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace AppBundle\Model;
 
@@ -100,8 +100,8 @@ 
 
         if ($sorted) {
             // Sort.
-            uasort($this->globalEditCounts, function ($a, $b) {
-                return $b['total'] - $a['total'];
+            uasort($this->globalEditCounts, function($a, $b) {
+                return $b['total']-$a['total'];
             });
         }
 
@@ -138,7 +138,7 @@ 
             $this->namespace,
             $this->start,
             $this->end,
-            $this->limit + 1,
+            $this->limit+1,
             $this->offset
         );
         $globalEdits = [];

src/AppBundle/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 AppBundle\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;
     }
 
     /**