x-tools / xtools

src/AppBundle/Twig/WikiExtension.php

Spacing +15 added lines, -15 removed lines

@@ -30,7 +30,7 @@ 
      */
     public function intuitionMessage($message = "", $vars = [])
     {
-        return $this->getIntuition()->msg($message, [ "domain" => "xtools", "variables" => $vars ]);
+        return $this->getIntuition()->msg($message, ["domain" => "xtools", "variables" => $vars]);
     }
 
     /*********************************** FUNCTIONS ***********************************/
@@ -41,18 +41,18 @@ 
      */
     public function getFunctions()
     {
-        $options = [ 'is_safe' => [ 'html']];
+        $options = ['is_safe' => ['html']];
         return [
-            new Twig_SimpleFunction('wiki_link', [ $this, 'wikiLink' ], $options),
-            new Twig_SimpleFunction('user_link', [ $this, 'userLink' ], $options),
-            new Twig_SimpleFunction('user_log_link', [ $this, 'userLogLink' ], $options),
-            new Twig_SimpleFunction('group_link', [ $this, 'groupLink' ], $options),
-            new Twig_SimpleFunction('wiki_history_link', [ $this, 'wikiHistoryLink' ], $options),
-            new Twig_SimpleFunction('wiki_log_link', [ $this, 'wikiLogLink' ], $options),
-            new Twig_SimpleFunction('pageviews_links', [ $this, 'pageviewsLinks' ], $options),
-            new Twig_SimpleFunction('diff_link', [ $this, 'diffLink' ], $options),
-            new Twig_SimpleFunction('perma_link', [ $this, 'permaLink' ], $options),
-            new Twig_SimpleFunction('edit_link', [ $this, 'editLink' ], $options),
+            new Twig_SimpleFunction('wiki_link', [$this, 'wikiLink'], $options),
+            new Twig_SimpleFunction('user_link', [$this, 'userLink'], $options),
+            new Twig_SimpleFunction('user_log_link', [$this, 'userLogLink'], $options),
+            new Twig_SimpleFunction('group_link', [$this, 'groupLink'], $options),
+            new Twig_SimpleFunction('wiki_history_link', [$this, 'wikiHistoryLink'], $options),
+            new Twig_SimpleFunction('wiki_log_link', [$this, 'wikiLogLink'], $options),
+            new Twig_SimpleFunction('pageviews_links', [$this, 'pageviewsLinks'], $options),
+            new Twig_SimpleFunction('diff_link', [$this, 'diffLink'], $options),
+            new Twig_SimpleFunction('perma_link', [$this, 'permaLink'], $options),
+            new Twig_SimpleFunction('edit_link', [$this, 'editLink'], $options),
         ];
     }
 
@@ -277,8 +277,8 @@ 
     public function getFilters()
     {
         return [
-            new \Twig_SimpleFilter('diff_format', [ $this, 'diffFormat' ], [ 'is_safe' => [ 'html' ] ]),
-            new \Twig_SimpleFilter('wikify_comment', [ $this, 'wikifyComment' ], [ 'is_safe' => [ 'html' ] ]),
+            new \Twig_SimpleFilter('diff_format', [$this, 'diffFormat'], ['is_safe' => ['html']]),
+            new \Twig_SimpleFilter('wikify_comment', [$this, 'wikifyComment'], ['is_safe' => ['html']]),
         ];
     }
 
@@ -317,7 +317,7 @@ 
         if ($isSection) {
             $sectionTitle = $sectionMatch[1][0];
             $sectionTitleLink = str_replace(' ', '_', $sectionTitle);
-            $sectionWikitext = "<a target='_blank' href='$projectUrl/wiki/$title#$sectionTitleLink'>&rarr;</a>" .
+            $sectionWikitext = "<a target='_blank' href='$projectUrl/wiki/$title#$sectionTitleLink'>&rarr;</a>".
                 "<em class='text-muted'>$sectionTitle:</em> ";
             $wikitext = str_replace($sectionMatch[0][0], $sectionWikitext, $wikitext);
         }

src/AppBundle/Controller/SimpleEditCounterController.php

Spacing +7 added lines, -7 removed lines

@@ -41,7 +41,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);
         }
 
@@ -108,8 +108,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
@@ -133,16 +133,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
@@ -172,7 +172,7 @@ 
             'project_url' => $url,
             'id' => $id,
             'arch' => $arch,
-            'rev' => $rev + $arch,
+            'rev' => $rev+$arch,
             'live' => $rev,
             'groups' => $groups,
             'globalGroups' => $globalGroups,

src/AppBundle/Controller/EditCounterController.php

Spacing +3 added lines, -3 removed lines

@@ -76,10 +76,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);
@@ -109,7 +109,7 @@ 
         $this->setUpEditCounter($project, $username);
         $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_labs' => $this->project->getRepository()->isLabs(),

src/Xtools/ProjectRepository.php

Spacing +2 added lines, -2 removed lines

@@ -139,7 +139,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;
                 }
             }
@@ -259,7 +259,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/Helper/LabsHelper.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,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/AppBundle/Controller/ApiController.php

Spacing +1 added lines, -1 removed lines

@@ -139,7 +139,7 @@
         }
 
         $conn = $this->getDoctrine()->getManager('default')->getConnection();
-        $date =  date('Y-m-d');
+        $date = date('Y-m-d');
 
         // Increment count in timeline
         $existsSql = "SELECT 1 FROM usage_timeline

src/AppBundle/Controller/MetaController.php

Spacing +6 added lines, -6 removed lines

@@ -31,7 +31,7 @@ 
         $end = $request->query->get('end');
 
         if ($start != '' && $end != '') {
-            return $this->redirectToRoute('MetaResult', [ 'start' => $start, 'end' => $end ]);
+            return $this->redirectToRoute('MetaResult', ['start' => $start, 'end' => $end]);
         }
 
         return $this->render('meta/index.html.twig', [
@@ -73,7 +73,7 @@ 
         $timeline = [];
         $startObj = new DateTime($start);
         $endObj = new DateTime($end);
-        $numDays = (int) $endObj->diff($startObj)->format("%a");
+        $numDays = (int)$endObj->diff($startObj)->format("%a");
         $grandSum = 0;
 
         // Generate array of date labels
@@ -85,17 +85,17 @@ 
 
         foreach ($data as $entry) {
             if (!isset($totals[$entry['tool']])) {
-                $totals[$entry['tool']] = (int) $entry['count'];
+                $totals[$entry['tool']] = (int)$entry['count'];
 
                 // Create arrays for each tool, filled with zeros for each date in the timeline
                 $timeline[$entry['tool']] = array_fill(0, $numDays, 0);
             } else {
-                $totals[$entry['tool']] += (int) $entry['count'];
+                $totals[$entry['tool']] += (int)$entry['count'];
             }
 
             $date = new DateTime($entry['date']);
-            $dateIndex = (int) $date->diff($startObj)->format("%a");
-            $timeline[$entry['tool']][$dateIndex] = (int) $entry['count'];
+            $dateIndex = (int)$date->diff($startObj)->format("%a");
+            $timeline[$entry['tool']][$dateIndex] = (int)$entry['count'];
 
             $grandSum += $entry['count'];
         }

src/AppBundle/Controller/PagesController.php

Spacing +4 added lines, -4 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
@@ -196,7 +196,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
@@ -280,8 +280,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/Controller/TopEditsController.php

Spacing +7 added lines, -7 removed lines

@@ -75,7 +75,7 @@ 
                 'username' => $username,
             ]);
         } elseif ($projectName != "") {
-            return $this->redirectToRoute("TopEditsResults", [ 'project'=>$projectName ]);
+            return $this->redirectToRoute("TopEditsResults", ['project'=>$projectName]);
         }
 
         // Set default project so we can populate the namespace selector.
@@ -179,11 +179,11 @@ 
         }
 
         // Get page info about these 100 pages, so we can use their display title.
-        $titles = array_map(function ($e) use ($namespaces) {
+        $titles = array_map(function($e) use ($namespaces) {
             // If non-mainspace, prepend namespace to the titles.
             $ns = $e['page_namespace'];
-            $nsTitle = $ns > 0 ? $namespaces[$e['page_namespace']] . ':' : '';
-            return $nsTitle . $e['page_title'];
+            $nsTitle = $ns > 0 ? $namespaces[$e['page_namespace']].':' : '';
+            return $nsTitle.$e['page_title'];
         }, $editData);
         /** @var ApiHelper $apiHelper */
         $apiHelper = $this->get('app.api_helper');
@@ -198,8 +198,8 @@ 
         foreach ($editData as $editDatum) {
             // If non-mainspace, prepend namespace to the titles.
             $ns = $editDatum['page_namespace'];
-            $nsTitle = $ns > 0 ? $namespaces[$editDatum['page_namespace']] . ':' : '';
-            $pageTitle = $nsTitle . $editDatum['page_title'];
+            $nsTitle = $ns > 0 ? $namespaces[$editDatum['page_namespace']].':' : '';
+            $pageTitle = $nsTitle.$editDatum['page_title'];
             $editDatum['displaytitle'] = $displayTitles[$pageTitle];
             // $editDatum['page_title'] is retained without the namespace
             //  so we can link to TopEdits for that page
@@ -260,7 +260,7 @@ 
         // Send all to the template.
         return $this->render('topedits/result_article.html.twig', [
             'xtPage' => 'topedits',
-            'xtTitle' => $user->getUsername() . ' - ' . $page->getTitle(),
+            'xtTitle' => $user->getUsername().' - '.$page->getTitle(),
             'project' => $project,
             'user' => $user,
             'page' => $page,