Completed
Pull Request — master (#86)
by Sam
03:09
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/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   +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/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/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.