x-tools / xtools

src/AppBundle/Controller/ArticleInfoController.php

Spacing +22 added lines, -22 removed lines

@@ -55,9 +55,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]);
         }
 
         return $this->render('articleInfo/index.html.twig', [
@@ -101,7 +101,7 @@ 
             'url' => $basicInfo['fullurl']
         ];
 
-        $this->pageInfo['watchers'] = ( isset($basicInfo['watchers']) ) ? $basicInfo['watchers'] : "< 30";
+        $this->pageInfo['watchers'] = (isset($basicInfo['watchers'])) ? $basicInfo['watchers'] : "< 30";
 
         $pageProps = isset($basicInfo['pageprops']) ? $basicInfo['pageprops'] : [];
 
@@ -163,8 +163,8 @@ 
      */
     private function getRevCount()
     {
-        $query = "SELECT COUNT(*) AS count FROM " . $this->revisionTable
-                 . " WHERE rev_page = '" . $this->pageInfo['id'] . "'";
+        $query = "SELECT COUNT(*) AS count FROM ".$this->revisionTable
+                 . " WHERE rev_page = '".$this->pageInfo['id']."'";
         $res = $this->conn->query($query)->fetchAll();
         return $res[0]['count'];
     }
@@ -196,7 +196,7 @@ 
                   FROM $this->revisionTable
                   LEFT JOIN $userGroupsTable ON rev_user = ug_user
                   LEFT JOIN $userFromerGroupsTable ON rev_user = ufg_user
-                  WHERE rev_page = " . $this->pageInfo['id'] . " AND (ug_group = 'bot' OR ufg_group = 'bot')
+                  WHERE rev_page = ".$this->pageInfo['id']." AND (ug_group = 'bot' OR ufg_group = 'bot')
                   GROUP BY rev_user_text";
         $res = $this->conn->query($query)->fetchAll();
 
@@ -205,14 +205,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;
@@ -248,10 +248,10 @@ 
 
             if ($info['all'] > 1) {
                 // Number of seconds between first and last edit
-                $secs = intval(strtotime($info['last']) - strtotime($info['first']) / $info['all']);
+                $secs = intval(strtotime($info['last'])-strtotime($info['first']) / $info['all']);
 
                 // 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'])) {
@@ -297,7 +297,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;
@@ -313,7 +313,7 @@ 
         $title = str_replace(' ', '_', $this->pageInfo['title']);
         $query = "SELECT log_action, log_type, log_timestamp AS timestamp
                   FROM $loggingTable
-                  WHERE log_namespace = '" . $this->pageInfo['namespace'] . "'
+                  WHERE log_namespace = '".$this->pageInfo['namespace']."'
                   AND log_title = '$title' AND log_timestamp > 1
                   AND log_type IN ('delete', 'move', 'protect', 'stable')";
         $events = $this->conn->query($query)->fetchAll();
@@ -371,7 +371,7 @@ 
         $query = "SELECT rev_id, rev_parent_id, rev_user_text, rev_user, rev_timestamp,
                   rev_minor_edit, rev_len, rev_comment
                   FROM $this->revisionTable
-                  WHERE rev_page = '" . $this->pageInfo['id'] . "' AND rev_timestamp > 1
+                  WHERE rev_page = '".$this->pageInfo['id']."' AND rev_timestamp > 1
                   ORDER BY rev_timestamp";
 
         $res = $this->conn->query($query)->fetchAll();
@@ -391,9 +391,9 @@ 
             return $rev['rev_len'];
         }
 
-        $lastRev = $this->pageHistory[$revIndex - 1];
+        $lastRev = $this->pageHistory[$revIndex-1];
 
-        return $rev['rev_len'] - $lastRev['rev_len'];
+        return $rev['rev_len']-$lastRev['rev_len'];
     }
 
     /**
@@ -413,12 +413,12 @@ 
         // The month of the first edit. Used as a comparison when building the per-month data
         $firstEditMonth = strtotime(date('Y-m-01, 00:00', strtotime($firstEdit['rev_timestamp'])));
 
-        $lastEdit = $this->pageHistory[ $revisionCount - 1 ];
-        $secondLastEdit = $revisionCount === 1 ? $lastEdit : $this->pageHistory[ $revisionCount - 2 ];
+        $lastEdit = $this->pageHistory[$revisionCount-1];
+        $secondLastEdit = $revisionCount === 1 ? $lastEdit : $this->pageHistory[$revisionCount-2];
 
         // Now we can start our master array. This one will be HUGE!
         $lastEditSize = ($revisionCount > 1)
-            ? $lastEdit['rev_len'] - $secondLastEdit['rev_len']
+            ? $lastEdit['rev_len']-$secondLastEdit['rev_len']
             : $lastEdit['rev_len'];
         $data = [
             'general' => [
@@ -515,7 +515,7 @@ 
             // Increment year and month counts for all edits
             $data['year_count'][$timestamp['year']]['all']++;
             $data['year_count'][$timestamp['year']]['months'][$timestamp['month']]['all']++;
-            $data['year_count'][$timestamp['year']]['size'] = (int) $rev['rev_len'];
+            $data['year_count'][$timestamp['year']]['size'] = (int)$rev['rev_len'];
 
             $editsThisMonth = $data['year_count'][$timestamp['year']]['months'][$timestamp['month']]['all'];
             if ($editsThisMonth > $data['max_edits_per_month']) {
@@ -559,9 +559,9 @@ 
                 }
 
                 // determine if the next revision was a revert
-                $nextRevision = isset($this->pageHistory[$i + 1]) ? $this->pageHistory[$i + 1] : null;
+                $nextRevision = isset($this->pageHistory[$i+1]) ? $this->pageHistory[$i+1] : null;
                 $nextRevisionIsRevert = $nextRevision &&
-                    $this->getDiffSize($i + 1) === -$diffSize &&
+                    $this->getDiffSize($i+1) === -$diffSize &&
                     $this->aeh->isRevert($nextRevision['rev_comment']);
 
                 // don't count this edit as content removal if the next edit reverted it

src/AppBundle/Helper/ApiHelper.php

Spacing +9 added lines, -9 removed lines

@@ -41,7 +41,7 @@ 
     {
 
         $this->setUp($project);
-        $params = [ "list"=>"users", "ususers"=>$username, "usprop"=>"groups" ];
+        $params = ["list"=>"users", "ususers"=>$username, "usprop"=>"groups"];
         $query = new SimpleRequest('query', $params);
         $result = [];
 
@@ -61,7 +61,7 @@ 
     {
 
         $this->setUp($project);
-        $params = [ "meta"=>"globaluserinfo", "guiuser"=>$username, "guiprop"=>"groups" ];
+        $params = ["meta"=>"globaluserinfo", "guiuser"=>$username, "guiprop"=>"groups"];
         $query = new SimpleRequest('query', $params);
         $result = [];
 
@@ -86,13 +86,13 @@ 
     public function namespaces($project)
     {
         // Use cache if possible.
-        $cacheItem = $this->cache->getItem('api.namespaces.' . $project);
+        $cacheItem = $this->cache->getItem('api.namespaces.'.$project);
         if ($cacheItem->isHit()) {
             return $cacheItem->get();
         }
 
         $this->setUp($project);
-        $query = new SimpleRequest('query', [ "meta"=>"siteinfo", "siprop"=>"namespaces" ]);
+        $query = new SimpleRequest('query', ["meta"=>"siteinfo", "siprop"=>"namespaces"]);
         $result = [];
 
         try {
@@ -197,7 +197,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']
@@ -240,7 +240,7 @@ 
         ];
 
         // get assessments for this page from the API
-        $assessments = $this->massApi($params, $project, function ($data) {
+        $assessments = $this->massApi($params, $project, function($data) {
             return isset($data['pages'][0]['pageassessments']) ? $data['pages'][0]['pageassessments'] : [];
         }, 'pacontinue')['pages'];
 
@@ -267,7 +267,7 @@ 
                 $classAttrs = $config['class']['Unknown'];
                 $assessment['class']['value'] = '???';
                 $assessment['class']['category'] = $classAttrs['category'];
-                $assessment['class']['badge'] = "https://upload.wikimedia.org/wikipedia/commons/". $classAttrs['badge'];
+                $assessment['class']['badge'] = "https://upload.wikimedia.org/wikipedia/commons/".$classAttrs['badge'];
             } else {
                 $classAttrs = $config['class'][$classValue];
                 $assessment['class'] = [
@@ -278,7 +278,7 @@ 
 
                 // add full URL to badge icon
                 if ($classAttrs['badge'] !== '') {
-                    $assessment['class']['badge'] = "https://upload.wikimedia.org/wikipedia/commons/" .
+                    $assessment['class']['badge'] = "https://upload.wikimedia.org/wikipedia/commons/".
                         $classAttrs['badge'];
                 }
 
@@ -402,7 +402,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);