x-tools / xtools

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/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

Doc Comments +5 added lines, -7 removed lines

@@ -59,7 +59,7 @@ 
 
     /**
      * Get this page's database ID.
-     * @return int
+     * @return \string|null
      */
     public function getId()
     {
@@ -69,7 +69,7 @@ 
 
     /**
      * Get this page's length in bytes.
-     * @return int
+     * @return \string|null
      */
     public function getLength()
     {
@@ -93,7 +93,7 @@ 
 
     /**
      * Get the full URL of this page.
-     * @return string
+     * @return \string|null
      */
     public function getUrl()
     {
@@ -103,7 +103,7 @@ 
 
     /**
      * Get the numerical ID of the namespace of this page.
-     * @return int
+     * @return \string|null
      */
     public function getNamespace()
     {
@@ -113,7 +113,7 @@ 
 
     /**
      * Get the number of page watchers.
-     * @return int
+     * @return \string|null
      */
     public function getWatchers()
     {
@@ -378,7 +378,6 @@ 
 
     /**
      * Get all wikidata items for the page, not just languages of sister projects
-     * @param Page $page
      * @return int Number of records.
      */
     public function getWikidataItems()
@@ -388,7 +387,6 @@ 
 
     /**
      * Count wikidata items for the page, not just languages of sister projects
-     * @param Page $page
      * @return int Number of records.
      */
     public function countWikidataItems()

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/Xtools/PagesRepository.php

Doc Comments +2 added lines, -2 removed lines

@@ -18,7 +18,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)
@@ -96,7 +96,7 @@ 
      * Get the statement for a single revision, so that you can iterate row by row.
      * @param Page $page The page.
      * @param User|null $user Specify to get only revisions by the given user.
-     * @return Doctrine\DBAL\Driver\PDOStatement
+     * @return \Doctrine\DBAL\Driver\Statement
      */
     public function getRevisionsStmt(Page $page, User $user = null)
     {

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/AppBundle/Controller/ArticleInfoController.php

Indentation +1 added lines, -1 removed lines

@@ -389,7 +389,7 @@
          * The edit previously deemed as having the maximum amount of content added.
          * This is used to discount content that was reverted.
          * @var Edit|null
-        */
+         */
         $prevMaxAddEdit = null;
 
         /**

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 == '') {
@@ -199,10 +199,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();
 
@@ -211,14 +211,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;
@@ -266,10 +266,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'])) {
@@ -284,7 +284,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;
             }
@@ -293,7 +293,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,
@@ -318,7 +318,7 @@ 
         $title = str_replace(' ', '_', $page->getTitle());
         $sql = "SELECT log_action, log_type, log_timestamp AS timestamp
                 FROM $loggingTable
-                WHERE log_namespace = '" . $page->getNamespace() . "'
+                WHERE log_namespace = '".$page->getNamespace()."'
                 AND log_title = :title AND log_timestamp > 1
                 AND log_type IN ('delete', 'move', 'protect', 'stable')";
         $resultQuery = $this->conn->prepare($sql);
@@ -437,7 +437,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/EditCounterRepository.php

Spacing +5 added lines, -5 removed lines

@@ -146,10 +146,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)
         );
@@ -366,9 +366,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));
 
@@ -427,7 +427,7 @@ 
             }
             $queries[] = $sql;
         }
-        $sql = "(\n" . join("\n) UNION (\n", $queries) . ")\n";
+        $sql = "(\n".join("\n) UNION (\n", $queries).")\n";
         $resultQuery = $this->getProjectsConnection()->prepare($sql);
         $resultQuery->bindParam(":username", $username);
         $resultQuery->execute();

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 namespace Xtools;
 
 use DateInterval;
-use DateTime;
 use Mediawiki\Api\SimpleRequest;
 
 /**

src/Xtools/EditCounter.php

Spacing +21 added lines, -21 removed lines

@@ -67,7 +67,7 @@ 
      */
     protected function getPairData()
     {
-        if (! is_array($this->pairData)) {
+        if (!is_array($this->pairData)) {
             $this->pairData = $this->getRepository()
                 ->getPairData($this->project, $this->user);
         }
@@ -80,7 +80,7 @@ 
      */
     protected function getLogCounts()
     {
-        if (! is_array($this->logCounts)) {
+        if (!is_array($this->logCounts)) {
             $this->logCounts = $this->getRepository()
                 ->getLogCounts($this->project, $this->user);
         }
@@ -129,7 +129,7 @@ 
      */
     public function countAllRevisions()
     {
-        return $this->countLiveRevisions() + $this->countDeletedRevisions();
+        return $this->countLiveRevisions()+$this->countDeletedRevisions();
     }
 
     /**
@@ -148,7 +148,7 @@ 
      */
     public function countRevisionsWithoutComments()
     {
-        return $this->countAllRevisions() - $this->countRevisionsWithComments();
+        return $this->countAllRevisions()-$this->countRevisionsWithComments();
     }
 
     /**
@@ -187,7 +187,7 @@ 
      */
     public function countAllPagesEdited()
     {
-        return $this->countLivePagesEdited() + $this->countDeletedPagesEdited();
+        return $this->countLivePagesEdited()+$this->countDeletedPagesEdited();
     }
 
     /**
@@ -197,7 +197,7 @@ 
      */
     public function countPagesCreated()
     {
-        return $this->countCreatedPagesLive() + $this->countPagesCreatedDeleted();
+        return $this->countCreatedPagesLive()+$this->countPagesCreatedDeleted();
     }
 
     /**
@@ -325,7 +325,7 @@ 
             // Try block just in case there are older, unpredictable formats
             try {
                 $expiry = strtotime($durationStr, $timestamp);
-                $duration = ($expiry - $timestamp) / (60 * 60 * 24);
+                $duration = ($expiry-$timestamp) / (60 * 60 * 24);
 
                 if (!$duration || $duration > $this->longestBlockDays) {
                     $this->longestBlockDays = $duration;
@@ -409,7 +409,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;
     }
 
     /**
@@ -542,9 +542,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;
     }
@@ -568,7 +568,7 @@ 
         $logCounts = $this->getLogCounts();
         $create2 = $logCounts['newusers-create2'] ?: 0;
         $byemail = $logCounts['newusers-byemail'] ?: 0;
-        return $create2 + $byemail;
+        return $create2+$byemail;
     }
 
     /**
@@ -641,14 +641,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;
                     }
                 }
             }
@@ -714,8 +714,8 @@ 
                 ->globalEditCounts($this->user, $this->project);
             if ($sorted) {
                 // Sort.
-                uasort($this->globalEditCounts, function ($a, $b) {
-                    return $b['total'] - $a['total'];
+                uasort($this->globalEditCounts, function($a, $b) {
+                    return $b['total']-$a['total'];
                 });
             }
         }
@@ -753,7 +753,7 @@ 
                 $nsName = $project->getNamespaces()[$revision['page_namespace']];
             }
             $page = $project->getRepository()
-                ->getPage($project, $nsName . ':' . $revision['page_title']);
+                ->getPage($project, $nsName.':'.$revision['page_title']);
             $edit = new Edit($page, $revision);
             $globalEdits[$edit->getTimestamp()->getTimestamp().'-'.$edit->getId()] = $edit;
         }
@@ -770,7 +770,7 @@ 
      */
     protected function getEditSizeData()
     {
-        if (! is_array($this->editSizeData)) {
+        if (!is_array($this->editSizeData)) {
             $this->editSizeData = $this->getRepository()
                 ->getEditSizeData($this->project, $this->user);
         }
@@ -794,7 +794,7 @@ 
     public function countSmallEdits()
     {
         $editSizeData = $this->getEditSizeData();
-        return isset($editSizeData['small_edits']) ? (int) $editSizeData['small_edits'] : 0;
+        return isset($editSizeData['small_edits']) ? (int)$editSizeData['small_edits'] : 0;
     }
 
     /**
@@ -804,7 +804,7 @@ 
     public function countLargeEdits()
     {
         $editSizeData = $this->getEditSizeData();
-        return isset($editSizeData['large_edits']) ? (int) $editSizeData['large_edits'] : 0;
+        return isset($editSizeData['large_edits']) ? (int)$editSizeData['large_edits'] : 0;
     }
 
     /**

src/AppBundle/Controller/AutomatedEditsController.php

Unused Use Statements -1 removed lines

@@ -11,7 +11,6 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Xtools\ProjectRepository;
-use Xtools\User;
 use Xtools\UserRepository;
 
 /**

src/Xtools/User.php

Spacing +7 added lines, -7 removed lines

@@ -206,21 +206,21 @@
 
         $namespaces = $project->getNamespaces();
 
-        return array_map(function ($rev) use ($namespaces) {
+        return array_map(function($rev) use ($namespaces) {
             $pageTitle = $rev['page_title'];
 
             if ($rev['page_namespace'] !== '0') {
-                $pageTitle = $namespaces[$rev['page_namespace']] . ":$pageTitle";
+                $pageTitle = $namespaces[$rev['page_namespace']].":$pageTitle";
             }
 
             return [
                 'page_title' => $pageTitle,
-                'page_namespace' => (int) $rev['page_namespace'],
-                'rev_id' => (int) $rev['rev_id'],
+                'page_namespace' => (int)$rev['page_namespace'],
+                'rev_id' => (int)$rev['rev_id'],
                 'timestamp' => DateTime::createFromFormat('YmdHis', $rev['timestamp']),
-                'minor' => (bool) $rev['minor'],
-                'length' => (int) $rev['length'],
-                'length_change' => (int) $rev['length_change'],
+                'minor' => (bool)$rev['minor'],
+                'length' => (int)$rev['length'],
+                'length_change' => (int)$rev['length_change'],
                 'comment' => $rev['comment'],
             ];
         }, $revs);