x-tools / xtools

src/Xtools/EditCounter.php

Spacing +16 added lines, -16 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);
@@ -457,14 +457,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;
                     }
                 }
             }

src/AppBundle/Controller/AdminScoreController.php

Spacing +16 added lines, -16 removed lines

@@ -27,9 +27,9 @@ 
         $username = $request->query->get('username');
 
         if ($projectQuery != "" && $username != "") {
-            return $this->redirectToRoute("AdminScoreResult", [ 'project'=>$projectQuery, 'username' => $username ]);
+            return $this->redirectToRoute("AdminScoreResult", ['project'=>$projectQuery, 'username' => $username]);
         } elseif ($projectQuery != "") {
-            return $this->redirectToRoute("AdminScoreProject", [ 'project'=>$projectQuery ]);
+            return $this->redirectToRoute("AdminScoreProject", ['project'=>$projectQuery]);
         }
 
         // Otherwise fall through.
@@ -67,20 +67,20 @@ 
         $archiveTable = $lh->getTable("archive", $dbName);
 
         // MULTIPLIERS (to review)
-        $ACCT_AGE_MULT = 1.25;   # 0 if = 365 jours
-        $EDIT_COUNT_MULT = 1.25;     # 0 if = 10 000
-        $USER_PAGE_MULT = 0.1;     # 0 if =
+        $ACCT_AGE_MULT = 1.25; # 0 if = 365 jours
+        $EDIT_COUNT_MULT = 1.25; # 0 if = 10 000
+        $USER_PAGE_MULT = 0.1; # 0 if =
         $PATROLS_MULT = 1; # 0 if =
-        $BLOCKS_MULT = 1.4;     # 0 if = 10
+        $BLOCKS_MULT = 1.4; # 0 if = 10
         $AFD_MULT = 1.15;
-        $RECENT_ACTIVITY_MULT = 0.9;     # 0 if =
+        $RECENT_ACTIVITY_MULT = 0.9; # 0 if =
         $AIV_MULT = 1.15;
-        $EDIT_SUMMARIES_MULT = 0.8;   # 0 if =
-        $NAMESPACES_MULT = 1.0;     # 0 if =
+        $EDIT_SUMMARIES_MULT = 0.8; # 0 if =
+        $NAMESPACES_MULT = 1.0; # 0 if =
         $PAGES_CREATED_LIVE_MULT = 1.4; # 0 if =
         $PAGES_CREATED_ARCHIVE_MULT = 1.4; # 0 if =
-        $RPP_MULT = 1.15;     # 0 if =
-        $USERRIGHTS_MULT = 0.75;   # 0 if =
+        $RPP_MULT = 1.15; # 0 if =
+        $USERRIGHTS_MULT = 0.75; # 0 if =
 
         // Grab the connection to the replica database (which is separate from the above)
         $conn = $this->get('doctrine')->getManager("replicas")->getConnection();
@@ -156,15 +156,15 @@ 
                 $now = new DateTime();
                 $date = new DateTime($value);
                 $diff = $date->diff($now);
-                $formula = 365*$diff->format("%y")+30*$diff->format("%m")+$diff->format("%d");
+                $formula = 365 * $diff->format("%y")+30 * $diff->format("%m")+$diff->format("%d");
                 $value = $formula-365;
             }
 
             if ($key == "id") {
                 $id = $value;
             } else {
-                $multiplierKey = strtoupper($row["source"] . "_MULT");
-                $multiplier = ( isset($$multiplierKey) ? $$multiplierKey : 1 );
+                $multiplierKey = strtoupper($row["source"]."_MULT");
+                $multiplier = (isset($$multiplierKey) ? $$multiplierKey : 1);
                 $score = max(min($value * $multiplier, 100), -100);
                 $master[$key]["mult"] = $multiplier;
                 $master[$key]["value"] = $value;
@@ -174,8 +174,8 @@ 
         }
 
         if ($id == 0) {
-            $this->addFlash("notice", [ "no-result", $username ]);
-            return $this->redirectToRoute("AdminScore", [ "project"=>$project ]);
+            $this->addFlash("notice", ["no-result", $username]);
+            return $this->redirectToRoute("AdminScore", ["project"=>$project]);
         }
 
         return $this->render('adminscore/result.html.twig', [

Unused Use Statements -1 removed lines

@@ -5,7 +5,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 DateTime;
 use Xtools\ProjectRepository;
 

src/AppBundle/Controller/SimpleEditCounterController.php

Spacing +8 added lines, -8 removed lines

@@ -31,10 +31,10 @@ 
         $username = $request->query->get('username');
 
         if ($projectQuery != "" && $username != "") {
-            $routeParams = [ 'project'=>$projectQuery, 'username' => $username ];
+            $routeParams = ['project'=>$projectQuery, 'username' => $username];
             return $this->redirectToRoute("SimpleEditCounterResult", $routeParams);
         } elseif ($projectQuery != "") {
-            return $this->redirectToRoute("SimpleEditCounterProject", [ 'project'=>$projectQuery ]);
+            return $this->redirectToRoute("SimpleEditCounterProject", ['project'=>$projectQuery]);
         }
 
         // Otherwise fall through.
@@ -87,8 +87,8 @@ 
         $resultQuery->execute();
 
         if ($resultQuery->errorCode() > 0) {
-            $this->addFlash("notice", [ "no-result", $username ]);
-            return $this->redirectToRoute("SimpleEditCounterProject", [ "project"=>$project ]);
+            $this->addFlash("notice", ["no-result", $username]);
+            return $this->redirectToRoute("SimpleEditCounterProject", ["project"=>$project]);
         }
 
         // Fetch the result data
@@ -112,16 +112,16 @@ 
                 $rev = $row["value"];
             }
             if ($row["source"] == "groups") {
-                $groups .= $row["value"]. ", ";
+                $groups .= $row["value"].", ";
             }
         }
 
         // Unknown user - If the user is created the $results variable will have 3 entries.
         // This is a workaround to detect non-existent IPs.
         if (count($results) < 3 && $arch == 0 && $rev == 0) {
-            $this->addFlash('notice', [ "no-result", $username ]);
+            $this->addFlash('notice', ["no-result", $username]);
 
-            return $this->redirectToRoute("SimpleEditCounterProject", [ "project"=>$project ]);
+            return $this->redirectToRoute("SimpleEditCounterProject", ["project"=>$project]);
         }
 
         // Remove the last comma and space
@@ -151,7 +151,7 @@ 
             'project_url' => $url,
             'id' => $id,
             'arch' => $arch,
-            'rev' => $rev + $arch,
+            'rev' => $rev+$arch,
             'live' => $rev,
             'groups' => $groups,
             'globalGroups' => $globalGroups,

Unused Use Statements -2 removed lines

@@ -4,9 +4,7 @@
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\Config\Definition\Exception\Exception;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Xtools\ProjectRepository;
 
 class SimpleEditCounterController extends Controller

src/AppBundle/Controller/PagesController.php

Unused Use Statements -1 removed lines

@@ -6,7 +6,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;
 
 class PagesController extends Controller

Spacing +4 added lines, -4 removed lines

@@ -57,7 +57,7 @@ 
                 'username' => $username,
             ]);
         } elseif ($projectQuery != "") {
-            return $this->redirectToRoute("PagesProject", [ 'project'=>$projectQuery ]);
+            return $this->redirectToRoute("PagesProject", ['project'=>$projectQuery]);
         }
 
         // set default wiki so we can populate the namespace selector
@@ -183,7 +183,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
@@ -267,8 +267,8 @@ 
         }
 
         if ($total < 1) {
-            $this->addFlash("notice", [ "no-result", $username ]);
-            return $this->redirectToRoute("PagesProject", [ "project"=>$project ]);
+            $this->addFlash("notice", ["no-result", $username]);
+            return $this->redirectToRoute("PagesProject", ["project"=>$project]);
         }
 
         ksort($pagesByNamespaceByDate);

src/AppBundle/Helper/LabsHelper.php

Unused Use Statements -2 removed lines

@@ -2,10 +2,8 @@
 
 namespace AppBundle\Helper;
 
-use Symfony\Component\Config\Definition\Exception\Exception;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\VarDumper\VarDumper;
 
 class LabsHelper
 {

Spacing +3 added lines, -3 removed lines

@@ -78,7 +78,7 @@ 
         // Create the query we're going to run against the meta database
         $wikiQuery = $this->client->createQueryBuilder();
         $wikiQuery
-            ->select([ 'dbname', 'name', 'url', 'lang' ])
+            ->select(['dbname', 'name', 'url', 'lang'])
             ->from('wiki')
             ->where($wikiQuery->expr()->eq('dbname', ':project'))
             // The meta database will have the project's URL stored as https://en.wikipedia.org
@@ -129,7 +129,7 @@ 
     public function allProjects()
     {
         $wikiQuery = $this->client->createQueryBuilder();
-        $wikiQuery->select([ 'dbName', 'name', 'url' ])->from('wiki');
+        $wikiQuery->select(['dbName', 'name', 'url'])->from('wiki');
         $stmt = $wikiQuery->execute();
         $out = $stmt->fetchAll();
         return $out;
@@ -152,7 +152,7 @@ 
         // as required by Labs.  We combine $table with
         // $table_extension in order to generate the new table name
         if ($this->isLabs() && $table_extension !== null) {
-            $table = $table . "_" . $table_extension;
+            $table = $table."_".$table_extension;
         }
 
         // Use the table specified in the table mapping configuration, if present.

src/Xtools/EditCounterRepository.php

Doc Comments +1 added lines, -5 removed lines

@@ -250,7 +250,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.
      */
@@ -300,7 +299,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(
@@ -395,7 +394,6 @@ 
 
     /**
      * Get this user's most recent 10 edits across all projects.
-     * @param string $username The username.
      * @param integer $topN The number of items to return.
      * @param integer $days The number of days to search from each wiki.
      * @return string[]
@@ -453,7 +451,6 @@ 
 
     /**
      * Get data for a bar chart of monthly edit totals per namespace.
-     * @param string $username The username.
      * @return string[]
      */
     public function getMonthCounts(Project $project, User $user)
@@ -489,7 +486,6 @@ 
 
     /**
      * Get yearly edit totals for this user, grouped by namespace.
-     * @param string $username
      * @return string[] ['<namespace>' => ['<year>' => 'total', ... ], ... ]
      */
     public function getYearCounts(Project $project, User $user)

Spacing +25 added lines, -25 removed lines

@@ -18,7 +18,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();
         }
@@ -79,7 +79,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();
         }
@@ -151,10 +151,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)
         );
@@ -185,7 +185,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);
@@ -194,10 +194,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)
         );
@@ -346,9 +346,9 @@ 
         $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));
         return $namespaceTotals;
@@ -412,14 +412,14 @@ 
                 $revisions = $this->cache->getItem($cacheKey)->get();
             } 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->getTableName($project['dbname'], 'revision') . "    JOIN " .
-                    $this->getTableName($project['dbname'], 'page') .
-                    "    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->getTableName($project['dbname'], 'revision')."    JOIN ".
+                    $this->getTableName($project['dbname'], 'page').
+                    "    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->getProjectsConnection()->prepare($sql);
                 $resultQuery->bindParam(":username", $username);
                 $resultQuery->execute();
@@ -434,7 +434,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'];
@@ -444,8 +444,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);
@@ -467,12 +467,12 @@ 
         $revisionTable = $this->getTableName($project->getDatabaseName(), 'revision');
         $pageTable = $this->getTableName($project->getDatabaseName(), 'page');
         $sql =
-            "SELECT " . "     YEAR(rev_timestamp) AS `year`," .
-            "     MONTH(rev_timestamp) AS `month`," . "     page_namespace," .
+            "SELECT "."     YEAR(rev_timestamp) AS `year`,".
+            "     MONTH(rev_timestamp) AS `month`,"."     page_namespace,".
             "     COUNT(rev_id) AS `count` "
-            . " FROM $revisionTable    JOIN $pageTable ON (rev_page = page_id)" .
-            " WHERE rev_user_text = :username" .
-            " GROUP BY YEAR(rev_timestamp), MONTH(rev_timestamp), page_namespace " .
+            . " FROM $revisionTable    JOIN $pageTable 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->getProjectsConnection()->prepare($sql);
         $resultQuery->bindParam(":username", $username);

tests/AppBundle/Controller/ApiControllerTest.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
             $this->assertEquals(200, $client->getResponse()->getStatusCode());
 
             // Check that a correct namespace value was returned
-            $namespaces = (array) json_decode($client->getResponse()->getContent());
+            $namespaces = (array)json_decode($client->getResponse()->getContent());
             $this->assertEquals('Utilisateur', array_values($namespaces)[2]); // User in French
         }
     }

app/autoload.php

Spacing +1 added lines, -1 removed lines

@@ -8,6 +8,6 @@
  */
 $loader = require __DIR__.'/../vendor/autoload.php';
 
-AnnotationRegistry::registerLoader([ $loader, 'loadClass' ]);
+AnnotationRegistry::registerLoader([$loader, 'loadClass']);
 
 return $loader;

app/AppKernel.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
             new AppBundle\AppBundle(),
         ];
 
-        if (in_array($this->getEnvironment(), [ 'dev', 'test' ], true)) {
+        if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
             $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
             $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
             $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();