x-tools / xtools

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

Unused Use Statements -3 removed lines

@@ -11,11 +11,8 @@
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Xtools\ProjectRepository;
 use Xtools\UserRepository;
-use Xtools\Page;
-use Xtools\Edit;
 
 /**
  * This controller serves the Pages tool.

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/Helper/AutomatedEditsHelper.php

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 
 use DateTime;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Xtools\ProjectRepository;
 
 /**
  * Helper class for getting information about semi-automated edits.

Spacing +9 added lines, -9 removed lines

@@ -126,7 +126,7 @@ 
         $revTable = $project->getRepository()->getTableName($project->getDatabaseName(), 'revision');
         $pageTable = $project->getRepository()->getTableName($project->getDatabaseName(), 'page');
 
-        $AEBTypes = array_map(function ($AEBType) {
+        $AEBTypes = array_map(function($AEBType) {
             return $AEBType['regex'];
         }, $this->container->getParameter('automated_tools'));
 
@@ -151,12 +151,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
@@ -166,24 +166,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/EditCounter.php

Spacing +19 added lines, -19 removed lines

@@ -54,7 +54,7 @@ 
      */
     protected function getRevisionCounts()
     {
-        if (! is_array($this->revisionCounts)) {
+        if (!is_array($this->revisionCounts)) {
             $this->revisionCounts = $this->getRepository()
                 ->getRevisionCounts($this->project, $this->user);
         }
@@ -67,7 +67,7 @@ 
      */
     protected function getRevisionDates()
     {
-        if (! is_array($this->revisionDates)) {
+        if (!is_array($this->revisionDates)) {
             $this->revisionDates = $this->getRepository()
                 ->getRevisionDates($this->project, $this->user);
         }
@@ -80,7 +80,7 @@ 
      */
     protected function getPageCounts()
     {
-        if (! is_array($this->pageCounts)) {
+        if (!is_array($this->pageCounts)) {
             $this->pageCounts = $this->getRepository()
                 ->getPageCounts($this->project, $this->user);
         }
@@ -93,7 +93,7 @@ 
      */
     protected function getLogCounts()
     {
-        if (! is_array($this->logCounts)) {
+        if (!is_array($this->logCounts)) {
             $this->logCounts = $this->getRepository()
                 ->getLogCounts($this->project, $this->user);
         }
@@ -142,7 +142,7 @@ 
      */
     public function countAllRevisions()
     {
-        return $this->countLiveRevisions() + $this->countDeletedRevisions();
+        return $this->countLiveRevisions()+$this->countDeletedRevisions();
     }
 
     /**
@@ -161,7 +161,7 @@ 
      */
     public function countRevisionsWithoutComments()
     {
-        return $this->countAllRevisions() - $this->countRevisionsWithComments();
+        return $this->countAllRevisions()-$this->countRevisionsWithComments();
     }
 
     /**
@@ -228,7 +228,7 @@ 
      */
     public function countAllPagesEdited()
     {
-        return $this->countLivePagesEdited() + $this->countDeletedPagesEdited();
+        return $this->countLivePagesEdited()+$this->countDeletedPagesEdited();
     }
 
     /**
@@ -238,7 +238,7 @@ 
      */
     public function countPagesCreated()
     {
-        return $this->countCreatedPagesLive() + $this->countPagesCreatedDeleted();
+        return $this->countCreatedPagesLive()+$this->countPagesCreatedDeleted();
     }
 
     /**
@@ -290,7 +290,7 @@ 
         $logCounts = $this->getLogCounts();
         $block = isset($logCounts['block-block']) ? (int)$logCounts['block-block'] : 0;
         $reBlock = isset($logCounts['block-reblock']) ? (int)$logCounts['block-reblock'] : 0;
-        return $block + $reBlock;
+        return $block+$reBlock;
     }
 
     /**
@@ -388,7 +388,7 @@ 
         $import = isset($logCounts['import-import']) ? (int)$logCounts['import-import'] : 0;
         $interwiki = isset($logCounts['import-interwiki']) ? (int)$logCounts['import-interwiki'] : 0;
         $upload = isset($logCounts['import-upload']) ? (int)$logCounts['import-upload'] : 0;
-        return $import + $interwiki + $upload;
+        return $import+$interwiki+$upload;
     }
 
     /**
@@ -521,9 +521,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;
     }
@@ -605,14 +605,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;
                     }
                 }
             }
@@ -630,8 +630,8 @@ 
         // Get counts.
         $editCounts = $this->globalEditCounts();
         // 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);
@@ -687,7 +687,7 @@ 
             foreach ($revisions as &$revision) {
                 $nsName = $otherProject->getNamespaces()[$revision['page_namespace']];
                 $page = $otherProject->getRepository()
-                    ->getPage($otherProject, $nsName . ':' . $revision['page_title']);
+                    ->getPage($otherProject, $nsName.':'.$revision['page_title']);
                 $edit = new Edit($page, $revision);
 
                 // If we've already got enough, only check for those newer than the current oldest.

src/AppBundle/Twig/WikiExtension.php

Doc Comments +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 
     /**
      * Get all functions provided by this extension.
-     * @return array
+     * @return \Twig_SimpleFilter[]
      */
     public function getFilters()
     {

Unused Use Statements -2 removed lines

@@ -5,8 +5,6 @@
 
 namespace AppBundle\Twig;
 
-use Twig_SimpleFunction;
-
 /**
  * Twig extension filters and functions for MediaWiki project links.
  */

Spacing +5 added lines, -5 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,7 +41,7 @@ 
      */
     public function getFunctions()
     {
-        $options = [ 'is_safe' => [ 'html']];
+        $options = ['is_safe' => ['html']];
         return [];
     }
 
@@ -54,8 +54,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']]),
         ];
     }
 
@@ -94,7 +94,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/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/Xtools/PagesRepository.php

Doc Comments +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
      * Get metadata about a single page from the API.
      * @param Project $project The project to which the page belongs.
      * @param string $pageTitle Page title.
-     * @return string[] Array with some of the following keys: pageid, title, missing, displaytitle,
+     * @return string|null Array with some of the following keys: pageid, title, missing, displaytitle,
      * url.
      */
     public function getPageInfo(Project $project, $pageTitle)

tests/Xtools/PageTest.php

Unused Use Statements -1 removed lines

@@ -10,7 +10,6 @@
 use Xtools\Page;
 use Xtools\PagesRepository;
 use Xtools\Project;
-use Xtools\ProjectRepository;
 use Xtools\User;
 
 /**

src/AppBundle/Controller/AutomatedEditsController.php

Spacing +3 added lines, -3 removed lines

@@ -168,7 +168,7 @@ 
         $archiveTable = $projectData->getRepository()->getTableName($dbName, 'archive');
 
         $condBegin = $start ? " AND rev_timestamp > :start " : null;
-        $condEnd = $end ? " AND rev_timestamp < :end ": null;
+        $condEnd = $end ? " AND rev_timestamp < :end " : null;
 
         $regexes = [];
 
@@ -262,8 +262,8 @@ 
         }
 
         // Sort the array and do some simple math.
-        uasort($results, function ($a, $b) {
-            return $b['count'] - $a['count'];
+        uasort($results, function($a, $b) {
+            return $b['count']-$a['count'];
         });
 
         if ($total != 0) {