x-tools / xtools

src/Xtools/UserRepository.php

Spacing +5 added lines, -5 removed lines

@@ -75,7 +75,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);
@@ -110,7 +110,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.
@@ -153,8 +153,8 @@ 
     {
         $username = $user->getUsername();
 
-        $cacheKey = 'pages.' . $project->getDatabaseName() . '.'
-            . $username . '.' . $namespace . '.' . $redirects;
+        $cacheKey = 'pages.'.$project->getDatabaseName().'.'
+            . $username.'.'.$namespace.'.'.$redirects;
         if ($this->cache->hasItem($cacheKey)) {
             return $this->cache->getItem($cacheKey)->get();
         }
@@ -212,7 +212,7 @@ 
             JOIN $revisionTable ON page_id = rev_page
             $paJoin
             WHERE $whereRev AND rev_parent_id = '0' $namespaceConditionRev $redirectCondition
-            " . ($hasPageAssessments ? 'GROUP BY rev_page' : '') . "
+            ".($hasPageAssessments ? 'GROUP BY rev_page' : '')."
             )
 
             UNION

src/Xtools/Page.php

Doc Comments +5 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()
     {
@@ -378,7 +378,6 @@ 
 
     /**
      * Get all wikidata items for the page, not just languages of sister projects
-     * @param Page $page
      * @return int Number of records.
      */
     public function getWikidataItems()
@@ -388,7 +387,6 @@ 
 
     /**
      * Count wikidata items for the page, not just languages of sister projects
-     * @param Page $page
      * @return int Number of records.
      */
     public function countWikidataItems()

Spacing +3 added lines, -3 removed lines

@@ -327,7 +327,7 @@ 
 
         $wikidataInfo = $this->getRepository()->getWikidataInfo($this);
 
-        $terms = array_map(function ($entry) {
+        $terms = array_map(function($entry) {
             return $entry['term'];
         }, $wikidataInfo);
 
@@ -338,7 +338,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>",
             ];
         }
@@ -348,7 +348,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>",
             ];
         }

src/AppBundle/Controller/ArticleInfoController.php

Spacing +21 added lines, -21 removed lines

@@ -83,9 +83,9 @@ 
         $article = $request->query->get('article');
 
         if ($projectQuery != '' && $article != '') {
-            return $this->redirectToRoute('ArticleInfoResult', [ 'project'=>$projectQuery, 'article' => $article ]);
+            return $this->redirectToRoute('ArticleInfoResult', ['project'=>$projectQuery, 'article' => $article]);
         } elseif ($article != '') {
-            return $this->redirectToRoute('ArticleInfoProject', [ 'project'=>$projectQuery ]);
+            return $this->redirectToRoute('ArticleInfoProject', ['project'=>$projectQuery]);
         }
 
         if ($projectQuery == '') {
@@ -149,7 +149,7 @@ 
         $this->pageInfo['firstEdit'] = new Edit($this->pageInfo['page'], $this->pageHistory[0]);
         $this->pageInfo['lastEdit'] = new Edit(
             $this->pageInfo['page'],
-            $this->pageHistory[$page->getNumRevisions() - 1]
+            $this->pageHistory[$page->getNumRevisions()-1]
         );
 
         // NOTE: bots are fetched first in case we want to restrict some stats to humans editors only
@@ -198,10 +198,10 @@ 
         $userGroupsTable = $this->projectRepo->getTableName($this->dbName, 'user_groups');
         $userFromerGroupsTable = $this->projectRepo->getTableName($this->dbName, 'user_former_groups');
         $query = "SELECT COUNT(rev_user_text) AS count, rev_user_text AS username, ug_group AS current
-                  FROM " . $this->projectRepo->getTableName($this->dbName, 'revision') . "
+                  FROM " . $this->projectRepo->getTableName($this->dbName, 'revision')."
                   LEFT JOIN $userGroupsTable ON rev_user = ug_user
                   LEFT JOIN $userFromerGroupsTable ON rev_user = ufg_user
-                  WHERE rev_page = " . $this->pageInfo['page']->getId() . " AND (ug_group = 'bot' OR ufg_group = 'bot')
+                  WHERE rev_page = ".$this->pageInfo['page']->getId()." AND (ug_group = 'bot' OR ufg_group = 'bot')
                   GROUP BY rev_user_text";
         $res = $this->conn->query($query)->fetchAll();
 
@@ -210,14 +210,14 @@ 
         $sum = 0;
         foreach ($res as $bot) {
             $bots[$bot['username']] = [
-                'count' => (int) $bot['count'],
+                'count' => (int)$bot['count'],
                 'current' => $bot['current'] === 'bot'
             ];
             $sum += $bot['count'];
         }
 
-        uasort($bots, function ($a, $b) {
-            return $b['count'] - $a['count'];
+        uasort($bots, function($a, $b) {
+            return $b['count']-$a['count'];
         });
 
         $this->pageInfo['general']['bot_revision_count'] = $sum;
@@ -265,10 +265,10 @@ 
 
             if ($info['all'] > 1) {
                 // Number of seconds between first and last edit
-                $secs = intval(strtotime($info['last']) - strtotime($info['first']) / $info['all']);
+                $secs = intval(strtotime($info['last'])-strtotime($info['first']) / $info['all']);
 
                 // Average time between edits (in days)
-                $this->pageInfo['editors'][$editor]['atbe'] = $secs / ( 60 * 60 * 24 );
+                $this->pageInfo['editors'][$editor]['atbe'] = $secs / (60 * 60 * 24);
             }
 
             if (count($info['sizes'])) {
@@ -283,7 +283,7 @@ 
 
         // First sort editors array by the amount of text they added
         $topTenEditorsByAdded = $this->pageInfo['editors'];
-        uasort($topTenEditorsByAdded, function ($a, $b) {
+        uasort($topTenEditorsByAdded, function($a, $b) {
             if ($a['added'] === $b['added']) {
                 return 0;
             }
@@ -292,7 +292,7 @@ 
 
         // Then build a new array of top 10 editors by added text,
         //   in the data structure needed for the chart
-        $this->pageInfo['topTenEditorsByAdded'] = array_map(function ($editor) {
+        $this->pageInfo['topTenEditorsByAdded'] = array_map(function($editor) {
             $added = $this->pageInfo['editors'][$editor]['added'];
             return [
                 'label' => $editor,
@@ -339,7 +339,7 @@ 
 
         // Transform to associative array by 'type'
         foreach ($res as $row) {
-            $data[$row['type'] . '_count'] = $row['value'];
+            $data[$row['type'].'_count'] = $row['value'];
         }
 
         return $data;
@@ -355,7 +355,7 @@ 
         $title = str_replace(' ', '_', $this->pageInfo['page']->getTitle());
         $query = "SELECT log_action, log_type, log_timestamp AS timestamp
                   FROM $loggingTable
-                  WHERE log_namespace = '" . $this->pageInfo['page']->getNamespace() . "'
+                  WHERE log_namespace = '".$this->pageInfo['page']->getNamespace()."'
                   AND log_title = '$title' AND log_timestamp > 1
                   AND log_type IN ('delete', 'move', 'protect', 'stable')";
         $events = $this->conn->query($query)->fetchAll();
@@ -407,14 +407,14 @@ 
             return $rev['length'];
         }
 
-        $lastRev = $this->pageHistory[$revIndex - 1];
+        $lastRev = $this->pageHistory[$revIndex-1];
 
         // TODO: Remove once T101631 is resolved
         // Treat as zero change in size if length of previous edit is missing
         if ($lastRev['length'] === null) {
             return 0;
         } else {
-            return $rev['length'] - $lastRev['length'];
+            return $rev['length']-$lastRev['length'];
         }
     }
 
@@ -434,10 +434,10 @@ 
 
         // Get UNIX timestamp of the first day of the month of the first edit
         // This is used as a comparison when building our array of per-month stats
-        $firstEditMonth = mktime(0, 0, 0, (int) $firstEdit->getMonth(), 1, $firstEdit->getYear());
+        $firstEditMonth = mktime(0, 0, 0, (int)$firstEdit->getMonth(), 1, $firstEdit->getYear());
 
         $lastEdit = $this->pageInfo['lastEdit'];
-        $secondLastEdit = $revisionCount === 1 ? $lastEdit : $this->pageHistory[ $revisionCount - 2 ];
+        $secondLastEdit = $revisionCount === 1 ? $lastEdit : $this->pageHistory[$revisionCount-2];
 
         // Now we can start our master array. This one will be HUGE!
         $data = [
@@ -508,7 +508,7 @@ 
             // Increment year and month counts for all edits
             $data['year_count'][$edit->getYear()]['all']++;
             $data['year_count'][$edit->getYear()]['months'][$edit->getMonth()]['all']++;
-            $data['year_count'][$edit->getYear()]['size'] = (int) $rev['length'];
+            $data['year_count'][$edit->getYear()]['size'] = (int)$rev['length'];
 
             $editsThisMonth = $data['year_count'][$edit->getYear()]['months'][$edit->getMonth()]['all'];
             if ($editsThisMonth > $data['max_edits_per_month']) {
@@ -552,9 +552,9 @@ 
                 }
 
                 // determine if the next revision was a revert
-                $nextRevision = isset($this->pageHistory[$i + 1]) ? $this->pageHistory[$i + 1] : null;
+                $nextRevision = isset($this->pageHistory[$i+1]) ? $this->pageHistory[$i+1] : null;
                 $nextRevisionIsRevert = $nextRevision &&
-                    $this->getDiffSize($i + 1) === -$edit->getSize() &&
+                    $this->getDiffSize($i+1) === -$edit->getSize() &&
                     $this->aeh->isRevert($nextRevision['comment']);
 
                 // don't count this edit as content removal if the next edit reverted it