x-tools / xtools

src/Xtools/ProjectRepository.php

Spacing +3 added lines, -3 removed lines

@@ -146,7 +146,7 @@ 
                 if ($projMetadata['dbName'] == "$project"
                     || $projMetadata['url'] == "$project"
                     || $projMetadata['url'] == "https://$project") {
-                    $this->log->debug(__METHOD__ . " Using cached data for $project");
+                    $this->log->debug(__METHOD__." Using cached data for $project");
                     return $projMetadata;
                 }
             }
@@ -200,7 +200,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;
@@ -280,7 +280,7 @@ 
         $optedIn = $this->container->getParameter('opted_in');
         // In case there's just one given.
         if (!is_array($optedIn)) {
-            $optedIn = [ $optedIn ];
+            $optedIn = [$optedIn];
         }
         return $optedIn;
     }

tests/AppBundle/Controller/ApiControllerTest.php

Spacing +2 added lines, -2 removed lines

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

src/AppBundle/Controller/EditCounterController.php

Spacing +3 added lines, -3 removed lines

@@ -78,10 +78,10 @@ 
         $username = $request->query->get('username', $request->query->get('user'));
 
         if (($project || $queryProject) && $username) {
-            $routeParams = [ 'project'=>($project ?: $queryProject), 'username' => $username ];
+            $routeParams = ['project'=>($project ?: $queryProject), 'username' => $username];
             return $this->redirectToRoute("EditCounterResult", $routeParams);
         } elseif (!$project && $queryProject) {
-            return $this->redirectToRoute("EditCounterProject", [ 'project'=>$queryProject ]);
+            return $this->redirectToRoute("EditCounterProject", ['project'=>$queryProject]);
         }
 
         $project = ProjectRepository::getProject($queryProject, $this->container);
@@ -116,7 +116,7 @@ 
         }
         $isSubRequest = $this->container->get('request_stack')->getParentRequest() !== null;
         return $this->render('editCounter/result.html.twig', [
-            'xtTitle' => $this->user->getUsername() . ' - ' . $this->project->getTitle(),
+            'xtTitle' => $this->user->getUsername().' - '.$this->project->getTitle(),
             'xtPage' => 'ec',
             'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..'),
             'is_sub_request' => $isSubRequest,

src/AppBundle/Twig/AppExtension.php

Spacing +35 added lines, -35 removed lines

@@ -30,32 +30,32 @@ 
     {
         $options = ['is_safe' => ['html']];
         return [
-            new \Twig_SimpleFunction('request_time', [ $this, 'requestTime' ], $options),
-            new \Twig_SimpleFunction('memory_usage', [ $this, 'requestMemory' ], $options),
-            new \Twig_SimpleFunction('year', [ $this, 'generateYear' ], $options),
-            new \Twig_SimpleFunction('msgPrintExists', [ $this, 'intuitionMessagePrintExists' ], $options),
-            new \Twig_SimpleFunction('msgExists', [ $this, 'intuitionMessageExists' ], $options),
-            new \Twig_SimpleFunction('msg', [ $this, 'intuitionMessage' ], $options),
-            new \Twig_SimpleFunction('lang', [ $this, 'getLang' ], $options),
-            new \Twig_SimpleFunction('langName', [ $this, 'getLangName' ], $options),
-            new \Twig_SimpleFunction('allLangs', [ $this, 'getAllLangs' ]),
-            new \Twig_SimpleFunction('isRTL', [ $this, 'intuitionIsRTL' ]),
-            new \Twig_SimpleFunction('isRTLLang', [ $this, 'intuitionIsRTLLang' ]),
-            new \Twig_SimpleFunction('shortHash', [ $this, 'gitShortHash' ]),
-            new \Twig_SimpleFunction('hash', [ $this, 'gitHash' ]),
-            new \Twig_SimpleFunction('enabled', [ $this, 'tabEnabled' ]),
-            new \Twig_SimpleFunction('tools', [ $this, 'allTools' ]),
-            new \Twig_SimpleFunction('color', [ $this, 'getColorList' ]),
-            new \Twig_SimpleFunction('chartColor', [ $this, 'chartColor' ]),
-            new \Twig_SimpleFunction('isWMFLabs', [ $this, 'isWMFLabs' ]),
-            new \Twig_SimpleFunction('isSingleWiki', [ $this, 'isSingleWiki' ]),
-            new \Twig_SimpleFunction('getReplagThreshold', [ $this, 'getReplagThreshold' ]),
-            new \Twig_SimpleFunction('loadStylesheetsFromCDN', [ $this, 'loadStylesheetsFromCDN' ]),
-            new \Twig_SimpleFunction('isWMFLabs', [ $this, 'isWMFLabs' ]),
-            new \Twig_SimpleFunction('replag', [ $this, 'replag' ]),
-            new \Twig_SimpleFunction('link', [ $this, 'link' ]),
-            new \Twig_SimpleFunction('quote', [ $this, 'quote' ]),
-            new \Twig_SimpleFunction('bugReportURL', [ $this, 'bugReportURL' ]),
+            new \Twig_SimpleFunction('request_time', [$this, 'requestTime'], $options),
+            new \Twig_SimpleFunction('memory_usage', [$this, 'requestMemory'], $options),
+            new \Twig_SimpleFunction('year', [$this, 'generateYear'], $options),
+            new \Twig_SimpleFunction('msgPrintExists', [$this, 'intuitionMessagePrintExists'], $options),
+            new \Twig_SimpleFunction('msgExists', [$this, 'intuitionMessageExists'], $options),
+            new \Twig_SimpleFunction('msg', [$this, 'intuitionMessage'], $options),
+            new \Twig_SimpleFunction('lang', [$this, 'getLang'], $options),
+            new \Twig_SimpleFunction('langName', [$this, 'getLangName'], $options),
+            new \Twig_SimpleFunction('allLangs', [$this, 'getAllLangs']),
+            new \Twig_SimpleFunction('isRTL', [$this, 'intuitionIsRTL']),
+            new \Twig_SimpleFunction('isRTLLang', [$this, 'intuitionIsRTLLang']),
+            new \Twig_SimpleFunction('shortHash', [$this, 'gitShortHash']),
+            new \Twig_SimpleFunction('hash', [$this, 'gitHash']),
+            new \Twig_SimpleFunction('enabled', [$this, 'tabEnabled']),
+            new \Twig_SimpleFunction('tools', [$this, 'allTools']),
+            new \Twig_SimpleFunction('color', [$this, 'getColorList']),
+            new \Twig_SimpleFunction('chartColor', [$this, 'chartColor']),
+            new \Twig_SimpleFunction('isWMFLabs', [$this, 'isWMFLabs']),
+            new \Twig_SimpleFunction('isSingleWiki', [$this, 'isSingleWiki']),
+            new \Twig_SimpleFunction('getReplagThreshold', [$this, 'getReplagThreshold']),
+            new \Twig_SimpleFunction('loadStylesheetsFromCDN', [$this, 'loadStylesheetsFromCDN']),
+            new \Twig_SimpleFunction('isWMFLabs', [$this, 'isWMFLabs']),
+            new \Twig_SimpleFunction('replag', [$this, 'replag']),
+            new \Twig_SimpleFunction('link', [$this, 'link']),
+            new \Twig_SimpleFunction('quote', [$this, 'quote']),
+            new \Twig_SimpleFunction('bugReportURL', [$this, 'bugReportURL']),
             new \Twig_SimpleFunction('logged_in_user', [$this, 'functionLoggedInUser']),
             new \Twig_SimpleFunction('isUserAnon', [$this, 'isUserAnon']),
             new \Twig_SimpleFunction('nsName', [$this, 'nsName']),
@@ -69,7 +69,7 @@ 
      */
     public function requestTime($decimals = 3)
     {
-        return number_format(microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'], $decimals);
+        return number_format(microtime(true)-$_SERVER['REQUEST_TIME_FLOAT'], $decimals);
     }
 
     /**
@@ -102,7 +102,7 @@ 
      */
     public function intuitionMessageExists($message = "")
     {
-        return $this->getIntuition()->msgExists($message, [ "domain" => "xtools" ]);
+        return $this->getIntuition()->msgExists($message, ["domain" => "xtools"]);
     }
 
     /**
@@ -133,7 +133,7 @@ 
      */
     public function intuitionMessage($message = "", $vars = [])
     {
-        return $this->getIntuition()->msg($message, [ "domain" => "xtools", "variables" => $vars ]);
+        return $this->getIntuition()->msg($message, ["domain" => "xtools", "variables" => $vars]);
     }
 
     /**
@@ -162,10 +162,10 @@ 
      */
     public function getAllLangs()
     {
-        $messageFiles = glob($this->container->getParameter("kernel.root_dir") . '/../i18n/*.json');
+        $messageFiles = glob($this->container->getParameter("kernel.root_dir").'/../i18n/*.json');
 
         $languages = array_values(array_unique(array_map(
-            function ($filename) {
+            function($filename) {
                 return basename($filename, '.json');
             },
             $messageFiles
@@ -513,8 +513,8 @@ 
     public function getFilters()
     {
         return [
-            new \Twig_SimpleFilter('capitalize_first', [ $this, 'capitalizeFirst' ]),
-            new \Twig_SimpleFilter('percent_format', [ $this, 'percentFormat' ]),
+            new \Twig_SimpleFilter('capitalize_first', [$this, 'capitalizeFirst']),
+            new \Twig_SimpleFilter('percent_format', [$this, 'percentFormat']),
         ];
     }
 
@@ -541,10 +541,10 @@ 
         if (!$denominator) {
             $quotient = $numerator;
         } else {
-            $quotient = ( $numerator / $denominator ) * 100;
+            $quotient = ($numerator / $denominator) * 100;
         }
 
-        return round($quotient, $precision) . '%';
+        return round($quotient, $precision).'%';
     }
 
     /**

src/AppBundle/Controller/PagesController.php

Spacing +3 added lines, -3 removed lines

@@ -78,7 +78,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
@@ -207,8 +207,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/Xtools/Page.php

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 +13 added lines, -13 removed lines

@@ -84,9 +84,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 == '') {
@@ -188,10 +188,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();
 
@@ -200,14 +200,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;
@@ -255,10 +255,10 @@ 
 
             if ($info['all'] > 1) {
                 // Number of seconds between first and last edit
-                $secs = $info['last']->getTimestamp() - $info['first']->getTimestamp();
+                $secs = $info['last']->getTimestamp()-$info['first']->getTimestamp();
 
                 // 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'])) {
@@ -273,7 +273,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;
             }
@@ -282,7 +282,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,
@@ -306,7 +306,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();
@@ -423,7 +423,7 @@ 
 
             if ($revCount === 0) {
                 $firstEdit = $edit;
-                $firstEditMonth = mktime(0, 0, 0, (int) $firstEdit->getMonth(), 1, $firstEdit->getYear());
+                $firstEditMonth = mktime(0, 0, 0, (int)$firstEdit->getMonth(), 1, $firstEdit->getYear());
             }
 
             $username = $edit->getUser()->getUsername();

src/Xtools/PagesRepository.php

Spacing +3 added lines, -3 removed lines

@@ -272,7 +272,7 @@ 
 
         $wikidataId = ltrim($page->getWikidataId(), 'Q');
 
-        $sql = "SELECT " . ($count ? 'COUNT(*) AS count' : '*') . "
+        $sql = "SELECT ".($count ? 'COUNT(*) AS count' : '*')."
                 FROM wikidatawiki_p.wb_items_per_site
                 WHERE ips_item_id = :wikidataId";
 
@@ -282,7 +282,7 @@ 
 
         $result = $resultQuery->fetchAll();
 
-        return $count ? (int) $result[0]['count'] : $result;
+        return $count ? (int)$result[0]['count'] : $result;
     }
 
     /**
@@ -323,7 +323,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;

src/Xtools/Edit.php

Spacing +5 added lines, -5 removed lines

@@ -49,7 +49,7 @@ 
         $this->page = $page;
 
         // Copy over supported attributes
-        $this->id = (int) $attrs['id'];
+        $this->id = (int)$attrs['id'];
         $this->timestamp = DateTime::createFromFormat('YmdHis', $attrs['timestamp']);
         $this->minor = $attrs['minor'] === '1';
 
@@ -196,8 +196,8 @@ 
     public function getDiffUrl()
     {
         $project = $this->getProject();
-        $path = str_replace('$1', 'Special:Diff/' . $this->id, $project->getArticlePath());
-        return rtrim($project->getUrl(), '/') . $path;
+        $path = str_replace('$1', 'Special:Diff/'.$this->id, $project->getArticlePath());
+        return rtrim($project->getUrl(), '/').$path;
     }
 
     /**
@@ -207,8 +207,8 @@ 
     public function getPermaUrl()
     {
         $project = $this->getProject();
-        $path = str_replace('$1', 'Special:PermaLink/' . $this->id, $project->getArticlePath());
-        return rtrim($project->getUrl(), '/') . $path;
+        $path = str_replace('$1', 'Special:PermaLink/'.$this->id, $project->getArticlePath());
+        return rtrim($project->getUrl(), '/').$path;
     }
 
     /**