x-tools / xtools

src/Xtools/EditCounterRepository.php

Doc Comments +1 added lines, -2 removed lines

@@ -248,7 +248,6 @@ 
      * Get a user's total edit count on one or more project.
      * Requires the CentralAuth extension to be installed on the project.
      *
-     * @param string $username The username.
      * @param Project $project The project to start from.
      * @return mixed[]|boolean Array of total edit counts, or false if none could be found.
      */
@@ -295,7 +294,7 @@ 
 
     /**
      * Get total edit counts for the top 10 projects for this user.
-     * @param string $username The username.
+     * @param string $stopwatchName
      * @return string[] Elements are arrays with 'dbName', 'url', 'name', and 'total'.
      */
     protected function getRevisionCountsAllProjectsNoCentralAuth(

Spacing +40 added lines, -40 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)
         );
@@ -331,16 +331,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));
 
@@ -363,14 +363,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();
@@ -380,7 +380,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'];
@@ -390,8 +390,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);
@@ -410,12 +410,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);
@@ -437,14 +437,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;
                     }
                 }
             }
@@ -467,12 +467,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);
@@ -511,9 +511,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/EditCounter.php

Spacing +13 added lines, -13 removed lines

@@ -41,7 +41,7 @@ 
      */
     protected function getRevisionCounts()
     {
-        if (! is_array($this->revisionCounts)) {
+        if (!is_array($this->revisionCounts)) {
             $this->revisionCounts = $this->getRepository()
                 ->getRevisionCounts($this->project, $this->user);
         }
@@ -54,7 +54,7 @@ 
      */
     protected function getRevisionDates()
     {
-        if (! is_array($this->revisionDates)) {
+        if (!is_array($this->revisionDates)) {
             $this->revisionDates = $this->getRepository()
                 ->getRevisionDates($this->project, $this->user);
         }
@@ -67,7 +67,7 @@ 
      */
     protected function getPageCounts()
     {
-        if (! is_array($this->pageCounts)) {
+        if (!is_array($this->pageCounts)) {
             $this->pageCounts = $this->getRepository()
                 ->getPageCounts($this->project, $this->user);
         }
@@ -80,7 +80,7 @@ 
      */
     protected function getLogCounts()
     {
-        if (! is_array($this->logCounts)) {
+        if (!is_array($this->logCounts)) {
             $this->logCounts = $this->getRepository()
                 ->getLogCounts($this->project, $this->user);
         }
@@ -109,7 +109,7 @@ 
      */
     public function countAllRevisions()
     {
-        return $this->countLiveRevisions() + $this->countDeletedRevisions();
+        return $this->countLiveRevisions()+$this->countDeletedRevisions();
     }
 
     /**
@@ -128,7 +128,7 @@ 
      */
     public function countRevisionsWithoutComments()
     {
-        return $this->countAllRevisions() - $this->countRevisionsWithComments();
+        return $this->countAllRevisions()-$this->countRevisionsWithComments();
     }
 
     /**
@@ -195,7 +195,7 @@ 
      */
     public function countAllPagesEdited()
     {
-        return $this->countLivePagesEdited() + $this->countDeletedPagesEdited();
+        return $this->countLivePagesEdited()+$this->countDeletedPagesEdited();
     }
 
     /**
@@ -213,7 +213,7 @@ 
      */
     public function countPagesCreated()
     {
-        return $this->countCreatedPagesLive() + $this->countPagesCreatedDeleted();
+        return $this->countCreatedPagesLive()+$this->countPagesCreatedDeleted();
     }
 
     /**
@@ -359,9 +359,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;
     }
@@ -387,8 +387,8 @@ 
         // Get counts.
         $editCounts = $this->getRepository()->getRevisionCountsAllProjects($user, $project);
         // Sort.
-        uasort($editCounts, function ($a, $b) {
-            return $b['total'] - $a['total'];
+        uasort($editCounts, function($a, $b) {
+            return $b['total']-$a['total'];
         });
         // Truncate, and return.
         return array_slice($editCounts, 0, $numProjects);