Completed
Pull Request — master (#102)
by Matthew
02:21
created
web/app_dev.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 // Feel free to remove this, extend it, or make something more sophisticated.
13 13
 if (isset($_SERVER['HTTP_CLIENT_IP'])
14 14
     || isset($_SERVER['HTTP_X_FORWARDED_FOR'])
15
-    || !( in_array(@$_SERVER['REMOTE_ADDR'], [ '127.0.0.1', 'fe80::1', '::1' ]) || php_sapi_name() === 'cli-server' )
15
+    || !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1']) || php_sapi_name() === 'cli-server')
16 16
 ) {
17 17
     header('HTTP/1.0 403 Forbidden');
18 18
     exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
Please login to merge, or discard this patch.
src/AppBundle/Controller/AdminStatsController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -176,7 +176,7 @@
 block discarded – undo
176 176
 
177 177
         // Iterate over query results, loading each user id into the array
178 178
         while ($row = $res->fetch()) {
179
-            $adminIdArr[] = $row["user_id"] ;
179
+            $adminIdArr[] = $row["user_id"];
180 180
         }
181 181
 
182 182
         // Set the query results to be useful in a sql statement.
Please login to merge, or discard this patch.
src/AppBundle/Controller/QuoteController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
             'quote/all.html.twig',
112 112
             [
113 113
                 'base_dir' => realpath(
114
-                    $this->getParameter('kernel.root_dir') . '/..'
114
+                    $this->getParameter('kernel.root_dir').'/..'
115 115
                 ),
116 116
                 'xtPage' => 'bash',
117 117
                 'quotes' => $quotes,
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
             'quote/view.html.twig',
161 161
             [
162 162
                 'base_dir' => realpath(
163
-                    $this->getParameter('kernel.root_dir') . '/..'
163
+                    $this->getParameter('kernel.root_dir').'/..'
164 164
                 ),
165 165
                 "xtPage" => "bash",
166 166
                 "text" => $text,
Please login to merge, or discard this patch.
src/AppBundle/Controller/TopEditsController.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@
 block discarded – undo
96 96
      * List top edits by this user for all pages in a particular namespace.
97 97
      * @param User $user The User.
98 98
      * @param Project $project The project.
99
-     * @param integer|string $namespaceId The namespace ID or 'all'
99
+     * @param integer $namespaceId The namespace ID or 'all'
100 100
      * @return \Symfony\Component\HttpFoundation\Response
101 101
      */
102 102
     protected function namespaceTopEdits(User $user, Project $project, $namespaceId)
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
             'xtSubtitle' => 'tool-topedits-desc',
94 94
             'xtPage' => 'topedits',
95 95
             'project' => $project,
96
-            'namespace' => (int) $namespace,
96
+            'namespace' => (int)$namespace,
97 97
             'article' => $article,
98 98
         ]);
99 99
     }
@@ -190,11 +190,11 @@  discard block
 block discarded – undo
190 190
         }
191 191
 
192 192
         // Get page info about these 100 pages, so we can use their display title.
193
-        $titles = array_map(function ($e) use ($namespaces) {
193
+        $titles = array_map(function($e) use ($namespaces) {
194 194
             // If non-mainspace, prepend namespace to the titles.
195 195
             $ns = $e['page_namespace'];
196
-            $nsTitle = $ns > 0 ? $namespaces[$e['page_namespace']] . ':' : '';
197
-            return $nsTitle . $e['page_title'];
196
+            $nsTitle = $ns > 0 ? $namespaces[$e['page_namespace']].':' : '';
197
+            return $nsTitle.$e['page_title'];
198 198
         }, $editData);
199 199
 
200 200
         /** @var ApiHelper $apiHelper */
@@ -210,8 +210,8 @@  discard block
 block discarded – undo
210 210
         foreach ($editData as $editDatum) {
211 211
             // If non-mainspace, prepend namespace to the titles.
212 212
             $ns = $editDatum['page_namespace'];
213
-            $nsTitle = $ns > 0 ? $namespaces[$editDatum['page_namespace']] . ':' : '';
214
-            $pageTitle = $nsTitle . $editDatum['page_title'];
213
+            $nsTitle = $ns > 0 ? $namespaces[$editDatum['page_namespace']].':' : '';
214
+            $pageTitle = $nsTitle.$editDatum['page_title'];
215 215
             $editDatum['displaytitle'] = $displayTitles[$pageTitle];
216 216
             // $editDatum['page_title'] is retained without the namespace
217 217
             //  so we can link to TopEdits for that page
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
         // Send all to the template.
272 272
         return $this->render('topedits/result_article.html.twig', [
273 273
             'xtPage' => 'topedits',
274
-            'xtTitle' => $user->getUsername() . ' - ' . $page->getTitle(),
274
+            'xtTitle' => $user->getUsername().' - '.$page->getTitle(),
275 275
             'project' => $project,
276 276
             'user' => $user,
277 277
             'page' => $page,
Please login to merge, or discard this patch.
src/Xtools/ProjectRepository.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -251,9 +251,9 @@
 block discarded – undo
251 251
         $conn = $this->getProjectsConnection();
252 252
         $pageTable = $this->getTableName($project->getDatabaseName(), 'page');
253 253
         $query = "SELECT page_id "
254
-             . " FROM $pageTable "
255
-             . " WHERE page_namespace = :ns AND page_title = :title AND page_len > 0 "
256
-             . " LIMIT 1";
254
+                . " FROM $pageTable "
255
+                . " WHERE page_namespace = :ns AND page_title = :title AND page_len > 0 "
256
+                . " LIMIT 1";
257 257
         $params = [
258 258
             'ns' => $namespaceId,
259 259
             'title' => $pageTitle,
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
                     || $projMetadata['url'] == "https://$project"
149 149
                     || $projMetadata['url'] == "https://$project.org"
150 150
                     || $projMetadata['url'] == "https://www.$project") {
151
-                    $this->log->debug(__METHOD__ . " Using cached data for $project");
151
+                    $this->log->debug(__METHOD__." Using cached data for $project");
152 152
                     return $projMetadata;
153 153
                 }
154 154
             }
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
         }
205 205
 
206 206
         // Redis cache
207
-        $cacheKey = "projectMetadata." . preg_replace("/[^A-Za-z0-9]/", '', $projectUrl);
207
+        $cacheKey = "projectMetadata.".preg_replace("/[^A-Za-z0-9]/", '', $projectUrl);
208 208
         if ($this->cache->hasItem($cacheKey)) {
209 209
             $this->metadata = $this->cache->getItem($cacheKey)->get();
210 210
             return $this->metadata;
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
         $optedIn = $this->container->getParameter('opted_in');
285 285
         // In case there's just one given.
286 286
         if (!is_array($optedIn)) {
287
-            $optedIn = [ $optedIn ];
287
+            $optedIn = [$optedIn];
288 288
         }
289 289
         return $optedIn;
290 290
     }
Please login to merge, or discard this patch.
src/AppBundle/Controller/AdminScoreController.php 2 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,6 @@
 block discarded – undo
9 9
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
10 10
 use Symfony\Component\HttpFoundation\Request;
11 11
 use Symfony\Component\HttpFoundation\Response;
12
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
13 12
 use DateTime;
14 13
 use Xtools\ProjectRepository;
15 14
 use Xtools\UserRepository;
Please login to merge, or discard this patch.
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -47,9 +47,9 @@  discard block
 block discarded – undo
47 47
         $username = $request->query->get('username', $request->query->get('user'));
48 48
 
49 49
         if ($projectQuery != '' && $username != '') {
50
-            return $this->redirectToRoute('AdminScoreResult', [ 'project' => $projectQuery, 'username' => $username ]);
50
+            return $this->redirectToRoute('AdminScoreResult', ['project' => $projectQuery, 'username' => $username]);
51 51
         } elseif ($projectQuery != '' && $project === null) {
52
-            return $this->redirectToRoute('AdminScoreProject', [ 'project' => $projectQuery ]);
52
+            return $this->redirectToRoute('AdminScoreProject', ['project' => $projectQuery]);
53 53
         }
54 54
 
55 55
         // Set default project so we can populate the namespace selector.
@@ -96,20 +96,20 @@  discard block
 block discarded – undo
96 96
 
97 97
         // MULTIPLIERS (to review)
98 98
         $multipliers = [
99
-            'account-age-mult' => 1.25,             # 0 if = 365 jours
100
-            'edit-count-mult' => 1.25,              # 0 if = 10 000
101
-            'user-page-mult' => 0.1,                # 0 if =
102
-            'patrols-mult' => 1,                    # 0 if =
103
-            'blocks-mult' => 1.4,                   # 0 if = 10
99
+            'account-age-mult' => 1.25, # 0 if = 365 jours
100
+            'edit-count-mult' => 1.25, # 0 if = 10 000
101
+            'user-page-mult' => 0.1, # 0 if =
102
+            'patrols-mult' => 1, # 0 if =
103
+            'blocks-mult' => 1.4, # 0 if = 10
104 104
             'afd-mult' => 1.15,
105
-            'recent-activity-mult' => 0.9,          # 0 if =
105
+            'recent-activity-mult' => 0.9, # 0 if =
106 106
             'aiv-mult' => 1.15,
107
-            'edit-summaries-mult' => 0.8,           # 0 if =
108
-            'namespaces-mult' => 1.0,               # 0 if =
109
-            'pages-created-live-mult' => 1.4,       # 0 if =
110
-            'pages-created-deleted-mult' => 1.4,    # 0 if =
111
-            'rpp-mult' => 1.15,                     # 0 if =
112
-            'user-rights-mult' => 0.75,             # 0 if =
107
+            'edit-summaries-mult' => 0.8, # 0 if =
108
+            'namespaces-mult' => 1.0, # 0 if =
109
+            'pages-created-live-mult' => 1.4, # 0 if =
110
+            'pages-created-deleted-mult' => 1.4, # 0 if =
111
+            'rpp-mult' => 1.15, # 0 if =
112
+            'user-rights-mult' => 0.75, # 0 if =
113 113
         ];
114 114
 
115 115
         // Grab the connection to the replica database (which is separate from the above)
@@ -193,14 +193,14 @@  discard block
 block discarded – undo
193 193
                 $now = new DateTime();
194 194
                 $date = new DateTime($value);
195 195
                 $diff = $date->diff($now);
196
-                $formula = 365 * $diff->format("%y") + 30 * $diff->format("%m") + $diff->format("%d");
197
-                $value = $formula - 365;
196
+                $formula = 365 * $diff->format("%y")+30 * $diff->format("%m")+$diff->format("%d");
197
+                $value = $formula-365;
198 198
             }
199 199
 
200 200
             if ($key === "id") {
201 201
                 $id = $value;
202 202
             } else {
203
-                $multiplierKey = $row['source'] . '-mult';
203
+                $multiplierKey = $row['source'].'-mult';
204 204
                 $multiplier = isset($multipliers[$multiplierKey]) ? $multipliers[$multiplierKey] : 1;
205 205
                 $score = max(min($value * $multiplier, 100), -100);
206 206
                 $master[$key]["mult"] = $multiplier;
@@ -211,8 +211,8 @@  discard block
 block discarded – undo
211 211
         }
212 212
 
213 213
         if ($id == 0) {
214
-            $this->addFlash("notice", [ "no-result", $username ]);
215
-            return $this->redirectToRoute("AdminScore", [ "project" => $project ]);
214
+            $this->addFlash("notice", ["no-result", $username]);
215
+            return $this->redirectToRoute("AdminScore", ["project" => $project]);
216 216
         }
217 217
 
218 218
         return $this->render('adminscore/result.html.twig', [
Please login to merge, or discard this patch.
src/AppBundle/Controller/DefaultController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
     public function loginAction()
91 91
     {
92 92
         try {
93
-            list( $next, $token ) = $this->getOauthClient()->initiate();
93
+            list($next, $token) = $this->getOauthClient()->initiate();
94 94
         } catch (Exception $oauthException) {
95 95
             throw $oauthException;
96 96
             // @TODO Make this work.
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
                     . '/index.php?title=Special:OAuth';
156 156
         $conf = new ClientConfig($endpoint);
157 157
         $consumerKey = $this->getParameter('oauth_key');
158
-        $consumerSecret =  $this->getParameter('oauth_secret');
158
+        $consumerSecret = $this->getParameter('oauth_secret');
159 159
         $conf->setConsumer(new Consumer($consumerKey, $consumerSecret));
160 160
         $this->oauthClient = new Client($conf);
161 161
         // Callback URL is hardcoded in the consumer registration.
Please login to merge, or discard this patch.
src/Xtools/Project.php 3 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,6 @@
 block discarded – undo
6 6
 namespace Xtools;
7 7
 
8 8
 use Mediawiki\Api\MediawikiApi;
9
-use Symfony\Component\VarDumper\VarDumper;
10 9
 
11 10
 /**
12 11
  * A Project is a single wiki that XTools is querying.
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -200,7 +200,7 @@
 block discarded – undo
200 200
     /**
201 201
      * Get an array of this project's namespaces and their IDs.
202 202
      *
203
-     * @return string[] Keys are IDs, values are names.
203
+     * @return string Keys are IDs, values are names.
204 204
      */
205 205
     public function getNamespaces()
206 206
     {
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
      */
118 118
     public function getUrl($withTrailingSlash = true)
119 119
     {
120
-        return rtrim($this->getBasicInfo()['url'], '/') . ($withTrailingSlash ? '/' : '');
120
+        return rtrim($this->getBasicInfo()['url'], '/').($withTrailingSlash ? '/' : '');
121 121
     }
122 122
 
123 123
     /**
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
         $metadata = $this->getMetadata();
175 175
         return isset($metadata['general']['script'])
176 176
             ? $metadata['general']['script']
177
-            : $this->getScriptPath() . '/index.php';
177
+            : $this->getScriptPath().'/index.php';
178 178
     }
179 179
 
180 180
     /**
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
      */
185 185
     public function getApiUrl()
186 186
     {
187
-        return rtrim($this->getUrl(), '/') . $this->getRepository()->getApiPath();
187
+        return rtrim($this->getUrl(), '/').$this->getRepository()->getApiPath();
188 188
     }
189 189
 
190 190
     /**
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
      */
217 217
     public function userOptInPage(User $user)
218 218
     {
219
-        $localPageName = 'User:' . $user->getUsername() . '/EditCounterOptIn.js';
219
+        $localPageName = 'User:'.$user->getUsername().'/EditCounterOptIn.js';
220 220
         return $localPageName;
221 221
     }
222 222
 
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
250 250
         }
251 251
 
252 252
         // 4. Lastly, see if they've opted in globally on the default project or Meta.
253
-        $globalPageName = $user->getUsername() . '/EditCounterGlobalOptIn.js';
253
+        $globalPageName = $user->getUsername().'/EditCounterGlobalOptIn.js';
254 254
         $globalProject = $this->getRepository()->getGlobalProject();
255 255
         if ($globalProject instanceof Project) {
256 256
             $globalExists = $globalProject->getRepository()
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
      */
270 270
     public function hasPageAssessments()
271 271
     {
272
-        return (bool) $this->getRepository()->getAssessmentsConfig($this->getDomain());
272
+        return (bool)$this->getRepository()->getAssessmentsConfig($this->getDomain());
273 273
     }
274 274
 
275 275
     /**
@@ -282,9 +282,9 @@  discard block
 block discarded – undo
282 282
         $config = $this->getRepository()->getAssessmentsConfig($this->getDomain());
283 283
 
284 284
         if (isset($config['class'][$class])) {
285
-            return "https://upload.wikimedia.org/wikipedia/commons/" . $config['class'][$class]['badge'];
285
+            return "https://upload.wikimedia.org/wikipedia/commons/".$config['class'][$class]['badge'];
286 286
         } elseif (isset($config['class']['Unknown'])) {
287
-            return "https://upload.wikimedia.org/wikipedia/commons/" . $config['class']['Unknown']['badge'];
287
+            return "https://upload.wikimedia.org/wikipedia/commons/".$config['class']['Unknown']['badge'];
288 288
         } else {
289 289
             return "";
290 290
         }
Please login to merge, or discard this patch.
src/AppBundle/Controller/MetaController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
         $end = $request->query->get('end');
32 32
 
33 33
         if ($start != '' && $end != '') {
34
-            return $this->redirectToRoute('MetaResult', [ 'start' => $start, 'end' => $end ]);
34
+            return $this->redirectToRoute('MetaResult', ['start' => $start, 'end' => $end]);
35 35
         }
36 36
 
37 37
         return $this->render('meta/index.html.twig', [
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
         $timeline = [];
74 74
         $startObj = new DateTime($start);
75 75
         $endObj = new DateTime($end);
76
-        $numDays = (int) $endObj->diff($startObj)->format("%a");
76
+        $numDays = (int)$endObj->diff($startObj)->format("%a");
77 77
         $grandSum = 0;
78 78
 
79 79
         // Generate array of date labels
@@ -85,17 +85,17 @@  discard block
 block discarded – undo
85 85
 
86 86
         foreach ($data as $entry) {
87 87
             if (!isset($totals[$entry['tool']])) {
88
-                $totals[$entry['tool']] = (int) $entry['count'];
88
+                $totals[$entry['tool']] = (int)$entry['count'];
89 89
 
90 90
                 // Create arrays for each tool, filled with zeros for each date in the timeline
91 91
                 $timeline[$entry['tool']] = array_fill(0, $numDays, 0);
92 92
             } else {
93
-                $totals[$entry['tool']] += (int) $entry['count'];
93
+                $totals[$entry['tool']] += (int)$entry['count'];
94 94
             }
95 95
 
96 96
             $date = new DateTime($entry['date']);
97
-            $dateIndex = (int) $date->diff($startObj)->format("%a");
98
-            $timeline[$entry['tool']][$dateIndex] = (int) $entry['count'];
97
+            $dateIndex = (int)$date->diff($startObj)->format("%a");
98
+            $timeline[$entry['tool']][$dateIndex] = (int)$entry['count'];
99 99
 
100 100
             $grandSum += $entry['count'];
101 101
         }
Please login to merge, or discard this patch.