x-tools / xtools

web/app_dev.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 // Feel free to remove this, extend it, or make something more sophisticated.
 if (isset($_SERVER['HTTP_CLIENT_IP'])
     || isset($_SERVER['HTTP_X_FORWARDED_FOR'])
-    || !( in_array(@$_SERVER['REMOTE_ADDR'], [ '127.0.0.1', 'fe80::1', '::1' ]) || php_sapi_name() === 'cli-server' )
+    || !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1']) || php_sapi_name() === 'cli-server')
 ) {
     header('HTTP/1.0 403 Forbidden');
     exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');

src/AppBundle/Controller/AdminStatsController.php

Spacing +1 added lines, -1 removed lines

@@ -176,7 +176,7 @@
 
         // Iterate over query results, loading each user id into the array
         while ($row = $res->fetch()) {
-            $adminIdArr[] = $row["user_id"] ;
+            $adminIdArr[] = $row["user_id"];
         }
 
         // Set the query results to be useful in a sql statement.

src/AppBundle/Controller/QuoteController.php

Spacing +2 added lines, -2 removed lines

@@ -111,7 +111,7 @@ 
             'quote/all.html.twig',
             [
                 'base_dir' => realpath(
-                    $this->getParameter('kernel.root_dir') . '/..'
+                    $this->getParameter('kernel.root_dir').'/..'
                 ),
                 'xtPage' => 'bash',
                 'quotes' => $quotes,
@@ -160,7 +160,7 @@ 
             'quote/view.html.twig',
             [
                 'base_dir' => realpath(
-                    $this->getParameter('kernel.root_dir') . '/..'
+                    $this->getParameter('kernel.root_dir').'/..'
                 ),
                 "xtPage" => "bash",
                 "text" => $text,

src/Xtools/ProjectRepository.php

Indentation +3 added lines, -3 removed lines

@@ -251,9 +251,9 @@
         $conn = $this->getProjectsConnection();
         $pageTable = $this->getTableName($project->getDatabaseName(), 'page');
         $query = "SELECT page_id "
-             . " FROM $pageTable "
-             . " WHERE page_namespace = :ns AND page_title = :title AND page_len > 0 "
-             . " LIMIT 1";
+                . " FROM $pageTable "
+                . " WHERE page_namespace = :ns AND page_title = :title AND page_len > 0 "
+                . " LIMIT 1";
         $params = [
             'ns' => $namespaceId,
             'title' => $pageTitle,

Spacing +3 added lines, -3 removed lines

@@ -148,7 +148,7 @@ 
                     || $projMetadata['url'] == "https://$project"
                     || $projMetadata['url'] == "https://$project.org"
                     || $projMetadata['url'] == "https://www.$project") {
-                    $this->log->debug(__METHOD__ . " Using cached data for $project");
+                    $this->log->debug(__METHOD__." Using cached data for $project");
                     return $projMetadata;
                 }
             }
@@ -204,7 +204,7 @@ 
         }
 
         // Redis cache
-        $cacheKey = "projectMetadata." . preg_replace("/[^A-Za-z0-9]/", '', $projectUrl);
+        $cacheKey = "projectMetadata.".preg_replace("/[^A-Za-z0-9]/", '', $projectUrl);
         if ($this->cache->hasItem($cacheKey)) {
             $this->metadata = $this->cache->getItem($cacheKey)->get();
             return $this->metadata;
@@ -284,7 +284,7 @@ 
         $optedIn = $this->container->getParameter('opted_in');
         // In case there's just one given.
         if (!is_array($optedIn)) {
-            $optedIn = [ $optedIn ];
+            $optedIn = [$optedIn];
         }
         return $optedIn;
     }

src/AppBundle/Controller/AdminScoreController.php

Unused Use Statements -1 removed lines

@@ -9,7 +9,6 @@
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use DateTime;
 use Xtools\ProjectRepository;
 use Xtools\UserRepository;

Spacing +19 added lines, -19 removed lines

@@ -47,9 +47,9 @@ 
         $username = $request->query->get('username', $request->query->get('user'));
 
         if ($projectQuery != '' && $username != '') {
-            return $this->redirectToRoute('AdminScoreResult', [ 'project' => $projectQuery, 'username' => $username ]);
+            return $this->redirectToRoute('AdminScoreResult', ['project' => $projectQuery, 'username' => $username]);
         } elseif ($projectQuery != '' && $project === null) {
-            return $this->redirectToRoute('AdminScoreProject', [ 'project' => $projectQuery ]);
+            return $this->redirectToRoute('AdminScoreProject', ['project' => $projectQuery]);
         }
 
         // Set default project so we can populate the namespace selector.
@@ -96,20 +96,20 @@ 
 
         // MULTIPLIERS (to review)
         $multipliers = [
-            'account-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
+            'account-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
             '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 =
-            'pages-created-live-mult' => 1.4,       # 0 if =
-            'pages-created-deleted-mult' => 1.4,    # 0 if =
-            'rpp-mult' => 1.15,                     # 0 if =
-            'user-rights-mult' => 0.75,             # 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-deleted-mult' => 1.4, # 0 if =
+            'rpp-mult' => 1.15, # 0 if =
+            'user-rights-mult' => 0.75, # 0 if =
         ];
 
         // Grab the connection to the replica database (which is separate from the above)
@@ -193,14 +193,14 @@ 
                 $now = new DateTime();
                 $date = new DateTime($value);
                 $diff = $date->diff($now);
-                $formula = 365 * $diff->format("%y") + 30 * $diff->format("%m") + $diff->format("%d");
-                $value = $formula - 365;
+                $formula = 365 * $diff->format("%y")+30 * $diff->format("%m")+$diff->format("%d");
+                $value = $formula-365;
             }
 
             if ($key === "id") {
                 $id = $value;
             } else {
-                $multiplierKey = $row['source'] . '-mult';
+                $multiplierKey = $row['source'].'-mult';
                 $multiplier = isset($multipliers[$multiplierKey]) ? $multipliers[$multiplierKey] : 1;
                 $score = max(min($value * $multiplier, 100), -100);
                 $master[$key]["mult"] = $multiplier;
@@ -211,8 +211,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', [

src/AppBundle/Controller/DefaultController.php

Spacing +2 added lines, -2 removed lines

@@ -90,7 +90,7 @@ 
     public function loginAction()
     {
         try {
-            list( $next, $token ) = $this->getOauthClient()->initiate();
+            list($next, $token) = $this->getOauthClient()->initiate();
         } catch (Exception $oauthException) {
             throw $oauthException;
             // @TODO Make this work.
@@ -155,7 +155,7 @@ 
                     . '/index.php?title=Special:OAuth';
         $conf = new ClientConfig($endpoint);
         $consumerKey = $this->getParameter('oauth_key');
-        $consumerSecret =  $this->getParameter('oauth_secret');
+        $consumerSecret = $this->getParameter('oauth_secret');
         $conf->setConsumer(new Consumer($consumerKey, $consumerSecret));
         $this->oauthClient = new Client($conf);
         // Callback URL is hardcoded in the consumer registration.

src/Xtools/Project.php

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 namespace Xtools;
 
 use Mediawiki\Api\MediawikiApi;
-use Symfony\Component\VarDumper\VarDumper;
 
 /**
  * A Project is a single wiki that XTools is querying.

Doc Comments +1 added lines, -1 removed lines

@@ -200,7 +200,7 @@
     /**
      * Get an array of this project's namespaces and their IDs.
      *
-     * @return string[] Keys are IDs, values are names.
+     * @return string Keys are IDs, values are names.
      */
     public function getNamespaces()
     {

Spacing +8 added lines, -8 removed lines

@@ -117,7 +117,7 @@ 
      */
     public function getUrl($withTrailingSlash = true)
     {
-        return rtrim($this->getBasicInfo()['url'], '/') . ($withTrailingSlash ? '/' : '');
+        return rtrim($this->getBasicInfo()['url'], '/').($withTrailingSlash ? '/' : '');
     }
 
     /**
@@ -174,7 +174,7 @@ 
         $metadata = $this->getMetadata();
         return isset($metadata['general']['script'])
             ? $metadata['general']['script']
-            : $this->getScriptPath() . '/index.php';
+            : $this->getScriptPath().'/index.php';
     }
 
     /**
@@ -184,7 +184,7 @@ 
      */
     public function getApiUrl()
     {
-        return rtrim($this->getUrl(), '/') . $this->getRepository()->getApiPath();
+        return rtrim($this->getUrl(), '/').$this->getRepository()->getApiPath();
     }
 
     /**
@@ -216,7 +216,7 @@ 
      */
     public function userOptInPage(User $user)
     {
-        $localPageName = 'User:' . $user->getUsername() . '/EditCounterOptIn.js';
+        $localPageName = 'User:'.$user->getUsername().'/EditCounterOptIn.js';
         return $localPageName;
     }
 
@@ -250,7 +250,7 @@ 
         }
 
         // 4. Lastly, see if they've opted in globally on the default project or Meta.
-        $globalPageName = $user->getUsername() . '/EditCounterGlobalOptIn.js';
+        $globalPageName = $user->getUsername().'/EditCounterGlobalOptIn.js';
         $globalProject = $this->getRepository()->getGlobalProject();
         if ($globalProject instanceof Project) {
             $globalExists = $globalProject->getRepository()
@@ -269,7 +269,7 @@ 
      */
     public function hasPageAssessments()
     {
-        return (bool) $this->getRepository()->getAssessmentsConfig($this->getDomain());
+        return (bool)$this->getRepository()->getAssessmentsConfig($this->getDomain());
     }
 
     /**
@@ -282,9 +282,9 @@ 
         $config = $this->getRepository()->getAssessmentsConfig($this->getDomain());
 
         if (isset($config['class'][$class])) {
-            return "https://upload.wikimedia.org/wikipedia/commons/" . $config['class'][$class]['badge'];
+            return "https://upload.wikimedia.org/wikipedia/commons/".$config['class'][$class]['badge'];
         } elseif (isset($config['class']['Unknown'])) {
-            return "https://upload.wikimedia.org/wikipedia/commons/" . $config['class']['Unknown']['badge'];
+            return "https://upload.wikimedia.org/wikipedia/commons/".$config['class']['Unknown']['badge'];
         } else {
             return "";
         }

src/AppBundle/Helper/ApiHelper.php

Doc Comments +1 added lines, -1 removed lines

@@ -255,7 +255,7 @@
      * Adapted from https://github.com/MusikAnimal/pageviews
      * @param  array       $params        Associative array of params to pass to API
      * @param  string      $project       Project to query, e.g. en.wikipedia.org
-     * @param  string|func $dataKey       The key for the main chunk of data, in the query hash
+     * @param  string $dataKey       The key for the main chunk of data, in the query hash
      *                                    (e.g. 'categorymembers' for API:Categorymembers).
      *                                    If this is a function it is given the response data,
      *                                    and expected to return the data we want to concatentate.

Spacing +6 added lines, -6 removed lines

@@ -65,7 +65,7 @@ 
     public function groups($project, $username)
     {
         $this->setUp($project);
-        $params = [ "list"=>"users", "ususers"=>$username, "usprop"=>"groups" ];
+        $params = ["list"=>"users", "ususers"=>$username, "usprop"=>"groups"];
         $query = new SimpleRequest('query', $params);
         $result = [];
 
@@ -91,7 +91,7 @@ 
     public function globalGroups($project, $username)
     {
         $this->setUp($project);
-        $params = [ "meta"=>"globaluserinfo", "guiuser"=>$username, "guiprop"=>"groups" ];
+        $params = ["meta"=>"globaluserinfo", "guiuser"=>$username, "guiprop"=>"groups"];
         $query = new SimpleRequest('query', $params);
         $result = [];
 
@@ -141,7 +141,7 @@ 
                 $groups[] = "B";
             }
             if (in_array("steward", $admin["groups"])) {
-                $groups[] = "S" ;
+                $groups[] = "S";
             }
             if (in_array("checkuser", $admin["groups"])) {
                 $groups[] = "CU";
@@ -152,7 +152,7 @@ 
             if (in_array("bot", $admin["groups"])) {
                 $groups[] = "Bot";
             }
-            $result[ $admin["name"] ] = [
+            $result[$admin["name"]] = [
                 "groups" => implode('/', $groups)
             ];
         }
@@ -227,7 +227,7 @@ 
             $normalized = [];
             if (isset($result['query']['normalized'])) {
                 array_map(
-                    function ($e) use (&$normalized) {
+                    function($e) use (&$normalized) {
                         $normalized[$e['to']] = $e['from'];
                     },
                     $result['query']['normalized']
@@ -312,7 +312,7 @@ 
         $query = FluentRequest::factory()->setAction('query')->setParams($requestData);
         $innerPromise = $this->api->getRequestAsync($query);
 
-        $innerPromise->then(function ($result) use (&$data) {
+        $innerPromise->then(function($result) use (&$data) {
             // some failures come back as 200s, so we still resolve and let the outer function handle it
             if (isset($result['error']) || !isset($result['query'])) {
                 return $data['promise']->resolve($data);

src/AppBundle/Controller/SimpleEditCounterController.php

Spacing +7 added lines, -7 removed lines

@@ -48,7 +48,7 @@ 
 
         // If we've got a project and user, redirect to results.
         if ($projectName != '' && $username != '') {
-            $routeParams = [ 'project' => $projectName, 'username' => $username ];
+            $routeParams = ['project' => $projectName, 'username' => $username];
             return $this->redirectToRoute('SimpleEditCounterResult', $routeParams);
         }
 
@@ -120,8 +120,8 @@ 
         $resultQuery->execute();
 
         if ($resultQuery->errorCode() > 0) {
-            $this->addFlash('notice', [ 'no-result', $username ]);
-            return $this->redirectToRoute('SimpleEditCounterProject', [ 'project' => $project->getDomain() ]);
+            $this->addFlash('notice', ['no-result', $username]);
+            return $this->redirectToRoute('SimpleEditCounterProject', ['project' => $project->getDomain()]);
         }
 
         // Fetch the result data
@@ -145,16 +145,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->getDomain() ]);
+            return $this->redirectToRoute('SimpleEditCounterProject', ['project' => $project->getDomain()]);
         }
 
         // Remove the last comma and space
@@ -183,7 +183,7 @@ 
             'project' => $project,
             'id' => $id,
             'arch' => $arch,
-            'rev' => $rev + $arch,
+            'rev' => $rev+$arch,
             'live' => $rev,
             'groups' => $groups,
             'globalGroups' => $globalGroups,