Completed
Pull Request — master (#86)
by Sam
03:09
created
src/AppBundle/Controller/EditCounterController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -78,10 +78,10 @@  discard block
 block discarded – undo
78 78
         $username = $request->query->get('username', $request->query->get('user'));
79 79
 
80 80
         if (($project || $queryProject) && $username) {
81
-            $routeParams = [ 'project'=>($project ?: $queryProject), 'username' => $username ];
81
+            $routeParams = ['project'=>($project ?: $queryProject), 'username' => $username];
82 82
             return $this->redirectToRoute("EditCounterResult", $routeParams);
83 83
         } elseif (!$project && $queryProject) {
84
-            return $this->redirectToRoute("EditCounterProject", [ 'project'=>$queryProject ]);
84
+            return $this->redirectToRoute("EditCounterProject", ['project'=>$queryProject]);
85 85
         }
86 86
 
87 87
         $project = ProjectRepository::getProject($queryProject, $this->container);
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
         }
117 117
         $isSubRequest = $this->container->get('request_stack')->getParentRequest() !== null;
118 118
         return $this->render('editCounter/result.html.twig', [
119
-            'xtTitle' => $this->user->getUsername() . ' - ' . $this->project->getTitle(),
119
+            'xtTitle' => $this->user->getUsername().' - '.$this->project->getTitle(),
120 120
             'xtPage' => 'ec',
121 121
             'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..'),
122 122
             'is_sub_request' => $isSubRequest,
Please login to merge, or discard this patch.
src/AppBundle/Controller/PagesController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
                 'username' => $username,
79 79
             ]);
80 80
         } elseif ($projectQuery != "") {
81
-            return $this->redirectToRoute("PagesProject", [ 'project'=>$projectQuery ]);
81
+            return $this->redirectToRoute("PagesProject", ['project'=>$projectQuery]);
82 82
         }
83 83
 
84 84
         // set default wiki so we can populate the namespace selector
@@ -207,8 +207,8 @@  discard block
 block discarded – undo
207 207
         }
208 208
 
209 209
         if ($total < 1) {
210
-            $this->addFlash('notice', [ 'no-result', $username ]);
211
-            return $this->redirectToRoute('PagesProject', [ 'project' => $project ]);
210
+            $this->addFlash('notice', ['no-result', $username]);
211
+            return $this->redirectToRoute('PagesProject', ['project' => $project]);
212 212
         }
213 213
 
214 214
         ksort($pagesByNamespaceByDate);
Please login to merge, or discard this patch.
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/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/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.
src/AppBundle/Controller/TopEditsController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -168,11 +168,11 @@  discard block
 block discarded – undo
168 168
         }
169 169
 
170 170
         // Get page info about these 100 pages, so we can use their display title.
171
-        $titles = array_map(function ($e) use ($namespaces) {
171
+        $titles = array_map(function($e) use ($namespaces) {
172 172
             // If non-mainspace, prepend namespace to the titles.
173 173
             $ns = $e['page_namespace'];
174
-            $nsTitle = $ns > 0 ? $namespaces[$e['page_namespace']] . ':' : '';
175
-            return $nsTitle . $e['page_title'];
174
+            $nsTitle = $ns > 0 ? $namespaces[$e['page_namespace']].':' : '';
175
+            return $nsTitle.$e['page_title'];
176 176
         }, $editData);
177 177
 
178 178
         /** @var ApiHelper $apiHelper */
@@ -188,8 +188,8 @@  discard block
 block discarded – undo
188 188
         foreach ($editData as $editDatum) {
189 189
             // If non-mainspace, prepend namespace to the titles.
190 190
             $ns = $editDatum['page_namespace'];
191
-            $nsTitle = $ns > 0 ? $namespaces[$editDatum['page_namespace']] . ':' : '';
192
-            $pageTitle = $nsTitle . $editDatum['page_title'];
191
+            $nsTitle = $ns > 0 ? $namespaces[$editDatum['page_namespace']].':' : '';
192
+            $pageTitle = $nsTitle.$editDatum['page_title'];
193 193
             $editDatum['displaytitle'] = $displayTitles[$pageTitle];
194 194
             // $editDatum['page_title'] is retained without the namespace
195 195
             //  so we can link to TopEdits for that page
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
         // Send all to the template.
250 250
         return $this->render('topedits/result_article.html.twig', [
251 251
             'xtPage' => 'topedits',
252
-            'xtTitle' => $user->getUsername() . ' - ' . $page->getTitle(),
252
+            'xtTitle' => $user->getUsername().' - '.$page->getTitle(),
253 253
             'project' => $project,
254 254
             'user' => $user,
255 255
             'page' => $page,
Please login to merge, or discard this patch.
src/Xtools/Edit.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
         $this->page = $page;
50 50
 
51 51
         // Copy over supported attributes
52
-        $this->id = (int) $attrs['id'];
52
+        $this->id = (int)$attrs['id'];
53 53
 
54 54
         // Allow DateTime or string (latter assumed to be of format YmdHis)
55 55
         if ($attrs['timestamp'] instanceof DateTime) {
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
         $isSection = preg_match_all("/^\/\* (.*?) \*\//", $summary, $sectionMatch);
199 199
 
200 200
         if ($isSection) {
201
-            $pageUrl = $this->getProject()->getUrl(false) . str_replace(
201
+            $pageUrl = $this->getProject()->getUrl(false).str_replace(
202 202
                 '$1',
203 203
                 $this->getPage()->getTitle(),
204 204
                 $this->getProject()->getArticlePath()
@@ -208,8 +208,8 @@  discard block
 block discarded – undo
208 208
             // Must have underscores for the link to properly go to the section
209 209
             $sectionTitleLink = htmlspecialchars(str_replace(' ', '_', $sectionTitle));
210 210
 
211
-            $sectionWikitext = "<a target='_blank' href='$pageUrl#$sectionTitleLink'>&rarr;</a>" .
212
-                "<em class='text-muted'>" . htmlspecialchars($sectionTitle) . ":</em> ";
211
+            $sectionWikitext = "<a target='_blank' href='$pageUrl#$sectionTitleLink'>&rarr;</a>".
212
+                "<em class='text-muted'>".htmlspecialchars($sectionTitle).":</em> ";
213 213
             $summary = str_replace($sectionMatch[0][0], $sectionWikitext, $summary);
214 214
         }
215 215
 
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
             );
224 224
 
225 225
             // Use normalized page title (underscored, capitalized)
226
-            $pageUrl = $this->getProject()->getUrl(false) . str_replace(
226
+            $pageUrl = $this->getProject()->getUrl(false).str_replace(
227 227
                 '$1',
228 228
                 ucfirst(str_replace(' ', '_', $wikiLinkPath)),
229 229
                 $this->getProject()->getArticlePath()
@@ -261,8 +261,8 @@  discard block
 block discarded – undo
261 261
     public function getDiffUrl()
262 262
     {
263 263
         $project = $this->getProject();
264
-        $path = str_replace('$1', 'Special:Diff/' . $this->id, $project->getArticlePath());
265
-        return rtrim($project->getUrl(), '/') . $path;
264
+        $path = str_replace('$1', 'Special:Diff/'.$this->id, $project->getArticlePath());
265
+        return rtrim($project->getUrl(), '/').$path;
266 266
     }
267 267
 
268 268
     /**
@@ -272,8 +272,8 @@  discard block
 block discarded – undo
272 272
     public function getPermaUrl()
273 273
     {
274 274
         $project = $this->getProject();
275
-        $path = str_replace('$1', 'Special:PermaLink/' . $this->id, $project->getArticlePath());
276
-        return rtrim($project->getUrl(), '/') . $path;
275
+        $path = str_replace('$1', 'Special:PermaLink/'.$this->id, $project->getArticlePath());
276
+        return rtrim($project->getUrl(), '/').$path;
277 277
     }
278 278
 
279 279
     /**
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
      */
306 306
     public function isAutomated(Container $container)
307 307
     {
308
-        return (bool) $this->getTool($container);
308
+        return (bool)$this->getTool($container);
309 309
     }
310 310
 
311 311
     /**
Please login to merge, or discard this patch.
src/Xtools/User.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
      */
175 175
     public function countAutomatedEdits(Project $project, $namespace = 'all', $start = '', $end = '')
176 176
     {
177
-        return (int) $this->getRepository()->countAutomatedEdits($project, $this, $namespace, $start, $end);
177
+        return (int)$this->getRepository()->countAutomatedEdits($project, $this, $namespace, $start, $end);
178 178
     }
179 179
 
180 180
     /**
@@ -206,21 +206,21 @@  discard block
 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.