@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | |
49 | 49 | // If we've got a project and user, redirect to results. |
50 | 50 | if ($projectName != '' && $username != '') { |
51 | - $routeParams = [ 'project' => $projectName, 'username' => $username ]; |
|
51 | + $routeParams = ['project' => $projectName, 'username' => $username]; |
|
52 | 52 | return $this->redirectToRoute('SimpleEditCounterResult', $routeParams); |
53 | 53 | } |
54 | 54 | |
@@ -120,8 +120,8 @@ discard block |
||
120 | 120 | $resultQuery->execute(); |
121 | 121 | |
122 | 122 | if ($resultQuery->errorCode() > 0) { |
123 | - $this->addFlash('notice', [ 'no-result', $username ]); |
|
124 | - return $this->redirectToRoute('SimpleEditCounterProject', [ 'project' => $project->getDomain() ]); |
|
123 | + $this->addFlash('notice', ['no-result', $username]); |
|
124 | + return $this->redirectToRoute('SimpleEditCounterProject', ['project' => $project->getDomain()]); |
|
125 | 125 | } |
126 | 126 | |
127 | 127 | // Fetch the result data |
@@ -145,16 +145,16 @@ discard block |
||
145 | 145 | $rev = $row['value']; |
146 | 146 | } |
147 | 147 | if ($row['source'] == 'groups') { |
148 | - $groups .= $row['value']. ', '; |
|
148 | + $groups .= $row['value'].', '; |
|
149 | 149 | } |
150 | 150 | } |
151 | 151 | |
152 | 152 | // Unknown user - If the user is created the $results variable will have 3 entries. |
153 | 153 | // This is a workaround to detect non-existent IPs. |
154 | 154 | if (count($results) < 3 && $arch == 0 && $rev == 0) { |
155 | - $this->addFlash('notice', [ 'no-result', $username ]); |
|
155 | + $this->addFlash('notice', ['no-result', $username]); |
|
156 | 156 | |
157 | - return $this->redirectToRoute('SimpleEditCounterProject', [ 'project' => $project->getDomain() ]); |
|
157 | + return $this->redirectToRoute('SimpleEditCounterProject', ['project' => $project->getDomain()]); |
|
158 | 158 | } |
159 | 159 | |
160 | 160 | // Remove the last comma and space |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | 'project' => $project, |
184 | 184 | 'id' => $id, |
185 | 185 | 'arch' => $arch, |
186 | - 'rev' => $rev + $arch, |
|
186 | + 'rev' => $rev+$arch, |
|
187 | 187 | 'live' => $rev, |
188 | 188 | 'groups' => $groups, |
189 | 189 | 'globalGroups' => $globalGroups, |
@@ -150,7 +150,7 @@ |
||
150 | 150 | // $tableExtension in order to generate the new table name |
151 | 151 | if ($this->isLabs() && $tableExtension !== null) { |
152 | 152 | $mapped = true; |
153 | - $tableName = $tableName . '_' . $tableExtension; |
|
153 | + $tableName = $tableName.'_'.$tableExtension; |
|
154 | 154 | } elseif ($this->container->hasParameter("app.table.$tableName")) { |
155 | 155 | // Use the table specified in the table mapping configuration, if present. |
156 | 156 | $mapped = true; |
@@ -117,7 +117,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | } |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | if ($projMetadata['dbName'] == "$project" |
147 | 147 | || $projMetadata['url'] == "$project" |
148 | 148 | || $projMetadata['url'] == "https://$project") { |
149 | - $this->log->debug(__METHOD__ . " Using cached data for $project"); |
|
149 | + $this->log->debug(__METHOD__." Using cached data for $project"); |
|
150 | 150 | return $projMetadata; |
151 | 151 | } |
152 | 152 | } |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | } |
201 | 201 | |
202 | 202 | // Redis cache |
203 | - $cacheKey = "projectMetadata." . preg_replace("/[^A-Za-z0-9]/", '', $projectUrl); |
|
203 | + $cacheKey = "projectMetadata.".preg_replace("/[^A-Za-z0-9]/", '', $projectUrl); |
|
204 | 204 | if ($this->cache->hasItem($cacheKey)) { |
205 | 205 | $this->metadata = $this->cache->getItem($cacheKey)->get(); |
206 | 206 | return $this->metadata; |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | $optedIn = $this->container->getParameter('opted_in'); |
281 | 281 | // In case there's just one given. |
282 | 282 | if (!is_array($optedIn)) { |
283 | - $optedIn = [ $optedIn ]; |
|
283 | + $optedIn = [$optedIn]; |
|
284 | 284 | } |
285 | 285 | return $optedIn; |
286 | 286 | } |
@@ -47,8 +47,8 @@ |
||
47 | 47 | $this->assertEquals(200, $client->getResponse()->getStatusCode()); |
48 | 48 | |
49 | 49 | // Check that a correct namespace value was returned |
50 | - $response = (array) json_decode($client->getResponse()->getContent()); |
|
51 | - $namespaces = (array) $response['namespaces']; |
|
50 | + $response = (array)json_decode($client->getResponse()->getContent()); |
|
51 | + $namespaces = (array)$response['namespaces']; |
|
52 | 52 | $this->assertEquals('Utilisateur', array_values($namespaces)[2]); // User in French |
53 | 53 | } |
54 | 54 | } |
@@ -78,10 +78,10 @@ discard block |
||
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 |
||
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, |
@@ -30,32 +30,32 @@ discard block |
||
30 | 30 | { |
31 | 31 | $options = ['is_safe' => ['html']]; |
32 | 32 | return [ |
33 | - new \Twig_SimpleFunction('request_time', [ $this, 'requestTime' ], $options), |
|
34 | - new \Twig_SimpleFunction('memory_usage', [ $this, 'requestMemory' ], $options), |
|
35 | - new \Twig_SimpleFunction('year', [ $this, 'generateYear' ], $options), |
|
36 | - new \Twig_SimpleFunction('msgPrintExists', [ $this, 'intuitionMessagePrintExists' ], $options), |
|
37 | - new \Twig_SimpleFunction('msgExists', [ $this, 'intuitionMessageExists' ], $options), |
|
38 | - new \Twig_SimpleFunction('msg', [ $this, 'intuitionMessage' ], $options), |
|
39 | - new \Twig_SimpleFunction('lang', [ $this, 'getLang' ], $options), |
|
40 | - new \Twig_SimpleFunction('langName', [ $this, 'getLangName' ], $options), |
|
41 | - new \Twig_SimpleFunction('allLangs', [ $this, 'getAllLangs' ]), |
|
42 | - new \Twig_SimpleFunction('isRTL', [ $this, 'intuitionIsRTL' ]), |
|
43 | - new \Twig_SimpleFunction('isRTLLang', [ $this, 'intuitionIsRTLLang' ]), |
|
44 | - new \Twig_SimpleFunction('shortHash', [ $this, 'gitShortHash' ]), |
|
45 | - new \Twig_SimpleFunction('hash', [ $this, 'gitHash' ]), |
|
46 | - new \Twig_SimpleFunction('enabled', [ $this, 'tabEnabled' ]), |
|
47 | - new \Twig_SimpleFunction('tools', [ $this, 'allTools' ]), |
|
48 | - new \Twig_SimpleFunction('color', [ $this, 'getColorList' ]), |
|
49 | - new \Twig_SimpleFunction('chartColor', [ $this, 'chartColor' ]), |
|
50 | - new \Twig_SimpleFunction('isWMFLabs', [ $this, 'isWMFLabs' ]), |
|
51 | - new \Twig_SimpleFunction('isSingleWiki', [ $this, 'isSingleWiki' ]), |
|
52 | - new \Twig_SimpleFunction('getReplagThreshold', [ $this, 'getReplagThreshold' ]), |
|
53 | - new \Twig_SimpleFunction('loadStylesheetsFromCDN', [ $this, 'loadStylesheetsFromCDN' ]), |
|
54 | - new \Twig_SimpleFunction('isWMFLabs', [ $this, 'isWMFLabs' ]), |
|
55 | - new \Twig_SimpleFunction('replag', [ $this, 'replag' ]), |
|
56 | - new \Twig_SimpleFunction('link', [ $this, 'link' ]), |
|
57 | - new \Twig_SimpleFunction('quote', [ $this, 'quote' ]), |
|
58 | - new \Twig_SimpleFunction('bugReportURL', [ $this, 'bugReportURL' ]), |
|
33 | + new \Twig_SimpleFunction('request_time', [$this, 'requestTime'], $options), |
|
34 | + new \Twig_SimpleFunction('memory_usage', [$this, 'requestMemory'], $options), |
|
35 | + new \Twig_SimpleFunction('year', [$this, 'generateYear'], $options), |
|
36 | + new \Twig_SimpleFunction('msgPrintExists', [$this, 'intuitionMessagePrintExists'], $options), |
|
37 | + new \Twig_SimpleFunction('msgExists', [$this, 'intuitionMessageExists'], $options), |
|
38 | + new \Twig_SimpleFunction('msg', [$this, 'intuitionMessage'], $options), |
|
39 | + new \Twig_SimpleFunction('lang', [$this, 'getLang'], $options), |
|
40 | + new \Twig_SimpleFunction('langName', [$this, 'getLangName'], $options), |
|
41 | + new \Twig_SimpleFunction('allLangs', [$this, 'getAllLangs']), |
|
42 | + new \Twig_SimpleFunction('isRTL', [$this, 'intuitionIsRTL']), |
|
43 | + new \Twig_SimpleFunction('isRTLLang', [$this, 'intuitionIsRTLLang']), |
|
44 | + new \Twig_SimpleFunction('shortHash', [$this, 'gitShortHash']), |
|
45 | + new \Twig_SimpleFunction('hash', [$this, 'gitHash']), |
|
46 | + new \Twig_SimpleFunction('enabled', [$this, 'tabEnabled']), |
|
47 | + new \Twig_SimpleFunction('tools', [$this, 'allTools']), |
|
48 | + new \Twig_SimpleFunction('color', [$this, 'getColorList']), |
|
49 | + new \Twig_SimpleFunction('chartColor', [$this, 'chartColor']), |
|
50 | + new \Twig_SimpleFunction('isWMFLabs', [$this, 'isWMFLabs']), |
|
51 | + new \Twig_SimpleFunction('isSingleWiki', [$this, 'isSingleWiki']), |
|
52 | + new \Twig_SimpleFunction('getReplagThreshold', [$this, 'getReplagThreshold']), |
|
53 | + new \Twig_SimpleFunction('loadStylesheetsFromCDN', [$this, 'loadStylesheetsFromCDN']), |
|
54 | + new \Twig_SimpleFunction('isWMFLabs', [$this, 'isWMFLabs']), |
|
55 | + new \Twig_SimpleFunction('replag', [$this, 'replag']), |
|
56 | + new \Twig_SimpleFunction('link', [$this, 'link']), |
|
57 | + new \Twig_SimpleFunction('quote', [$this, 'quote']), |
|
58 | + new \Twig_SimpleFunction('bugReportURL', [$this, 'bugReportURL']), |
|
59 | 59 | new \Twig_SimpleFunction('logged_in_user', [$this, 'functionLoggedInUser']), |
60 | 60 | new \Twig_SimpleFunction('isUserAnon', [$this, 'isUserAnon']), |
61 | 61 | new \Twig_SimpleFunction('nsName', [$this, 'nsName']), |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | */ |
70 | 70 | public function requestTime($decimals = 3) |
71 | 71 | { |
72 | - return number_format(microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'], $decimals); |
|
72 | + return number_format(microtime(true)-$_SERVER['REQUEST_TIME_FLOAT'], $decimals); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | /** |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | */ |
103 | 103 | public function intuitionMessageExists($message = "") |
104 | 104 | { |
105 | - return $this->getIntuition()->msgExists($message, [ "domain" => "xtools" ]); |
|
105 | + return $this->getIntuition()->msgExists($message, ["domain" => "xtools"]); |
|
106 | 106 | } |
107 | 107 | |
108 | 108 | /** |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | */ |
134 | 134 | public function intuitionMessage($message = "", $vars = []) |
135 | 135 | { |
136 | - return $this->getIntuition()->msg($message, [ "domain" => "xtools", "variables" => $vars ]); |
|
136 | + return $this->getIntuition()->msg($message, ["domain" => "xtools", "variables" => $vars]); |
|
137 | 137 | } |
138 | 138 | |
139 | 139 | /** |
@@ -162,10 +162,10 @@ discard block |
||
162 | 162 | */ |
163 | 163 | public function getAllLangs() |
164 | 164 | { |
165 | - $messageFiles = glob($this->container->getParameter("kernel.root_dir") . '/../i18n/*.json'); |
|
165 | + $messageFiles = glob($this->container->getParameter("kernel.root_dir").'/../i18n/*.json'); |
|
166 | 166 | |
167 | 167 | $languages = array_values(array_unique(array_map( |
168 | - function ($filename) { |
|
168 | + function($filename) { |
|
169 | 169 | return basename($filename, '.json'); |
170 | 170 | }, |
171 | 171 | $messageFiles |
@@ -513,8 +513,8 @@ discard block |
||
513 | 513 | public function getFilters() |
514 | 514 | { |
515 | 515 | return [ |
516 | - new \Twig_SimpleFilter('capitalize_first', [ $this, 'capitalizeFirst' ]), |
|
517 | - new \Twig_SimpleFilter('percent_format', [ $this, 'percentFormat' ]), |
|
516 | + new \Twig_SimpleFilter('capitalize_first', [$this, 'capitalizeFirst']), |
|
517 | + new \Twig_SimpleFilter('percent_format', [$this, 'percentFormat']), |
|
518 | 518 | ]; |
519 | 519 | } |
520 | 520 | |
@@ -541,10 +541,10 @@ discard block |
||
541 | 541 | if (!$denominator) { |
542 | 542 | $quotient = $numerator; |
543 | 543 | } else { |
544 | - $quotient = ( $numerator / $denominator ) * 100; |
|
544 | + $quotient = ($numerator / $denominator) * 100; |
|
545 | 545 | } |
546 | 546 | |
547 | - return round($quotient, $precision) . '%'; |
|
547 | + return round($quotient, $precision).'%'; |
|
548 | 548 | } |
549 | 549 | |
550 | 550 | /** |
@@ -78,7 +78,7 @@ discard block |
||
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 |
||
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); |
@@ -327,7 +327,7 @@ discard block |
||
327 | 327 | |
328 | 328 | $wikidataInfo = $this->getRepository()->getWikidataInfo($this); |
329 | 329 | |
330 | - $terms = array_map(function ($entry) { |
|
330 | + $terms = array_map(function($entry) { |
|
331 | 331 | return $entry['term']; |
332 | 332 | }, $wikidataInfo); |
333 | 333 | |
@@ -338,7 +338,7 @@ discard block |
||
338 | 338 | 'prio' => 2, |
339 | 339 | 'name' => 'Wikidata', |
340 | 340 | 'notice' => "Label for language <em>$lang</em> is missing", // FIXME: i18n |
341 | - 'explanation' => "See: <a target='_blank' " . |
|
341 | + 'explanation' => "See: <a target='_blank' ". |
|
342 | 342 | "href='//www.wikidata.org/wiki/Help:Label'>Help:Label</a>", |
343 | 343 | ]; |
344 | 344 | } |
@@ -348,7 +348,7 @@ discard block |
||
348 | 348 | 'prio' => 3, |
349 | 349 | 'name' => 'Wikidata', |
350 | 350 | 'notice' => "Description for language <em>$lang</em> is missing", // FIXME: i18n |
351 | - 'explanation' => "See: <a target='_blank' " . |
|
351 | + 'explanation' => "See: <a target='_blank' ". |
|
352 | 352 | "href='//www.wikidata.org/wiki/Help:Description'>Help:Description</a>", |
353 | 353 | ]; |
354 | 354 | } |