x-tools / xtools

src/AppBundle/Controller/RfXVoteCalculatorController.php

Unused Use Statements -2 removed lines

@@ -3,8 +3,6 @@
 namespace AppBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\CssSelector\Exception\InternalErrorException;
-use Symfony\Component\Debug\Exception\ContextErrorException;
 use Symfony\Component\HttpFoundation\Request;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Xtools\ProjectRepository;

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
         $username = $request->query->get('username');
 
         if ($projectQuery != '' && $username != '') {
-            $routeParams = [ 'project' => $projectQuery, 'username' => $username ];
+            $routeParams = ['project' => $projectQuery, 'username' => $username];
             return $this->redirectToRoute(
                 'rfxvoteResult',
                 $routeParams
@@ -167,8 +167,8 @@ 
             $titles = [];
 
             while ($row = $sth->fetch()) {
-                $titles[] = $namespaces[$row['page_namespace']] .
-                    ':' .$row['page_title'];
+                $titles[] = $namespaces[$row['page_namespace']].
+                    ':'.$row['page_title'];
             }
 
             // Chunking... it's possible to make a URI too long

Doc Comments +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
      * @Route("/rfxvote/index.php", name="rfxvoteIndexPhp")
      * @Route("/rfxvote", name="RfXVoteCalculator")
      *
-     * @return Response
+     * @return \Symfony\Component\HttpFoundation\Response
      */
     public function indexAction()
     {
@@ -88,7 +88,7 @@ 
      *
      * @Route("/rfxvote/{project}/{username}", name="rfxvoteResult")
      *
-     * @return Response
+     * @return \Symfony\Component\HttpFoundation\Response
      * @codeCoverageIgnore
      */
     public function resultAction($project, $username)

src/Xtools/EditCounter.php

Doc Comments +2 added lines, -2 removed lines

@@ -473,7 +473,7 @@ 
 
     /**
      * Get the date and time of the user's first edit.
-     * @return DateTime|bool The time of the first revision, or false.
+     * @return DateInterval The time of the first revision, or false.
      */
     public function datetimeFirstRevision()
     {
@@ -483,7 +483,7 @@ 
 
     /**
      * Get the date and time of the user's first edit.
-     * @return DateTime|bool The time of the last revision, or false.
+     * @return DateInterval The time of the last revision, or false.
      */
     public function datetimeLastRevision()
     {

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 namespace Xtools;
 
 use DateTime;
-use Exception;
 use DatePeriod;
 use DateInterval;
 use GuzzleHttp;

Spacing +27 added lines, -27 removed lines

@@ -117,8 +117,8 @@ 
             $promises[] = $promise;
 
             // Handle response of $promise asynchronously.
-            $promise->then(function ($response) use ($key, $endpoint) {
-                $result = (array) json_decode($response->getBody()->getContents());
+            $promise->then(function($response) use ($key, $endpoint) {
+                $result = (array)json_decode($response->getBody()->getContents());
 
                 $this->getRepository()
                     ->getLog()
@@ -135,7 +135,7 @@ 
                     // We'll log this to see how often it happens.
                     $this->getRepository()
                         ->getLog()
-                        ->error("Failed to fetch data for $endpoint via async, " .
+                        ->error("Failed to fetch data for $endpoint via async, ".
                             "re-attempting synchoronously.");
                 }
             });
@@ -191,7 +191,7 @@ 
 
         // Filter out unblocks unless requested.
         if ($blocksOnly) {
-            $blocks = array_filter($blocks, function ($block) {
+            $blocks = array_filter($blocks, function($block) {
                 return $block['log_action'] === 'block';
             });
         }
@@ -225,7 +225,7 @@ 
      */
     public function countAllRevisions()
     {
-        return $this->countLiveRevisions() + $this->countDeletedRevisions();
+        return $this->countLiveRevisions()+$this->countDeletedRevisions();
     }
 
     /**
@@ -244,7 +244,7 @@ 
      */
     public function countRevisionsWithoutComments()
     {
-        return $this->countLiveRevisions() - $this->countRevisionsWithComments();
+        return $this->countLiveRevisions()-$this->countRevisionsWithComments();
     }
 
     /**
@@ -283,7 +283,7 @@ 
      */
     public function countAllPagesEdited()
     {
-        return $this->countLivePagesEdited() + $this->countDeletedPagesEdited();
+        return $this->countLivePagesEdited()+$this->countDeletedPagesEdited();
     }
 
     /**
@@ -293,7 +293,7 @@ 
      */
     public function countPagesCreated()
     {
-        return $this->countCreatedPagesLive() + $this->countPagesCreatedDeleted();
+        return $this->countCreatedPagesLive()+$this->countPagesCreatedDeleted();
     }
 
     /**
@@ -433,7 +433,7 @@ 
             } elseif ($block['log_action'] === 'unblock') {
                 // 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;
 
@@ -444,8 +444,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;
             }
         }
 
@@ -455,7 +455,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.
@@ -496,7 +496,7 @@ 
         // If invalid, $duration is left as null.
         if (strtotime($durationStr)) {
             $expiry = strtotime($durationStr, $timestamp);
-            $duration = $expiry - $timestamp;
+            $duration = $expiry-$timestamp;
         }
 
         return [$timestamp, $duration];
@@ -573,7 +573,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;
     }
 
     /**
@@ -697,9 +697,9 @@ 
     public function approvals()
     {
         $logCounts = $this->getLogCounts();
-        $total = $logCounts['review-approve'] +
-        (!empty($logCounts['review-approve-a']) ? $logCounts['review-approve-a'] : 0) +
-        (!empty($logCounts['review-approve-i']) ? $logCounts['review-approve-i'] : 0) +
+        $total = $logCounts['review-approve']+
+        (!empty($logCounts['review-approve-a']) ? $logCounts['review-approve-a'] : 0)+
+        (!empty($logCounts['review-approve-i']) ? $logCounts['review-approve-i'] : 0)+
         (!empty($logCounts['review-approve-ia']) ? $logCounts['review-approve-ia'] : 0);
         return $total;
     }
@@ -723,7 +723,7 @@ 
         $logCounts = $this->getLogCounts();
         $create2 = $logCounts['newusers-create2'] ?: 0;
         $byemail = $logCounts['newusers-byemail'] ?: 0;
-        return $create2 + $byemail;
+        return $create2+$byemail;
     }
 
     /**
@@ -775,7 +775,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
         ];
@@ -803,7 +803,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'];
         }
 
         $dateRange = new DatePeriod(
@@ -813,8 +813,8 @@ 
         );
 
         foreach ($dateRange as $monthObj) {
-            $year = (int) $monthObj->format('Y');
-            $month = (int) $monthObj->format('n');
+            $year = (int)$monthObj->format('Y');
+            $month = (int)$monthObj->format('n');
 
             // Fill in labels
             $out['monthLabels'][] = $monthObj->format('Y-m');
@@ -930,8 +930,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'];
             });
         }
 
@@ -967,7 +967,7 @@ 
                 $nsName = $project->getNamespaces()[$revision['page_namespace']];
             }
             $page = $project->getRepository()
-                ->getPage($project, $nsName . ':' . $revision['page_title']);
+                ->getPage($project, $nsName.':'.$revision['page_title']);
             $edit = new Edit($page, $revision);
             $globalEdits[$edit->getTimestamp()->getTimestamp().'-'.$edit->getId()] = $edit;
         }
@@ -1008,7 +1008,7 @@ 
     public function countSmallEdits()
     {
         $editSizeData = $this->getEditSizeData();
-        return isset($editSizeData['small_edits']) ? (int) $editSizeData['small_edits'] : 0;
+        return isset($editSizeData['small_edits']) ? (int)$editSizeData['small_edits'] : 0;
     }
 
     /**
@@ -1018,7 +1018,7 @@ 
     public function countLargeEdits()
     {
         $editSizeData = $this->getEditSizeData();
-        return isset($editSizeData['large_edits']) ? (int) $editSizeData['large_edits'] : 0;
+        return isset($editSizeData['large_edits']) ? (int)$editSizeData['large_edits'] : 0;
     }
 
     /**

src/AppBundle/Controller/ApiController.php

Unused Use Statements -3 removed lines

@@ -5,12 +5,9 @@
 
 namespace AppBundle\Controller;
 
-use Exception;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Debug\Exception\FatalErrorException;
 use FOS\RestBundle\Controller\Annotations as Rest;
 use FOS\RestBundle\Controller\FOSRestController;
 use FOS\RestBundle\View\View;

Spacing +10 added lines, -10 removed lines

@@ -131,7 +131,7 @@ 
             $res['automated_editcount'] = $user->countAutomatedEdits($project, $namespace, $start, $end);
         }
 
-        $res['nonautomated_editcount'] = $res['total_editcount'] - $res['automated_editcount'];
+        $res['nonautomated_editcount'] = $res['total_editcount']-$res['automated_editcount'];
 
         $view = View::create()->setStatusCode(Response::HTTP_OK);
         $view->setData($res);
@@ -176,8 +176,8 @@ 
             if ($request->query->get('format') !== 'html') {
                 return new View(
                     [
-                        'error' => 'Unable to show any data. User has made over ' .
-                            $user->maxEdits() . ' edits.',
+                        'error' => 'Unable to show any data. User has made over '.
+                            $user->maxEdits().' edits.',
                     ],
                     Response::HTTP_FORBIDDEN
                 );
@@ -192,7 +192,7 @@ 
 
         if ($request->query->get('format') === 'html') {
             if ($edits) {
-                $edits = array_map(function ($attrs) use ($project, $username) {
+                $edits = array_map(function($attrs) use ($project, $username) {
                     $page = $project->getRepository()
                         ->getPage($project, $attrs['full_page_title']);
                     $pageTitles[] = $attrs['full_page_title'];
@@ -270,19 +270,19 @@ 
         $info = $page->getBasicEditingInfo();
         $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();
 
         $data = [
-            'revisions' => (int) $info['num_edits'],
-            'editors' => (int) $info['num_editors'],
+            'revisions' => (int)$info['num_edits'],
+            'editors' => (int)$info['num_editors'],
             'author' => $info['author'],
-            'author_editcount' => (int) $info['author_editcount'],
+            'author_editcount' => (int)$info['author_editcount'],
             'created_at' => $creationDateTime->format('Y-m-d'),
             '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'],
-            'watchers' => (int) $page->getWatchers(),
+            'last_edit_id' => (int)$info['modified_rev_id'],
+            'watchers' => (int)$page->getWatchers(),
             'pageviews' => $page->getLastPageviews($pageviewsOffset),
             'pageviews_offset' => $pageviewsOffset,
         ];

src/Xtools/Page.php

Doc Comments +7 added lines, -7 removed lines

@@ -59,7 +59,7 @@ 
 
     /**
      * Get this page's database ID.
-     * @return int
+     * @return \string|null
      */
     public function getId()
     {
@@ -69,7 +69,7 @@ 
 
     /**
      * Get this page's length in bytes.
-     * @return int
+     * @return \string|null
      */
     public function getLength()
     {
@@ -93,7 +93,7 @@ 
 
     /**
      * Get the full URL of this page.
-     * @return string
+     * @return \string|null
      */
     public function getUrl()
     {
@@ -103,7 +103,7 @@ 
 
     /**
      * Get the numerical ID of the namespace of this page.
-     * @return int
+     * @return \string|null
      */
     public function getNamespace()
     {
@@ -113,7 +113,7 @@ 
 
     /**
      * Get the number of page watchers.
-     * @return int
+     * @return \string|null
      */
     public function getWatchers()
     {
@@ -420,8 +420,8 @@ 
 
     /**
      * Get the sum of pageviews for the given page and timeframe.
-     * @param string|DateTime $start In the format YYYYMMDD
-     * @param string|DateTime $end In the format YYYYMMDD
+     * @param string $start In the format YYYYMMDD
+     * @param string $end In the format YYYYMMDD
      * @return string[]
      */
     public function getPageviews($start, $end)

Spacing +9 added lines, -9 removed lines

@@ -81,7 +81,7 @@ 
         $info = $this->getPageInfo();
         $title = isset($info['title']) ? $info['title'] : $this->unnormalizedPageName;
         $nsName = $this->getNamespaceName();
-        return str_replace($nsName . ':', '', $title);
+        return str_replace($nsName.':', '', $title);
     }
 
     /**
@@ -217,7 +217,7 @@ 
     {
         // If a user is given, we will not cache the result via instance variable.
         if ($user !== null) {
-            return (int) $this->getRepository()->getNumRevisions($this, $user);
+            return (int)$this->getRepository()->getNumRevisions($this, $user);
         }
 
         // Return cached value, if present.
@@ -230,7 +230,7 @@ 
             $this->numRevisions = count($this->revisions);
         } else {
             // Otherwise do a COUNT in the event fetching all revisions is not desired.
-            $this->numRevisions = (int) $this->getRepository()->getNumRevisions($this);
+            $this->numRevisions = (int)$this->getRepository()->getNumRevisions($this);
         }
 
         return $this->numRevisions;
@@ -260,7 +260,7 @@ 
     {
         $content = $this->getRepository()->getPagesWikitext(
             $this->getProject(),
-            [ $this->getTitle() ]
+            [$this->getTitle()]
         );
 
         return isset($content[$this->getTitle()])
@@ -417,7 +417,7 @@ 
 
         $wikidataInfo = $this->getRepository()->getWikidataInfo($this);
 
-        $terms = array_map(function ($entry) {
+        $terms = array_map(function($entry) {
             return $entry['term'];
         }, $wikidataInfo);
 
@@ -428,7 +428,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>",
             ];
         }
@@ -438,7 +438,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>",
             ];
         }
@@ -517,8 +517,8 @@ 
             return 0;
         }
 
-        return array_sum(array_map(function ($item) {
-            return (int) $item['views'];
+        return array_sum(array_map(function($item) {
+            return (int)$item['views'];
         }, $pageviews['items']));
     }
 

src/AppBundle/Controller/AutomatedEditsController.php

Spacing +2 added lines, -2 removed lines

@@ -151,8 +151,8 @@
         // Get individual counts of how many times each tool was used.
         // This also includes a wikilink to the tool.
         $toolCounts = $user->getAutomatedCounts($projectData, $namespace, $start, $end);
-        $toolsTotal = array_reduce($toolCounts, function ($a, $b) {
-            return $a + $b['count'];
+        $toolsTotal = array_reduce($toolCounts, function($a, $b) {
+            return $a+$b['count'];
         });
 
         // Query to get combined (semi)automated using for all edits

src/AppBundle/EventSubscriber/RateLimitSubscriber.php

Spacing +10 added lines, -10 removed lines

@@ -56,8 +56,8 @@ 
      */
     public function onKernelController(FilterControllerEvent $event)
     {
-        $this->rateLimit = (int) $this->container->getParameter('app.rate_limit_count');
-        $this->rateDuration = (int) $this->container->getParameter('app.rate_limit_time');
+        $this->rateLimit = (int)$this->container->getParameter('app.rate_limit_count');
+        $this->rateDuration = (int)$this->container->getParameter('app.rate_limit_time');
 
         // Zero values indicate the rate limiting feature should be disabled.
         if ($this->rateLimit === 0 || $this->rateDuration === 0) {
@@ -65,7 +65,7 @@ 
         }
 
         $controller = $event->getController();
-        $loggedIn = (bool) $this->container->get('session')->get('logged_in_user');
+        $loggedIn = (bool)$this->container->get('session')->get('logged_in_user');
 
         /**
          * Rate limiting will not apply to these actions
@@ -91,7 +91,7 @@ 
         $cacheItem = $cache->getItem($cacheKey);
 
         // If increment value already in cache, or start with 1.
-        $count = $cacheItem->isHit() ? (int) $cacheItem->get() + 1 : 1;
+        $count = $cacheItem->isHit() ? (int)$cacheItem->get()+1 : 1;
 
         // Check if limit has been exceeded, and if so, throw an error.
         if ($count > $this->rateLimit) {
@@ -143,14 +143,14 @@ 
         // Log the denied request
         $logger = $this->container->get('monolog.logger.rate_limit');
         $logger->info(
-            "<URI>: " . $request->getRequestUri() .
-            ($logComment != '' ? "\t<Reason>: $logComment" : '') .
-            "\t<User agent>: " . $request->headers->get('User-Agent')
+            "<URI>: ".$request->getRequestUri().
+            ($logComment != '' ? "\t<Reason>: $logComment" : '').
+            "\t<User agent>: ".$request->headers->get('User-Agent')
         );
 
-        throw new AccessDeniedHttpException("Possible spider crawl detected. " .
-            'If you are human, you are making too many requests during a short period of time. ' .
-            "Please wait $this->rateDuration minutes before reloading this tool. You can then " .
+        throw new AccessDeniedHttpException("Possible spider crawl detected. ".
+            'If you are human, you are making too many requests during a short period of time. '.
+            "Please wait $this->rateDuration minutes before reloading this tool. You can then ".
             'login to prevent this from happening again.');
     }
 }

src/AppBundle/Controller/RfXAnalysisController.php

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Xtools\ProjectRepository;
 use Xtools\Page;
 use Xtools\PagesRepository;

Spacing +1 added lines, -1 removed lines

@@ -166,7 +166,7 @@
         $neutral = $rfx->getSection('neutral');
         $dup = $rfx->getDuplicates();
 
-        $total = count($support) + count($oppose) + count($neutral);
+        $total = count($support)+count($oppose)+count($neutral);
 
         if ($total === 0) {
             $this->addFlash('notice', ['no-result', $pagename]);

Doc Comments +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
      * @Route("/rfx/{project}",        name="rfxAnalysisProject")
      * @Route("/rfx/{project}/{type}", name="rfxAnalysisProjectType")
      *
-     * @return Response|RedirectResponse
+     * @return \Symfony\Component\HttpFoundation\Response
      */
     public function indexAction(Request $request, $project = null, $type = null)
     {
@@ -111,7 +111,7 @@ 
      *
      * @Route("/rfx/{project}/{type}/{username}", name="rfxAnalysisResult")
      *
-     * @return Response|RedirectResponse
+     * @return \Symfony\Component\HttpFoundation\Response
      * @codeCoverageIgnore
      */
     public function resultAction($project, $type, $username)

src/Xtools/RFX.php

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
      * Returns matches.
      *
      * @param string $input   The line we're looking for
-     * @param array  $matches Pointer to an array where we stash results
+     * @param string[]  $matches Pointer to an array where we stash results
      *
      * @TODO: Make this cleaner
      *

Spacing +2 added lines, -2 removed lines

@@ -119,7 +119,7 @@ 
             }
         }
 
-        $final = [];    // initialize the final array
+        $final = []; // initialize the final array
         $finalRaw = []; // Initialize the raw data array
 
         foreach ($this->data as $key => $value) {
@@ -132,7 +132,7 @@ 
 
         $final = array_count_values($final); // find repetition and its count
 
-        $final = array_diff($final, [1]);    // remove single occurrences
+        $final = array_diff($final, [1]); // remove single occurrences
 
         $this->duplicates = array_keys($final);
     }

src/Xtools/UserRepository.php

Doc Comments +2 added lines, -2 removed lines

@@ -96,7 +96,7 @@ 
      * Get the user's (system) edit count.
      * @param string $databaseName The database to query.
      * @param string $username The username to find.
-     * @return int|null As returned by the database.
+     * @return string|boolean As returned by the database.
      */
     public function getEditCount($databaseName, $username)
     {
@@ -741,7 +741,7 @@ 
      * Get the combined regex and tags for all semi-automated tools,
      *   ready to be used in a query.
      * @param string $projectDomain Such as en.wikipedia.org
-     * @param $conn Doctrine\DBAL\Connection Used for proper escaping
+     * @param \Doctrine\DBAL\Connection $conn Doctrine\DBAL\Connection Used for proper escaping
      * @return string[] In the format:
      *    ['combined|regex', 'combined,tags']
      */

Spacing +28 added lines, -28 removed lines

@@ -124,7 +124,7 @@ 
 
         $this->stopwatch->start($cacheKey, 'XTools');
         $api = $this->getMediawikiApi($project);
-        $params = [ "list"=>"users", "ususers"=>$username, "usprop"=>"groups" ];
+        $params = ["list"=>"users", "ususers"=>$username, "usprop"=>"groups"];
         $query = new SimpleRequest('query', $params);
         $result = [];
         $res = $api->getRequest($query);
@@ -159,7 +159,7 @@ 
 
         // Create the API query.
         $api = $this->getMediawikiApi($project);
-        $params = [ "meta"=>"globaluserinfo", "guiuser"=>$username, "guiprop"=>"groups" ];
+        $params = ["meta"=>"globaluserinfo", "guiuser"=>$username, "guiprop"=>"groups"];
         $query = new SimpleRequest('query', $params);
 
         // Get the result.
@@ -203,8 +203,8 @@ 
     {
         $username = $user->getUsername();
 
-        $cacheKey = 'pages.' . $project->getDatabaseName() . '.'
-            . $user->getCacheKey() . '.' . $namespace . '.' . $redirects;
+        $cacheKey = 'pages.'.$project->getDatabaseName().'.'
+            . $user->getCacheKey().'.'.$namespace.'.'.$redirects;
         if ($this->cache->hasItem($cacheKey)) {
             return $this->cache->getItem($cacheKey)->get();
         }
@@ -262,8 +262,8 @@ 
                 FROM $pageTable
                 JOIN $revisionTable ON page_id = rev_page
                 $paJoin
-                WHERE $whereRev AND rev_parent_id = '0' $namespaceConditionRev $redirectCondition" .
-                ($hasPageAssessments ? 'GROUP BY rev_page' : '') . "
+                WHERE $whereRev AND rev_parent_id = '0' $namespaceConditionRev $redirectCondition".
+                ($hasPageAssessments ? 'GROUP BY rev_page' : '')."
             )
 
             UNION
@@ -305,21 +305,21 @@ 
      */
     public function countEdits(Project $project, User $user, $namespace = 'all', $start = '', $end = '')
     {
-        $cacheKey = 'editcount.' . $project->getDatabaseName() . '.'
-            . $user->getCacheKey() . '.' . $namespace;
+        $cacheKey = 'editcount.'.$project->getDatabaseName().'.'
+            . $user->getCacheKey().'.'.$namespace;
 
         $condBegin = '';
         $condEnd = '';
 
         if (!empty($start)) {
-            $cacheKey .= '.' . $start;
+            $cacheKey .= '.'.$start;
 
             // For the query
             $start = date('Ymd000000', strtotime($start));
             $condBegin = 'AND rev_timestamp >= :start ';
         }
         if (!empty($end)) {
-            $cacheKey .= '.' . $end;
+            $cacheKey .= '.'.$end;
 
             // For the query
             $end = date('Ymd235959', strtotime($end));
@@ -379,21 +379,21 @@ 
      */
     public function countAutomatedEdits(Project $project, User $user, $namespace = 'all', $start = '', $end = '')
     {
-        $cacheKey = 'autoeditcount.' . $project->getDatabaseName() . '.'
-            . $user->getCacheKey() . '.' . $namespace;
+        $cacheKey = 'autoeditcount.'.$project->getDatabaseName().'.'
+            . $user->getCacheKey().'.'.$namespace;
 
         $condBegin = '';
         $condEnd = '';
 
         if (!empty($start)) {
-            $cacheKey .= '.' . $start;
+            $cacheKey .= '.'.$start;
 
             // For the query
             $start = date('Ymd000000', strtotime($start));
             $condBegin = 'AND rev_timestamp >= :start ';
         }
         if (!empty($end)) {
-            $cacheKey .= '.' . $end;
+            $cacheKey .= '.'.$end;
 
             // For the query
             $end = date('Ymd235959', strtotime($end));
@@ -425,7 +425,7 @@ 
             $tagJoin = $tags != '' ? "LEFT OUTER JOIN $tagTable ON ct_rev_id = rev_id" : '';
             $condTools[] = "ct_tag IN ($tags)";
         }
-        $condTool = 'AND (' . implode(' OR ', $condTools) . ')';
+        $condTool = 'AND ('.implode(' OR ', $condTools).')';
 
         $sql = "SELECT COUNT(DISTINCT(rev_id))
                 FROM $revisionTable
@@ -450,7 +450,7 @@ 
             $resultQuery->bindParam('namespace', $namespace);
         }
         $resultQuery->execute();
-        $result = (int) $resultQuery->fetchColumn();
+        $result = (int)$resultQuery->fetchColumn();
 
         // Cache for 10 minutes, and return.
         $cacheItem = $this->cache->getItem($cacheKey)
@@ -482,21 +482,21 @@ 
         $end = '',
         $offset = 0
     ) {
-        $cacheKey = 'nonautoedits.' . $project->getDatabaseName() . '.'
-            . $user->getCacheKey() . '.' . $namespace . '.' . $offset;
+        $cacheKey = 'nonautoedits.'.$project->getDatabaseName().'.'
+            . $user->getCacheKey().'.'.$namespace.'.'.$offset;
 
         $condBegin = '';
         $condEnd = '';
 
         if (!empty($start)) {
-            $cacheKey .= '.' . $start;
+            $cacheKey .= '.'.$start;
 
             // For the query
             $start = date('Ymd000000', strtotime($start));
             $condBegin = 'AND revs.rev_timestamp >= :start ';
         }
         if (!empty($end)) {
-            $cacheKey .= '.' . $end;
+            $cacheKey .= '.'.$end;
 
             // For the query
             $end = date('Ymd235959', strtotime($end));
@@ -589,21 +589,21 @@ 
         $start = '',
         $end = ''
     ) {
-        $cacheKey = 'autotoolcounts.' . $project->getDatabaseName() . '.'
-            . $user->getCacheKey() . '.' . $namespace;
+        $cacheKey = 'autotoolcounts.'.$project->getDatabaseName().'.'
+            . $user->getCacheKey().'.'.$namespace;
 
         $condBegin = '';
         $condEnd = '';
 
         if (!empty($start)) {
-            $cacheKey .= '.' . $start;
+            $cacheKey .= '.'.$start;
 
             // For the query
             $start = date('Ymd000000', strtotime($start));
             $condBegin = 'AND rev_timestamp >= :start ';
         }
         if (!empty($end)) {
-            $cacheKey .= '.' . $end;
+            $cacheKey .= '.'.$end;
 
             // For the query
             $end = date('Ymd235959', strtotime($end));
@@ -650,13 +650,13 @@ 
                 if ($condTool === '') {
                     $condTool = "ct_tag = $tag";
                 } else {
-                    $condTool = '(' . $condTool . " OR ct_tag = $tag)";
+                    $condTool = '('.$condTool." OR ct_tag = $tag)";
                 }
             }
 
             // Developer error, no regex or tag provided for this tool.
             if ($condTool === '') {
-                throw new Exception("No regex or tag found for the tool $toolname. " .
+                throw new Exception("No regex or tag found for the tool $toolname. ".
                     "Please verify this entry in semi_automated.yml");
             }
 
@@ -708,8 +708,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'];
         });
 
         // Cache for 10 minutes, and return.