Completed
Pull Request — master (#86)
by Sam
04:58 queued 02:14
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/Twig/Extension.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
         }
46 46
 
47 47
         // Find the path, and complain if English doesn't exist.
48
-        $path = $this->container->getParameter("kernel.root_dir") . '/../i18n';
48
+        $path = $this->container->getParameter("kernel.root_dir").'/../i18n';
49 49
         if (!file_exists("$path/en.json")) {
50 50
             throw new Exception("Language directory doesn't exist: $path");
51 51
         }
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/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   +16 added lines, -16 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.
@@ -95,20 +95,20 @@  discard block
 block discarded – undo
95 95
         $archiveTable = $projectRepo->getTableName($dbName, 'archive');
96 96
 
97 97
         // MULTIPLIERS (to review)
98
-        $ACCT_AGE_MULT = 1.25;   # 0 if = 365 jours
99
-        $EDIT_COUNT_MULT = 1.25;     # 0 if = 10 000
100
-        $USER_PAGE_MULT = 0.1;     # 0 if =
98
+        $ACCT_AGE_MULT = 1.25; # 0 if = 365 jours
99
+        $EDIT_COUNT_MULT = 1.25; # 0 if = 10 000
100
+        $USER_PAGE_MULT = 0.1; # 0 if =
101 101
         $PATROLS_MULT = 1; # 0 if =
102
-        $BLOCKS_MULT = 1.4;     # 0 if = 10
102
+        $BLOCKS_MULT = 1.4; # 0 if = 10
103 103
         $AFD_MULT = 1.15;
104
-        $RECENT_ACTIVITY_MULT = 0.9;     # 0 if =
104
+        $RECENT_ACTIVITY_MULT = 0.9; # 0 if =
105 105
         $AIV_MULT = 1.15;
106
-        $EDIT_SUMMARIES_MULT = 0.8;   # 0 if =
107
-        $NAMESPACES_MULT = 1.0;     # 0 if =
106
+        $EDIT_SUMMARIES_MULT = 0.8; # 0 if =
107
+        $NAMESPACES_MULT = 1.0; # 0 if =
108 108
         $PAGES_CREATED_LIVE_MULT = 1.4; # 0 if =
109 109
         $PAGES_CREATED_ARCHIVE_MULT = 1.4; # 0 if =
110
-        $RPP_MULT = 1.15;     # 0 if =
111
-        $USERRIGHTS_MULT = 0.75;   # 0 if =
110
+        $RPP_MULT = 1.15; # 0 if =
111
+        $USERRIGHTS_MULT = 0.75; # 0 if =
112 112
 
113 113
         // Grab the connection to the replica database (which is separate from the above)
114 114
         $conn = $this->get('doctrine')->getManager("replicas")->getConnection();
@@ -186,15 +186,15 @@  discard block
 block discarded – undo
186 186
                 $now = new DateTime();
187 187
                 $date = new DateTime($value);
188 188
                 $diff = $date->diff($now);
189
-                $formula = 365*$diff->format("%y")+30*$diff->format("%m")+$diff->format("%d");
189
+                $formula = 365 * $diff->format("%y")+30 * $diff->format("%m")+$diff->format("%d");
190 190
                 $value = $formula-365;
191 191
             }
192 192
 
193 193
             if ($key == "id") {
194 194
                 $id = $value;
195 195
             } else {
196
-                $multiplierKey = strtoupper($row["source"] . "_MULT");
197
-                $multiplier = ( isset($$multiplierKey) ? $$multiplierKey : 1 );
196
+                $multiplierKey = strtoupper($row["source"]."_MULT");
197
+                $multiplier = (isset($$multiplierKey) ? $$multiplierKey : 1);
198 198
                 $score = max(min($value * $multiplier, 100), -100);
199 199
                 $master[$key]["mult"] = $multiplier;
200 200
                 $master[$key]["value"] = $value;
@@ -204,8 +204,8 @@  discard block
 block discarded – undo
204 204
         }
205 205
 
206 206
         if ($id == 0) {
207
-            $this->addFlash("notice", [ "no-result", $username ]);
208
-            return $this->redirectToRoute("AdminScore", [ "project"=>$project ]);
207
+            $this->addFlash("notice", ["no-result", $username]);
208
+            return $this->redirectToRoute("AdminScore", ["project"=>$project]);
209 209
         }
210 210
 
211 211
         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/AppBundle/Controller/EditCounterController.php 2 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,6 @@
 block discarded – undo
12 12
 use Symfony\Component\HttpFoundation\Response;
13 13
 use Xtools\EditCounter;
14 14
 use Xtools\EditCounterRepository;
15
-use Xtools\Page;
16 15
 use Xtools\Project;
17 16
 use Xtools\ProjectRepository;
18 17
 use Xtools\User;
Please login to merge, or discard this 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/Xtools/Project.php 2 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.
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.