x-tools / xtools

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,

src/AppBundle/Helper/AutomatedEditsHelper.php

Spacing +8 added lines, -8 removed lines

@@ -143,12 +143,12 @@ 
         }
 
         // Get diff sizes, based on length of each parent revision
-        $parentRevIds = array_map(function ($edit) {
+        $parentRevIds = array_map(function($edit) {
             return $edit['rev_parent_id'];
         }, $editData);
         $query = "SELECT rev_len, rev_id
                   FROM revision
-                  WHERE rev_id IN (" . implode(',', $parentRevIds) . ")";
+                  WHERE rev_id IN (" . implode(',', $parentRevIds).")";
         $diffSizeData = $conn->executeQuery($query)->fetchAll();
 
         // reformat with rev_id as the key, rev_len as the value
@@ -158,24 +158,24 @@ 
         }
 
         // Build our array of nonautomated edits
-        $editData = array_map(function ($edit) use ($namespaces, $diffSizes) {
+        $editData = array_map(function($edit) use ($namespaces, $diffSizes) {
             $pageTitle = $edit['page_title'];
 
             if ($edit['page_namespace'] !== '0') {
-                $pageTitle = $namespaces[$edit['page_namespace']] . ":$pageTitle";
+                $pageTitle = $namespaces[$edit['page_namespace']].":$pageTitle";
             }
 
             $diffSize = $edit['rev_len'];
             if ($edit['rev_parent_id'] > 0) {
-                $diffSize = $edit['rev_len'] - $diffSizes[$edit['rev_parent_id']];
+                $diffSize = $edit['rev_len']-$diffSizes[$edit['rev_parent_id']];
             }
 
             return [
                 'page_title' => $pageTitle,
-                'namespace' => (int) $edit['page_namespace'],
-                'rev_id' => (int) $edit['rev_id'],
+                'namespace' => (int)$edit['page_namespace'],
+                'rev_id' => (int)$edit['rev_id'],
                 'timestamp' => DateTime::createFromFormat('YmdHis', $edit['rev_timestamp']),
-                'minor_edit' => (bool) $edit['rev_minor_edit'],
+                'minor_edit' => (bool)$edit['rev_minor_edit'],
                 'summary' => $edit['rev_comment'],
                 'size' => $diffSize
             ];

src/Xtools/EditCounterRepository.php

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();