Completed
Pull Request — master (#65)
by Sam
03:31
created
src/Xtools/EditCounterRepository.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -146,10 +146,10 @@  discard block
 block discarded – undo
146 146
         $resultQuery->execute();
147 147
         $results = $resultQuery->fetchAll();
148 148
         $logCounts = array_combine(
149
-            array_map(function ($e) {
149
+            array_map(function($e) {
150 150
                 return $e['source'];
151 151
             }, $results),
152
-            array_map(function ($e) {
152
+            array_map(function($e) {
153 153
                 return $e['value'];
154 154
             }, $results)
155 155
         );
@@ -366,9 +366,9 @@  discard block
 block discarded – undo
366 366
         $resultQuery->bindParam(":id", $userId);
367 367
         $resultQuery->execute();
368 368
         $results = $resultQuery->fetchAll();
369
-        $namespaceTotals = array_combine(array_map(function ($e) {
369
+        $namespaceTotals = array_combine(array_map(function($e) {
370 370
             return $e['page_namespace'];
371
-        }, $results), array_map(function ($e) {
371
+        }, $results), array_map(function($e) {
372 372
             return $e['total'];
373 373
         }, $results));
374 374
 
@@ -427,7 +427,7 @@  discard block
 block discarded – undo
427 427
             }
428 428
             $queries[] = $sql;
429 429
         }
430
-        $sql = "(\n" . join("\n) UNION (\n", $queries) . ")\n";
430
+        $sql = "(\n".join("\n) UNION (\n", $queries).")\n";
431 431
         $resultQuery = $this->getProjectsConnection()->prepare($sql);
432 432
         $resultQuery->bindParam(":username", $username);
433 433
         $resultQuery->execute();
Please login to merge, or discard this patch.
src/Xtools/EditCounter.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
      */
68 68
     protected function getPairData()
69 69
     {
70
-        if (! is_array($this->pairData)) {
70
+        if (!is_array($this->pairData)) {
71 71
             $this->pairData = $this->getRepository()
72 72
                 ->getPairData($this->project, $this->user);
73 73
         }
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
      */
81 81
     protected function getLogCounts()
82 82
     {
83
-        if (! is_array($this->logCounts)) {
83
+        if (!is_array($this->logCounts)) {
84 84
             $this->logCounts = $this->getRepository()
85 85
                 ->getLogCounts($this->project, $this->user);
86 86
         }
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
      */
130 130
     public function countAllRevisions()
131 131
     {
132
-        return $this->countLiveRevisions() + $this->countDeletedRevisions();
132
+        return $this->countLiveRevisions()+$this->countDeletedRevisions();
133 133
     }
134 134
 
135 135
     /**
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
      */
149 149
     public function countRevisionsWithoutComments()
150 150
     {
151
-        return $this->countAllRevisions() - $this->countRevisionsWithComments();
151
+        return $this->countAllRevisions()-$this->countRevisionsWithComments();
152 152
     }
153 153
 
154 154
     /**
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
      */
188 188
     public function countAllPagesEdited()
189 189
     {
190
-        return $this->countLivePagesEdited() + $this->countDeletedPagesEdited();
190
+        return $this->countLivePagesEdited()+$this->countDeletedPagesEdited();
191 191
     }
192 192
 
193 193
     /**
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
      */
198 198
     public function countPagesCreated()
199 199
     {
200
-        return $this->countCreatedPagesLive() + $this->countPagesCreatedDeleted();
200
+        return $this->countCreatedPagesLive()+$this->countPagesCreatedDeleted();
201 201
     }
202 202
 
203 203
     /**
@@ -325,7 +325,7 @@  discard block
 block discarded – undo
325 325
             // Try block just in case there are older, unpredictable formats
326 326
             try {
327 327
                 $expiry = strtotime($durationStr, $timestamp);
328
-                $duration = ($expiry - $timestamp) / (60 * 60 * 24);
328
+                $duration = ($expiry-$timestamp) / (60 * 60 * 24);
329 329
 
330 330
                 if (!$duration || $duration > $this->longestBlockDays) {
331 331
                     $this->longestBlockDays = $duration;
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
409 409
         $import = isset($logCounts['import-import']) ? (int)$logCounts['import-import'] : 0;
410 410
         $interwiki = isset($logCounts['import-interwiki']) ? (int)$logCounts['import-interwiki'] : 0;
411 411
         $upload = isset($logCounts['import-upload']) ? (int)$logCounts['import-upload'] : 0;
412
-        return $import + $interwiki + $upload;
412
+        return $import+$interwiki+$upload;
413 413
     }
414 414
 
415 415
     /**
@@ -542,9 +542,9 @@  discard block
 block discarded – undo
542 542
     public function approvals()
543 543
     {
544 544
         $logCounts = $this->getLogCounts();
545
-        $total = $logCounts['review-approve'] +
546
-        (!empty($logCounts['review-approve-a']) ? $logCounts['review-approve-a'] : 0) +
547
-        (!empty($logCounts['review-approve-i']) ? $logCounts['review-approve-i'] : 0) +
545
+        $total = $logCounts['review-approve']+
546
+        (!empty($logCounts['review-approve-a']) ? $logCounts['review-approve-a'] : 0)+
547
+        (!empty($logCounts['review-approve-i']) ? $logCounts['review-approve-i'] : 0)+
548 548
         (!empty($logCounts['review-approve-ia']) ? $logCounts['review-approve-ia'] : 0);
549 549
         return $total;
550 550
     }
@@ -568,7 +568,7 @@  discard block
 block discarded – undo
568 568
         $logCounts = $this->getLogCounts();
569 569
         $create2 = $logCounts['newusers-create2'] ?: 0;
570 570
         $byemail = $logCounts['newusers-byemail'] ?: 0;
571
-        return $create2 + $byemail;
571
+        return $create2+$byemail;
572 572
     }
573 573
 
574 574
     /**
@@ -641,14 +641,14 @@  discard block
 block discarded – undo
641 641
             if (!isset($out['totals'][$ns])) {
642 642
                 $out['totals'][$ns] = [];
643 643
             }
644
-            $out['totals'][$ns][$total['year'] . $total['month']] = $total['count'];
644
+            $out['totals'][$ns][$total['year'].$total['month']] = $total['count'];
645 645
         }
646 646
         // Fill in the blanks (where no edits were made in a given month for a namespace).
647 647
         for ($y = $out['min_year']; $y <= $out['max_year']; $y++) {
648 648
             for ($m = 1; $m <= 12; $m++) {
649 649
                 foreach ($out['totals'] as $nsId => &$total) {
650
-                    if (!isset($total[$y . $m])) {
651
-                        $total[$y . $m] = 0;
650
+                    if (!isset($total[$y.$m])) {
651
+                        $total[$y.$m] = 0;
652 652
                     }
653 653
                 }
654 654
             }
@@ -714,8 +714,8 @@  discard block
 block discarded – undo
714 714
                 ->globalEditCounts($this->user, $this->project);
715 715
             if ($sorted) {
716 716
                 // Sort.
717
-                uasort($this->globalEditCounts, function ($a, $b) {
718
-                    return $b['total'] - $a['total'];
717
+                uasort($this->globalEditCounts, function($a, $b) {
718
+                    return $b['total']-$a['total'];
719 719
                 });
720 720
             }
721 721
         }
@@ -753,7 +753,7 @@  discard block
 block discarded – undo
753 753
                 $nsName = $project->getNamespaces()[$revision['page_namespace']];
754 754
             }
755 755
             $page = $project->getRepository()
756
-                ->getPage($project, $nsName . ':' . $revision['page_title']);
756
+                ->getPage($project, $nsName.':'.$revision['page_title']);
757 757
             $edit = new Edit($page, $revision);
758 758
             $globalEdits[$edit->getTimestamp()->getTimestamp().'-'.$edit->getId()] = $edit;
759 759
         }
@@ -770,7 +770,7 @@  discard block
 block discarded – undo
770 770
      */
771 771
     protected function getEditSizeData()
772 772
     {
773
-        if (! is_array($this->editSizeData)) {
773
+        if (!is_array($this->editSizeData)) {
774 774
             $this->editSizeData = $this->getRepository()
775 775
                 ->getEditSizeData($this->project, $this->user);
776 776
         }
@@ -794,7 +794,7 @@  discard block
 block discarded – undo
794 794
     public function countSmallEdits()
795 795
     {
796 796
         $editSizeData = $this->getEditSizeData();
797
-        return isset($editSizeData['small_edits']) ? (int) $editSizeData['small_edits'] : 0;
797
+        return isset($editSizeData['small_edits']) ? (int)$editSizeData['small_edits'] : 0;
798 798
     }
799 799
 
800 800
     /**
@@ -804,7 +804,7 @@  discard block
 block discarded – undo
804 804
     public function countLargeEdits()
805 805
     {
806 806
         $editSizeData = $this->getEditSizeData();
807
-        return isset($editSizeData['large_edits']) ? (int) $editSizeData['large_edits'] : 0;
807
+        return isset($editSizeData['large_edits']) ? (int)$editSizeData['large_edits'] : 0;
808 808
     }
809 809
 
810 810
     /**
Please login to merge, or discard this patch.
src/Xtools/User.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -206,21 +206,21 @@
 block discarded – undo
206 206
 
207 207
         $namespaces = $project->getNamespaces();
208 208
 
209
-        return array_map(function ($rev) use ($namespaces) {
209
+        return array_map(function($rev) use ($namespaces) {
210 210
             $pageTitle = $rev['page_title'];
211 211
 
212 212
             if ($rev['page_namespace'] !== '0') {
213
-                $pageTitle = $namespaces[$rev['page_namespace']] . ":$pageTitle";
213
+                $pageTitle = $namespaces[$rev['page_namespace']].":$pageTitle";
214 214
             }
215 215
 
216 216
             return [
217 217
                 'page_title' => $pageTitle,
218
-                'page_namespace' => (int) $rev['page_namespace'],
219
-                'rev_id' => (int) $rev['rev_id'],
218
+                'page_namespace' => (int)$rev['page_namespace'],
219
+                'rev_id' => (int)$rev['rev_id'],
220 220
                 'timestamp' => DateTime::createFromFormat('YmdHis', $rev['timestamp']),
221
-                'minor' => (bool) $rev['minor'],
222
-                'length' => (int) $rev['length'],
223
-                'length_change' => (int) $rev['length_change'],
221
+                'minor' => (bool)$rev['minor'],
222
+                'length' => (int)$rev['length'],
223
+                'length_change' => (int)$rev['length_change'],
224 224
                 'comment' => $rev['comment'],
225 225
             ];
226 226
         }, $revs);
Please login to merge, or discard this patch.
tests/Xtools/EditTest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@
 block discarded – undo
89 89
         ]);
90 90
 
91 91
         $this->assertEquals(
92
-            "&lt;script&gt;alert(&quot;XSS baby&quot;)&lt;/script&gt; " .
92
+            "&lt;script&gt;alert(&quot;XSS baby&quot;)&lt;/script&gt; ".
93 93
                 "<a target='_blank' href='https://test.example.org/wiki/Test_page'>test page</a>",
94 94
             $edit->getWikifiedSummary()
95 95
         );
Please login to merge, or discard this patch.
src/AppBundle/Twig/WikiExtension.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
      */
31 31
     public function intuitionMessage($message = "", $vars = [])
32 32
     {
33
-        return $this->getIntuition()->msg($message, [ "domain" => "xtools", "variables" => $vars ]);
33
+        return $this->getIntuition()->msg($message, ["domain" => "xtools", "variables" => $vars]);
34 34
     }
35 35
 
36 36
     /*********************************** FUNCTIONS ***********************************/
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
      */
42 42
     public function getFunctions()
43 43
     {
44
-        $options = [ 'is_safe' => [ 'html']];
44
+        $options = ['is_safe' => ['html']];
45 45
         return [];
46 46
     }
47 47
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
     public function getFilters()
55 55
     {
56 56
         return [
57
-            new \Twig_SimpleFilter('diff_format', [ $this, 'diffFormat' ], [ 'is_safe' => [ 'html' ] ]),
57
+            new \Twig_SimpleFilter('diff_format', [$this, 'diffFormat'], ['is_safe' => ['html']]),
58 58
         ];
59 59
     }
60 60
 
Please login to merge, or discard this patch.
src/AppBundle/Helper/AutomatedEditsHelper.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
      */
58 58
     public function isAutomated($summary, $projectDomain)
59 59
     {
60
-        return (bool) $this->getTool($summary, $projectDomain);
60
+        return (bool)$this->getTool($summary, $projectDomain);
61 61
     }
62 62
 
63 63
     /**
@@ -109,14 +109,14 @@  discard block
 block discarded – undo
109 109
 
110 110
         $revertEntries = array_filter(
111 111
             $this->getTools($projectDomain),
112
-            function ($tool) {
112
+            function($tool) {
113 113
                 return isset($tool['revert']);
114 114
             }
115 115
         );
116 116
 
117 117
         // If 'revert' is set to `true`, the use 'regex' as the regular expression,
118 118
         //  otherwise 'revert' is assumed to be the regex string.
119
-        $this->revertTools[$projectDomain] = array_map(function ($revertTool) {
119
+        $this->revertTools[$projectDomain] = array_map(function($revertTool) {
120 120
             return [
121 121
                 'link' => $revertTool['link'],
122 122
                 'regex' => $revertTool['revert'] === true ? $revertTool['regex'] : $revertTool['revert']
Please login to merge, or discard this patch.
src/AppBundle/Controller/ArticleInfoController.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -84,9 +84,9 @@  discard block
 block discarded – undo
84 84
         $article = $request->query->get('article');
85 85
 
86 86
         if ($projectQuery != '' && $article != '') {
87
-            return $this->redirectToRoute('ArticleInfoResult', [ 'project'=>$projectQuery, 'article' => $article ]);
87
+            return $this->redirectToRoute('ArticleInfoResult', ['project'=>$projectQuery, 'article' => $article]);
88 88
         } elseif ($article != '') {
89
-            return $this->redirectToRoute('ArticleInfoProject', [ 'project'=>$projectQuery ]);
89
+            return $this->redirectToRoute('ArticleInfoProject', ['project'=>$projectQuery]);
90 90
         }
91 91
 
92 92
         if ($projectQuery == '') {
@@ -199,10 +199,10 @@  discard block
 block discarded – undo
199 199
         $userGroupsTable = $this->projectRepo->getTableName($this->dbName, 'user_groups');
200 200
         $userFromerGroupsTable = $this->projectRepo->getTableName($this->dbName, 'user_former_groups');
201 201
         $query = "SELECT COUNT(rev_user_text) AS count, rev_user_text AS username, ug_group AS current
202
-                  FROM " . $this->projectRepo->getTableName($this->dbName, 'revision') . "
202
+                  FROM " . $this->projectRepo->getTableName($this->dbName, 'revision')."
203 203
                   LEFT JOIN $userGroupsTable ON rev_user = ug_user
204 204
                   LEFT JOIN $userFromerGroupsTable ON rev_user = ufg_user
205
-                  WHERE rev_page = " . $this->pageInfo['page']->getId() . " AND (ug_group = 'bot' OR ufg_group = 'bot')
205
+                  WHERE rev_page = ".$this->pageInfo['page']->getId()." AND (ug_group = 'bot' OR ufg_group = 'bot')
206 206
                   GROUP BY rev_user_text";
207 207
         $res = $this->conn->query($query)->fetchAll();
208 208
 
@@ -211,14 +211,14 @@  discard block
 block discarded – undo
211 211
         $sum = 0;
212 212
         foreach ($res as $bot) {
213 213
             $bots[$bot['username']] = [
214
-                'count' => (int) $bot['count'],
214
+                'count' => (int)$bot['count'],
215 215
                 'current' => $bot['current'] === 'bot'
216 216
             ];
217 217
             $sum += $bot['count'];
218 218
         }
219 219
 
220
-        uasort($bots, function ($a, $b) {
221
-            return $b['count'] - $a['count'];
220
+        uasort($bots, function($a, $b) {
221
+            return $b['count']-$a['count'];
222 222
         });
223 223
 
224 224
         $this->pageInfo['general']['bot_revision_count'] = $sum;
@@ -266,10 +266,10 @@  discard block
 block discarded – undo
266 266
 
267 267
             if ($info['all'] > 1) {
268 268
                 // Number of seconds between first and last edit
269
-                $secs = $info['last']->getTimestamp() - $info['first']->getTimestamp();
269
+                $secs = $info['last']->getTimestamp()-$info['first']->getTimestamp();
270 270
 
271 271
                 // Average time between edits (in days)
272
-                $this->pageInfo['editors'][$editor]['atbe'] = $secs / ( 60 * 60 * 24 );
272
+                $this->pageInfo['editors'][$editor]['atbe'] = $secs / (60 * 60 * 24);
273 273
             }
274 274
 
275 275
             if (count($info['sizes'])) {
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
 
285 285
         // First sort editors array by the amount of text they added
286 286
         $topTenEditorsByAdded = $this->pageInfo['editors'];
287
-        uasort($topTenEditorsByAdded, function ($a, $b) {
287
+        uasort($topTenEditorsByAdded, function($a, $b) {
288 288
             if ($a['added'] === $b['added']) {
289 289
                 return 0;
290 290
             }
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
 
294 294
         // Then build a new array of top 10 editors by added text,
295 295
         //   in the data structure needed for the chart
296
-        $this->pageInfo['topTenEditorsByAdded'] = array_map(function ($editor) {
296
+        $this->pageInfo['topTenEditorsByAdded'] = array_map(function($editor) {
297 297
             $added = $this->pageInfo['editors'][$editor]['added'];
298 298
             return [
299 299
                 'label' => $editor,
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
         $title = str_replace(' ', '_', $page->getTitle());
319 319
         $sql = "SELECT log_action, log_type, log_timestamp AS timestamp
320 320
                 FROM $loggingTable
321
-                WHERE log_namespace = '" . $page->getNamespace() . "'
321
+                WHERE log_namespace = '".$page->getNamespace()."'
322 322
                 AND log_title = :title AND log_timestamp > 1
323 323
                 AND log_type IN ('delete', 'move', 'protect', 'stable')";
324 324
         $resultQuery = $this->conn->prepare($sql);
@@ -437,7 +437,7 @@  discard block
 block discarded – undo
437 437
 
438 438
             if ($revCount === 0) {
439 439
                 $firstEdit = $edit;
440
-                $firstEditMonth = mktime(0, 0, 0, (int) $firstEdit->getMonth(), 1, $firstEdit->getYear());
440
+                $firstEditMonth = mktime(0, 0, 0, (int)$firstEdit->getMonth(), 1, $firstEdit->getYear());
441 441
             }
442 442
 
443 443
             $username = $edit->getUser()->getUsername();
Please login to merge, or discard this patch.
src/AppBundle/Controller/ApiController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -105,13 +105,13 @@  discard block
 block discarded – undo
105 105
         $data = $user->getNonautomatedEdits($project, $namespace, $start, $end, $offset);
106 106
 
107 107
         if ($format === 'html') {
108
-            $edits = array_map(function ($attrs) use ($project, $username) {
108
+            $edits = array_map(function($attrs) use ($project, $username) {
109 109
                 $nsName = '';
110 110
                 if ($attrs['page_namespace']) {
111 111
                     $nsName = $project->getNamespaces()[$attrs['page_namespace']];
112 112
                 }
113 113
                 $page = $project->getRepository()
114
-                    ->getPage($project, $nsName . ':' . $attrs['page_title']);
114
+                    ->getPage($project, $nsName.':'.$attrs['page_title']);
115 115
                 $attrs['id'] = $attrs['rev_id'];
116 116
                 $attrs['username'] = $username;
117 117
                 return new Edit($page, $attrs);
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
         }
161 161
 
162 162
         $conn = $this->getDoctrine()->getManager('default')->getConnection();
163
-        $date =  date('Y-m-d');
163
+        $date = date('Y-m-d');
164 164
 
165 165
         // Increment count in timeline
166 166
         $existsSql = "SELECT 1 FROM usage_timeline
Please login to merge, or discard this patch.
src/AppBundle/Controller/EditSummaryController.php 1 patch
Spacing   +4 added lines, -6 removed lines patch added patch discarded remove patch
@@ -143,8 +143,8 @@  discard block
 block discarded – undo
143 143
     {
144 144
         $dbName = $project->getDatabaseName();
145 145
 
146
-        $cacheKey = 'editsummaryusage.' . $dbName . '.'
147
-            . $user->getCacheKey() . '.' . $namespace;
146
+        $cacheKey = 'editsummaryusage.'.$dbName.'.'
147
+            . $user->getCacheKey().'.'.$namespace;
148 148
 
149 149
         $cache = $this->container->get('cache.app');
150 150
         if ($cache->hasItem($cacheKey)) {
@@ -231,8 +231,7 @@  discard block
 block discarded – undo
231 231
             if ($row['rev_minor_edit'] == 0) {
232 232
                 if ($row['rev_comment'] !== '') {
233 233
                     isset($monthEditsummaryTotals[$monthkey]) ?
234
-                        $monthEditsummaryTotals[$monthkey]++ :
235
-                        $monthEditsummaryTotals[$monthkey] = 1;
234
+                        $monthEditsummaryTotals[$monthkey]++ : $monthEditsummaryTotals[$monthkey] = 1;
236 235
                     $totalSummariesMajor++;
237 236
                 }
238 237
 
@@ -249,8 +248,7 @@  discard block
 block discarded – undo
249 248
                 // If there is a comment, count it
250 249
                 if ($row['rev_comment'] !== '') {
251 250
                     isset($monthEditsummaryTotals[$monthkey]) ?
252
-                        $monthEditsummaryTotals[$monthkey]++ :
253
-                        $monthEditsummaryTotals[$monthkey] = 1;
251
+                        $monthEditsummaryTotals[$monthkey]++ : $monthEditsummaryTotals[$monthkey] = 1;
254 252
                     $totalSummariesMinor++;
255 253
                     $totalEditsMinor++;
256 254
                 } else {
Please login to merge, or discard this patch.