x-tools / xtools

src/AppBundle/Controller/EditCounterController.php

Spacing +2 added lines, -2 removed lines

@@ -53,10 +53,10 @@
         $username = $request->query->get('username');
 
         if (($project || $queryProject) && $username) {
-            $routeParams = [ 'project'=>($project ?: $queryProject), 'username' => $username ];
+            $routeParams = ['project'=>($project ?: $queryProject), 'username' => $username];
             return $this->redirectToRoute("EditCounterResult", $routeParams);
         } elseif (!$project && $queryProject) {
-            return $this->redirectToRoute("EditCounterProject", [ 'project'=>$queryProject ]);
+            return $this->redirectToRoute("EditCounterProject", ['project'=>$queryProject]);
         }
 
         $this->init($project);

Unused Use Statements -3 removed lines

@@ -3,16 +3,13 @@
 namespace AppBundle\Controller;
 
 use AppBundle\Helper\ApiHelper;
-use AppBundle\Helper\AutomatedEditsHelper;
 use AppBundle\Helper\LabsHelper;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 use Xtools\EditCounter;
 use Xtools\EditCounterRepository;
-use Xtools\Project;
 use Xtools\ProjectRepository;
-use Xtools\User;
 use Xtools\UserRepository;
 
 class EditCounterController extends Controller

src/AppBundle/Controller/TopEditsController.php

Doc Comments +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
      * List top edits by this user for all pages in a particular namespace.
      * @param User $user The User.
      * @param Project $project The project.
-     * @param integer|string $namespaceId The namespace ID or 'all'
+     * @param integer $namespaceId The namespace ID or 'all'
      * @return \Symfony\Component\HttpFoundation\Response
      */
     protected function namespaceTopEdits(User $user, Project $project, $namespaceId)

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\VarDumper\VarDumper;
 use Xtools\Page;
 use Xtools\PagesRepository;
 use Xtools\Project;

Spacing +3 added lines, -3 removed lines

@@ -55,7 +55,7 @@ 
                 'username' => $username,
             ]);
         } elseif ($projectName != "") {
-            return $this->redirectToRoute("TopEditsResults", [ 'project'=>$projectName ]);
+            return $this->redirectToRoute("TopEditsResults", ['project'=>$projectName]);
         }
 
         // Set default project so we can populate the namespace selector.
@@ -130,7 +130,7 @@ 
         }
 
         // Get page info about these 100 pages, so we can use their display title.
-        $titles = array_map(function ($e) {
+        $titles = array_map(function($e) {
             return $e['page_title'];
         }, $editData);
         /** @var ApiHelper $apiHelper */
@@ -142,7 +142,7 @@ 
         foreach ($editData as $editDatum) {
             $pageTitle = $editDatum['page_title'];
             // If 'all' namespaces, prepend namespace to display title.
-            $nsTitle = !is_numeric($namespaceId) ? $namespaces[$editDatum['page_namespace']] . ':' : '';
+            $nsTitle = !is_numeric($namespaceId) ? $namespaces[$editDatum['page_namespace']].':' : '';
             $editDatum['displaytitle'] = $nsTitle.$displayTitles[$pageTitle];
             $edits[] = $editDatum;
         }

src/Xtools/PagesRepository.php

Doc Comments +2 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
      * @param Project $project The project to which the page belongs.
      * @param string $pageTitle Page title.
      * @param boolean $followRedirects Whether or not to resolve redirects
-     * @return string[] Array with some of the following keys: pageid, title, missing, displaytitle,
+     * @return string|null Array with some of the following keys: pageid, title, missing, displaytitle,
      * url.
      */
     public function getPageInfo(Project $project, $pageTitle, $followRedirects = true)
@@ -63,9 +63,8 @@ 
 
     /**
      * Get revisions of a single page.
-     * @param Project $project
      * @param Page $page
-     * @param User|null $user
+     * @param User $user
      * @return string[] Each member with keys: id, timestamp, length-
      */
     public function getRevisions(Page $page, User $user)

src/AppBundle/Twig/AppExtension.php

Spacing +57 added lines, -57 removed lines

@@ -16,39 +16,39 @@ 
     {
         $options = ['is_safe' => ['html']];
         return [
-            new \Twig_SimpleFunction('request_time', [ $this, 'requestTime' ], $options),
-            new \Twig_SimpleFunction('memory_usage', [ $this, 'requestMemory' ], $options),
-            new \Twig_SimpleFunction('year', [ $this, 'generateYear' ], $options),
-            new \Twig_SimpleFunction('msgPrintExists', [ $this, 'intuitionMessagePrintExists' ], $options),
-            new \Twig_SimpleFunction('msgExists', [ $this, 'intuitionMessageExists' ], $options),
-            new \Twig_SimpleFunction('msg', [ $this, 'intuitionMessage' ], $options),
-            new \Twig_SimpleFunction('lang', [ $this, 'getLang' ], $options),
-            new \Twig_SimpleFunction('langName', [ $this, 'getLangName' ], $options),
-            new \Twig_SimpleFunction('allLangs', [ $this, 'getAllLangs' ]),
-            new \Twig_SimpleFunction('isRTL', [ $this, 'intuitionIsRTL' ]),
-            new \Twig_SimpleFunction('isRTLLang', [ $this, 'intuitionIsRTLLang' ]),
-            new \Twig_SimpleFunction('shortHash', [ $this, 'gitShortHash' ]),
-            new \Twig_SimpleFunction('hash', [ $this, 'gitHash' ]),
-            new \Twig_SimpleFunction('enabled', [ $this, 'tabEnabled' ]),
-            new \Twig_SimpleFunction('tools', [ $this, 'allTools' ]),
-            new \Twig_SimpleFunction('color', [ $this, 'getColorList' ]),
-            new \Twig_SimpleFunction('chartColor', [ $this, 'chartColor' ]),
-            new \Twig_SimpleFunction('isWMFLabs', [ $this, 'isWMFLabs' ]),
-            new \Twig_SimpleFunction('isSingleWiki', [ $this, 'isSingleWiki' ]),
-            new \Twig_SimpleFunction('getReplagThreshold', [ $this, 'getReplagThreshold' ]),
-            new \Twig_SimpleFunction('loadStylesheetsFromCDN', [ $this, 'loadStylesheetsFromCDN' ]),
-            new \Twig_SimpleFunction('isWMFLabs', [ $this, 'isWMFLabs' ]),
-            new \Twig_SimpleFunction('replag', [ $this, 'replag' ]),
-            new \Twig_SimpleFunction('link', [ $this, 'link' ]),
-            new \Twig_SimpleFunction('quote', [ $this, 'quote' ]),
-            new \Twig_SimpleFunction('bugReportURL', [ $this, 'bugReportURL' ]),
+            new \Twig_SimpleFunction('request_time', [$this, 'requestTime'], $options),
+            new \Twig_SimpleFunction('memory_usage', [$this, 'requestMemory'], $options),
+            new \Twig_SimpleFunction('year', [$this, 'generateYear'], $options),
+            new \Twig_SimpleFunction('msgPrintExists', [$this, 'intuitionMessagePrintExists'], $options),
+            new \Twig_SimpleFunction('msgExists', [$this, 'intuitionMessageExists'], $options),
+            new \Twig_SimpleFunction('msg', [$this, 'intuitionMessage'], $options),
+            new \Twig_SimpleFunction('lang', [$this, 'getLang'], $options),
+            new \Twig_SimpleFunction('langName', [$this, 'getLangName'], $options),
+            new \Twig_SimpleFunction('allLangs', [$this, 'getAllLangs']),
+            new \Twig_SimpleFunction('isRTL', [$this, 'intuitionIsRTL']),
+            new \Twig_SimpleFunction('isRTLLang', [$this, 'intuitionIsRTLLang']),
+            new \Twig_SimpleFunction('shortHash', [$this, 'gitShortHash']),
+            new \Twig_SimpleFunction('hash', [$this, 'gitHash']),
+            new \Twig_SimpleFunction('enabled', [$this, 'tabEnabled']),
+            new \Twig_SimpleFunction('tools', [$this, 'allTools']),
+            new \Twig_SimpleFunction('color', [$this, 'getColorList']),
+            new \Twig_SimpleFunction('chartColor', [$this, 'chartColor']),
+            new \Twig_SimpleFunction('isWMFLabs', [$this, 'isWMFLabs']),
+            new \Twig_SimpleFunction('isSingleWiki', [$this, 'isSingleWiki']),
+            new \Twig_SimpleFunction('getReplagThreshold', [$this, 'getReplagThreshold']),
+            new \Twig_SimpleFunction('loadStylesheetsFromCDN', [$this, 'loadStylesheetsFromCDN']),
+            new \Twig_SimpleFunction('isWMFLabs', [$this, 'isWMFLabs']),
+            new \Twig_SimpleFunction('replag', [$this, 'replag']),
+            new \Twig_SimpleFunction('link', [$this, 'link']),
+            new \Twig_SimpleFunction('quote', [$this, 'quote']),
+            new \Twig_SimpleFunction('bugReportURL', [$this, 'bugReportURL']),
         ];
     }
 
     public function requestTime($decimals = 3)
     {
 
-        return number_format(microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'], $decimals);
+        return number_format(microtime(true)-$_SERVER['REQUEST_TIME_FLOAT'], $decimals);
     }
 
     public function requestMemory()
@@ -68,7 +68,7 @@ 
     // TODO: refactor all intuition stuff so it can be used anywhere
     public function intuitionMessageExists($message = "")
     {
-        return $this->getIntuition()->msgExists($message, [ "domain" => "xtools" ]);
+        return $this->getIntuition()->msgExists($message, ["domain" => "xtools"]);
     }
 
     public function intuitionMessagePrintExists($message = "", $vars = [])
@@ -87,7 +87,7 @@ 
 
     public function intuitionMessage($message = "", $vars = [])
     {
-        return $this->getIntuition()->msg($message, [ "domain" => "xtools", "variables" => $vars ]);
+        return $this->getIntuition()->msg($message, ["domain" => "xtools", "variables" => $vars]);
     }
 
     public function getLang()
@@ -108,10 +108,10 @@ 
      */
     public function getAllLangs()
     {
-        $messageFiles = glob($this->container->getParameter("kernel.root_dir") . '/../i18n/*.json');
+        $messageFiles = glob($this->container->getParameter("kernel.root_dir").'/../i18n/*.json');
 
         $languages = array_values(array_unique(array_map(
-            function ($filename) {
+            function($filename) {
                 return basename($filename, '.json');
             },
             $messageFiles
@@ -168,41 +168,41 @@ 
     public static function getColorList($num = false)
     {
         $colors = [
-            0 => '#Cc0000',# '#FF005A', #red '#FF5555',
+            0 => '#Cc0000', # '#FF005A', #red '#FF5555',
             1 => '#F7b7b7',
-            2 => '#5c8d20',# '#008800', #green'#55FF55',
+            2 => '#5c8d20', # '#008800', #green'#55FF55',
             3 => '#85eD82',
             4 => '#2E97E0', # blue
             5 => '#B9E3F9',
-            6 => '#e1711d',  # orange
+            6 => '#e1711d', # orange
             7 => '#ffc04c',
             8 => '#FDFF98', # yellow
             9 => '#5555FF',
             10 => '#55FFFF',
-            11 => '#0000C0',  #
-            12 => '#008800',  # green
+            11 => '#0000C0', #
+            12 => '#008800', # green
             13 => '#00C0C0',
-            14 => '#FFAFAF',  # rosé
-            15 => '#808080',  # gray
+            14 => '#FFAFAF', # rosé
+            15 => '#808080', # gray
             16 => '#00C000',
             17 => '#404040',
-            18 => '#C0C000',  # green
+            18 => '#C0C000', # green
             19 => '#C000C0',
-            100 => '#75A3D1',  # blue
-            101 => '#A679D2',  # purple
+            100 => '#75A3D1', # blue
+            101 => '#A679D2', # purple
             102 => '#660000',
             103 => '#000066',
-            104 => '#FAFFAF',  # caramel
+            104 => '#FAFFAF', # caramel
             105 => '#408345',
             106 => '#5c8d20',
-            107 => '#e1711d',  # red
-            108 => '#94ef2b',  # light green
-            109 => '#756a4a',  # brown
+            107 => '#e1711d', # red
+            108 => '#94ef2b', # light green
+            109 => '#756a4a', # brown
             110 => '#6f1dab',
             111 => '#301e30',
             112 => '#5c9d96',
-            113 => '#a8cd8c',  # earth green
-            114 => '#f2b3f1',  # light purple
+            113 => '#a8cd8c', # earth green
+            114 => '#f2b3f1', # light purple
             115 => '#9b5828',
             118 => '#99FFFF',
             119 => '#99BBFF',
@@ -223,8 +223,8 @@ 
             446 => '#06DCFB',
             447 => '#892EE4',
             460 => '#99FF66',
-            461 => '#99CC66',  # green
-            470 => '#CCCC33',  # ocker
+            461 => '#99CC66', # green
+            470 => '#CCCC33', # ocker
             471 => '#CCFF33',
             480 => '#6699FF',
             481 => '#66FFFF',
@@ -239,18 +239,18 @@ 
             1198 => '#FF34B3',
             1199 => '#8B1C62',
 
-            '#61a9f3',# blue
-            '#f381b9',# pink
+            '#61a9f3', # blue
+            '#f381b9', # pink
             '#61E3A9',
             '#D56DE2',
             '#85eD82',
             '#F7b7b7',
             '#CFDF49',
             '#88d8f2',
-            '#07AF7B',# green
+            '#07AF7B', # green
             '#B9E3F9',
             '#FFF3AD',
-            '#EF606A',# red
+            '#EF606A', # red
             '#EC8833',
             '#FFF100',
             '#87C9A5',
@@ -400,8 +400,8 @@ 
     public function getFilters()
     {
         return [
-            new \Twig_SimpleFilter('capitalize_first', [ $this, 'capitalizeFirst' ]),
-            new \Twig_SimpleFilter('percent_format', [ $this, 'percentFormat' ]),
+            new \Twig_SimpleFilter('capitalize_first', [$this, 'capitalizeFirst']),
+            new \Twig_SimpleFilter('percent_format', [$this, 'percentFormat']),
         ];
     }
 
@@ -428,9 +428,9 @@ 
         if (!$denominator) {
             $quotient = $numerator;
         } else {
-            $quotient = ( $numerator / $denominator ) * 100;
+            $quotient = ($numerator / $denominator) * 100;
         }
 
-        return round($quotient, $precision) . '%';
+        return round($quotient, $precision).'%';
     }
 }

src/Xtools/EditCounter.php

Spacing +11 added lines, -11 removed lines

@@ -40,7 +40,7 @@ 
      */
     protected function getRevisionCounts()
     {
-        if (! is_array($this->revisionCounts)) {
+        if (!is_array($this->revisionCounts)) {
             $this->revisionCounts = $this->getRepository()
                 ->getRevisionCounts($this->project, $this->user);
         }
@@ -53,7 +53,7 @@ 
      */
     protected function getRevisionDates()
     {
-        if (! is_array($this->revisionDates)) {
+        if (!is_array($this->revisionDates)) {
             $this->revisionDates = $this->getRepository()
                 ->getRevisionDates($this->project, $this->user);
         }
@@ -66,7 +66,7 @@ 
      */
     protected function getPageCounts()
     {
-        if (! is_array($this->pageCounts)) {
+        if (!is_array($this->pageCounts)) {
             $this->pageCounts = $this->getRepository()
                 ->getPageCounts($this->project, $this->user);
         }
@@ -79,7 +79,7 @@ 
      */
     protected function getLogCounts()
     {
-        if (! is_array($this->logCounts)) {
+        if (!is_array($this->logCounts)) {
             $this->logCounts = $this->getRepository()
                 ->getLogCounts($this->project, $this->user);
         }
@@ -108,7 +108,7 @@ 
      */
     public function countAllRevisions()
     {
-        return $this->countLiveRevisions() + $this->countDeletedRevisions();
+        return $this->countLiveRevisions()+$this->countDeletedRevisions();
     }
 
     /**
@@ -127,7 +127,7 @@ 
      */
     public function countRevisionsWithoutComments()
     {
-        return $this->countAllRevisions() - $this->countRevisionsWithComments();
+        return $this->countAllRevisions()-$this->countRevisionsWithComments();
     }
 
     /**
@@ -180,7 +180,7 @@ 
      */
     public function countAllPagesEdited()
     {
-        return $this->countLivePagesEdited() + $this->countDeletedPagesEdited();
+        return $this->countLivePagesEdited()+$this->countDeletedPagesEdited();
     }
 
     /**
@@ -198,7 +198,7 @@ 
      */
     public function countPagesCreated()
     {
-        return $this->countCreatedPagesLive() + $this->countPagesCreatedDeleted();
+        return $this->countCreatedPagesLive()+$this->countPagesCreatedDeleted();
     }
 
     /**
@@ -328,9 +328,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;
     }

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace Xtools;
 
 use \DateTime;
-use Symfony\Component\VarDumper\VarDumper;
 
 /**
  * An EditCounter provides statistics about a user's edits on a project.

src/Xtools/EditCounterRepository.php

Spacing +44 added lines, -44 removed lines

@@ -16,7 +16,7 @@ 
     public function getRevisionCounts(Project $project, User $user)
     {
         // Set up cache.
-        $cacheKey = 'revisioncounts.' . $project->getDatabaseName() . '.' . $user->getUsername();
+        $cacheKey = 'revisioncounts.'.$project->getDatabaseName().'.'.$user->getUsername();
         if ($this->cache->hasItem($cacheKey)) {
             return $this->cache->getItem($cacheKey)->get();
         }
@@ -77,7 +77,7 @@ 
     public function getRevisionDates(Project $project, User $user)
     {
         // Set up cache.
-        $cacheKey = 'revisiondates.' . $project->getDatabaseName() . '.' . $user->getUsername();
+        $cacheKey = 'revisiondates.'.$project->getDatabaseName().'.'.$user->getUsername();
         if ($this->cache->hasItem($cacheKey)) {
             return $this->cache->getItem($cacheKey)->get();
         }
@@ -149,10 +149,10 @@ 
         $results = $resultQuery->fetchAll();
 
         $pageCounts = array_combine(
-            array_map(function ($e) {
+            array_map(function($e) {
                 return $e['source'];
             }, $results),
-            array_map(function ($e) {
+            array_map(function($e) {
                 return $e['value'];
             }, $results)
         );
@@ -183,7 +183,7 @@ 
 
         // Query.
         $sql = "SELECT CONCAT(log_type, '-', log_action) AS source, COUNT(log_id) AS value
-            FROM " . $this->getTableName($project->getDatabaseName(), 'logging') . "
+            FROM " . $this->getTableName($project->getDatabaseName(), 'logging')."
             WHERE log_user = :userId
             GROUP BY log_type, log_action";
         $resultQuery = $this->getProjectsConnection()->prepare($sql);
@@ -192,10 +192,10 @@ 
         $resultQuery->execute();
         $results = $resultQuery->fetchAll();
         $logCounts = array_combine(
-            array_map(function ($e) {
+            array_map(function($e) {
                 return $e['source'];
             }, $results),
-            array_map(function ($e) {
+            array_map(function($e) {
                 return $e['value'];
             }, $results)
         );
@@ -285,7 +285,7 @@ 
     public function getTopProjectsEditCounts($projectUrl, $username, $numProjects = 10)
     {
         $this->debug("Getting top project edit counts for $username");
-        $cacheKey = 'topprojectseditcounts.' . $username;
+        $cacheKey = 'topprojectseditcounts.'.$username;
         if ($this->cacheHas($cacheKey)) {
             return $this->cacheGet($cacheKey);
         }
@@ -297,7 +297,7 @@ 
         if (false === $topEditCounts) {
             // If no CentralAuth, fall back to querying each database in turn.
             foreach ($this->labsHelper->getProjectsInfo() as $project) {
-                $this->container->get('logger')->debug('Getting edit count for ' . $project['url']);
+                $this->container->get('logger')->debug('Getting edit count for '.$project['url']);
                 $revisionTableName = $this->labsHelper->getTable('revision', $project['dbName']);
                 $sql = "SELECT COUNT(rev_id) FROM $revisionTableName WHERE rev_user_text=:username";
                 $stmt = $this->replicas->prepare($sql);
@@ -307,8 +307,8 @@ 
                 $topEditCounts[$project['dbName']] = array_merge($project, ['total' => $total]);
             }
         }
-        uasort($topEditCounts, function ($a, $b) {
-            return $b['total'] - $a['total'];
+        uasort($topEditCounts, function($a, $b) {
+            return $b['total']-$a['total'];
         });
         $out = array_slice($topEditCounts, 0, $numProjects);
 
@@ -327,16 +327,16 @@ 
     {
         $userId = $this->getUserId($username);
         $sql = "SELECT page_namespace, count(rev_id) AS total
-            FROM " . $this->labsHelper->getTable('revision') . " r
-                JOIN " . $this->labsHelper->getTable('page') . " p on r.rev_page = p.page_id
+            FROM " . $this->labsHelper->getTable('revision')." r
+                JOIN " . $this->labsHelper->getTable('page')." p on r.rev_page = p.page_id
             WHERE r.rev_user = :id GROUP BY page_namespace";
         $resultQuery = $this->replicas->prepare($sql);
         $resultQuery->bindParam(":id", $userId);
         $resultQuery->execute();
         $results = $resultQuery->fetchAll();
-        $namespaceTotals = array_combine(array_map(function ($e) {
+        $namespaceTotals = array_combine(array_map(function($e) {
             return $e['page_namespace'];
-        }, $results), array_map(function ($e) {
+        }, $results), array_map(function($e) {
             return $e['total'];
         }, $results));
 
@@ -359,14 +359,14 @@ 
                 $revisions = $this->cacheGet($cacheKey);
             } else {
                 $sql =
-                    "SELECT rev_id, rev_timestamp, UNIX_TIMESTAMP(rev_timestamp) AS unix_timestamp, " .
-                    " rev_minor_edit, rev_deleted, rev_len, rev_parent_id, rev_comment, " .
-                    " page_title, page_namespace " . " FROM " .
-                    $this->labsHelper->getTable('revision', $project['dbName']) . "    JOIN " .
-                    $this->labsHelper->getTable('page', $project['dbName']) .
-                    "    ON (rev_page = page_id)" .
-                    " WHERE rev_timestamp > NOW() - INTERVAL $days DAY AND rev_user_text LIKE :username" .
-                    " ORDER BY rev_timestamp DESC" . " LIMIT 10";
+                    "SELECT rev_id, rev_timestamp, UNIX_TIMESTAMP(rev_timestamp) AS unix_timestamp, ".
+                    " rev_minor_edit, rev_deleted, rev_len, rev_parent_id, rev_comment, ".
+                    " page_title, page_namespace "." FROM ".
+                    $this->labsHelper->getTable('revision', $project['dbName'])."    JOIN ".
+                    $this->labsHelper->getTable('page', $project['dbName']).
+                    "    ON (rev_page = page_id)".
+                    " WHERE rev_timestamp > NOW() - INTERVAL $days DAY AND rev_user_text LIKE :username".
+                    " ORDER BY rev_timestamp DESC"." LIMIT 10";
                 $resultQuery = $this->replicas->prepare($sql);
                 $resultQuery->bindParam(":username", $username);
                 $resultQuery->execute();
@@ -376,7 +376,7 @@ 
             if (count($revisions) === 0) {
                 continue;
             }
-            $revsWithProject = array_map(function (&$item) use ($project) {
+            $revsWithProject = array_map(function(&$item) use ($project) {
                 $item['project_name'] = $project['wikiName'];
                 $item['project_url'] = $project['url'];
                 $item['project_db_name'] = $project['dbName'];
@@ -386,8 +386,8 @@ 
             }, $revisions);
             $allRevisions = array_merge($allRevisions, $revsWithProject);
         }
-        usort($allRevisions, function ($a, $b) {
-            return $b['rev_timestamp'] - $a['rev_timestamp'];
+        usort($allRevisions, function($a, $b) {
+            return $b['rev_timestamp']-$a['rev_timestamp'];
         });
 
         return array_slice($allRevisions, 0, $topN);
@@ -406,12 +406,12 @@ 
         }
 
         $sql =
-            "SELECT " . "     YEAR(rev_timestamp) AS `year`," .
-            "     MONTH(rev_timestamp) AS `month`," . "     page_namespace," .
-            "     COUNT(rev_id) AS `count` " . " FROM " . $this->labsHelper->getTable('revision') .
-            "    JOIN " . $this->labsHelper->getTable('page') . " ON (rev_page = page_id)" .
-            " WHERE rev_user_text = :username" .
-            " GROUP BY YEAR(rev_timestamp), MONTH(rev_timestamp), page_namespace " .
+            "SELECT "."     YEAR(rev_timestamp) AS `year`,".
+            "     MONTH(rev_timestamp) AS `month`,"."     page_namespace,".
+            "     COUNT(rev_id) AS `count` "." FROM ".$this->labsHelper->getTable('revision').
+            "    JOIN ".$this->labsHelper->getTable('page')." ON (rev_page = page_id)".
+            " WHERE rev_user_text = :username".
+            " GROUP BY YEAR(rev_timestamp), MONTH(rev_timestamp), page_namespace ".
             " ORDER BY rev_timestamp DESC";
         $resultQuery = $this->replicas->prepare($sql);
         $resultQuery->bindParam(":username", $username);
@@ -433,14 +433,14 @@ 
             if (!isset($out['totals'][$ns])) {
                 $out['totals'][$ns] = [];
             }
-            $out['totals'][$ns][$total['year'] . $total['month']] = $total['count'];
+            $out['totals'][$ns][$total['year'].$total['month']] = $total['count'];
         }
         // Fill in the blanks (where no edits were made in a given month for a namespace).
         for ($y = $out['min_year']; $y <= $out['max_year']; $y++) {
             for ($m = 1; $m <= 12; $m++) {
                 foreach ($out['totals'] as $nsId => &$total) {
-                    if (!isset($total[$y . $m])) {
-                        $total[$y . $m] = 0;
+                    if (!isset($total[$y.$m])) {
+                        $total[$y.$m] = 0;
                     }
                 }
             }
@@ -463,12 +463,12 @@ 
         }
 
         $sql =
-            "SELECT " . "     SUBSTR(CAST(rev_timestamp AS CHAR(4)), 1, 4) AS `year`," .
-            "     page_namespace," . "     COUNT(rev_id) AS `count` " . " FROM " .
-            $this->labsHelper->getTable('revision') . "    JOIN " .
-            $this->labsHelper->getTable('page') . " ON (rev_page = page_id)" .
-            " WHERE rev_user_text = :username" .
-            " GROUP BY SUBSTR(CAST(rev_timestamp AS CHAR(4)), 1, 4), page_namespace " .
+            "SELECT "."     SUBSTR(CAST(rev_timestamp AS CHAR(4)), 1, 4) AS `year`,".
+            "     page_namespace,"."     COUNT(rev_id) AS `count` "." FROM ".
+            $this->labsHelper->getTable('revision')."    JOIN ".
+            $this->labsHelper->getTable('page')." ON (rev_page = page_id)".
+            " WHERE rev_user_text = :username".
+            " GROUP BY SUBSTR(CAST(rev_timestamp AS CHAR(4)), 1, 4), page_namespace ".
             " ORDER BY rev_timestamp DESC ";
         $resultQuery = $this->replicas->prepare($sql);
         $resultQuery->bindParam(":username", $username);
@@ -507,9 +507,9 @@ 
         $hourInterval = 2;
         $xCalc = "ROUND(HOUR(rev_timestamp)/$hourInterval)*$hourInterval";
         $sql =
-            "SELECT " . "     DAYOFWEEK(rev_timestamp) AS `y`, " . "     $xCalc AS `x`, " .
-            "     COUNT(rev_id) AS `r` " . " FROM " . $this->labsHelper->getTable('revision') .
-            " WHERE rev_user_text = :username" . " GROUP BY DAYOFWEEK(rev_timestamp), $xCalc " .
+            "SELECT "."     DAYOFWEEK(rev_timestamp) AS `y`, "."     $xCalc AS `x`, ".
+            "     COUNT(rev_id) AS `r` "." FROM ".$this->labsHelper->getTable('revision').
+            " WHERE rev_user_text = :username"." GROUP BY DAYOFWEEK(rev_timestamp), $xCalc ".
             " ";
         $resultQuery = $this->replicas->prepare($sql);
         $resultQuery->bindParam(":username", $username);

src/Xtools/UserRepository.php

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,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);
@@ -96,7 +96,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.