@@ -9,7 +9,6 @@ |
||
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; |
@@ -40,9 +40,9 @@ discard block |
||
40 | 40 | $username = $request->query->get('username', $request->query->get('user')); |
41 | 41 | |
42 | 42 | if ($projectQuery != '' && $username != '') { |
43 | - return $this->redirectToRoute('AdminScoreResult', [ 'project' => $projectQuery, 'username' => $username ]); |
|
43 | + return $this->redirectToRoute('AdminScoreResult', ['project' => $projectQuery, 'username' => $username]); |
|
44 | 44 | } elseif ($projectQuery != '') { |
45 | - return $this->redirectToRoute('AdminScoreProject', [ 'project' => $projectQuery ]); |
|
45 | + return $this->redirectToRoute('AdminScoreProject', ['project' => $projectQuery]); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | // Set default project so we can populate the namespace selector. |
@@ -94,20 +94,20 @@ discard block |
||
94 | 94 | $archiveTable = $lh->getTable("archive", $dbName); |
95 | 95 | |
96 | 96 | // MULTIPLIERS (to review) |
97 | - $ACCT_AGE_MULT = 1.25; # 0 if = 365 jours |
|
98 | - $EDIT_COUNT_MULT = 1.25; # 0 if = 10 000 |
|
99 | - $USER_PAGE_MULT = 0.1; # 0 if = |
|
97 | + $ACCT_AGE_MULT = 1.25; # 0 if = 365 jours |
|
98 | + $EDIT_COUNT_MULT = 1.25; # 0 if = 10 000 |
|
99 | + $USER_PAGE_MULT = 0.1; # 0 if = |
|
100 | 100 | $PATROLS_MULT = 1; # 0 if = |
101 | - $BLOCKS_MULT = 1.4; # 0 if = 10 |
|
101 | + $BLOCKS_MULT = 1.4; # 0 if = 10 |
|
102 | 102 | $AFD_MULT = 1.15; |
103 | - $RECENT_ACTIVITY_MULT = 0.9; # 0 if = |
|
103 | + $RECENT_ACTIVITY_MULT = 0.9; # 0 if = |
|
104 | 104 | $AIV_MULT = 1.15; |
105 | - $EDIT_SUMMARIES_MULT = 0.8; # 0 if = |
|
106 | - $NAMESPACES_MULT = 1.0; # 0 if = |
|
105 | + $EDIT_SUMMARIES_MULT = 0.8; # 0 if = |
|
106 | + $NAMESPACES_MULT = 1.0; # 0 if = |
|
107 | 107 | $PAGES_CREATED_LIVE_MULT = 1.4; # 0 if = |
108 | 108 | $PAGES_CREATED_ARCHIVE_MULT = 1.4; # 0 if = |
109 | - $RPP_MULT = 1.15; # 0 if = |
|
110 | - $USERRIGHTS_MULT = 0.75; # 0 if = |
|
109 | + $RPP_MULT = 1.15; # 0 if = |
|
110 | + $USERRIGHTS_MULT = 0.75; # 0 if = |
|
111 | 111 | |
112 | 112 | // Grab the connection to the replica database (which is separate from the above) |
113 | 113 | $conn = $this->get('doctrine')->getManager("replicas")->getConnection(); |
@@ -185,15 +185,15 @@ discard block |
||
185 | 185 | $now = new DateTime(); |
186 | 186 | $date = new DateTime($value); |
187 | 187 | $diff = $date->diff($now); |
188 | - $formula = 365*$diff->format("%y")+30*$diff->format("%m")+$diff->format("%d"); |
|
188 | + $formula = 365 * $diff->format("%y")+30 * $diff->format("%m")+$diff->format("%d"); |
|
189 | 189 | $value = $formula-365; |
190 | 190 | } |
191 | 191 | |
192 | 192 | if ($key == "id") { |
193 | 193 | $id = $value; |
194 | 194 | } else { |
195 | - $multiplierKey = strtoupper($row["source"] . "_MULT"); |
|
196 | - $multiplier = ( isset($$multiplierKey) ? $$multiplierKey : 1 ); |
|
195 | + $multiplierKey = strtoupper($row["source"]."_MULT"); |
|
196 | + $multiplier = (isset($$multiplierKey) ? $$multiplierKey : 1); |
|
197 | 197 | $score = max(min($value * $multiplier, 100), -100); |
198 | 198 | $master[$key]["mult"] = $multiplier; |
199 | 199 | $master[$key]["value"] = $value; |
@@ -203,8 +203,8 @@ discard block |
||
203 | 203 | } |
204 | 204 | |
205 | 205 | if ($id == 0) { |
206 | - $this->addFlash("notice", [ "no-result", $username ]); |
|
207 | - return $this->redirectToRoute("AdminScore", [ "project"=>$project ]); |
|
206 | + $this->addFlash("notice", ["no-result", $username]); |
|
207 | + return $this->redirectToRoute("AdminScore", ["project"=>$project]); |
|
208 | 208 | } |
209 | 209 | |
210 | 210 | return $this->render('adminscore/result.html.twig', [ |
@@ -90,7 +90,7 @@ discard block |
||
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 |
||
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. |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | |
60 | 60 | /** |
61 | 61 | * Get this page's database ID. |
62 | - * @return int |
|
62 | + * @return \string|null |
|
63 | 63 | */ |
64 | 64 | public function getId() |
65 | 65 | { |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | |
70 | 70 | /** |
71 | 71 | * Get this page's length in bytes. |
72 | - * @return int |
|
72 | + * @return \string|null |
|
73 | 73 | */ |
74 | 74 | public function getLength() |
75 | 75 | { |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | |
94 | 94 | /** |
95 | 95 | * Get the full URL of this page. |
96 | - * @return string |
|
96 | + * @return \string|null |
|
97 | 97 | */ |
98 | 98 | public function getUrl() |
99 | 99 | { |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | |
104 | 104 | /** |
105 | 105 | * Get the numerical ID of the namespace of this page. |
106 | - * @return int |
|
106 | + * @return \string|null |
|
107 | 107 | */ |
108 | 108 | public function getNamespace() |
109 | 109 | { |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | |
114 | 114 | /** |
115 | 115 | * Get the number of page watchers. |
116 | - * @return int |
|
116 | + * @return \string|null |
|
117 | 117 | */ |
118 | 118 | public function getWatchers() |
119 | 119 | { |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | |
25 | 25 | /** |
26 | 26 | * Get all functions that this class provides. |
27 | - * @return array |
|
27 | + * @return \Twig_SimpleFunction[] |
|
28 | 28 | */ |
29 | 29 | public function getFunctions() |
30 | 30 | { |
@@ -520,7 +520,7 @@ discard block |
||
520 | 520 | |
521 | 521 | /** |
522 | 522 | * Get all filters for this extension. |
523 | - * @return array |
|
523 | + * @return \Twig_SimpleFilter[] |
|
524 | 524 | */ |
525 | 525 | public function getFilters() |
526 | 526 | { |
@@ -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 | ]; |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | */ |
69 | 69 | public function requestTime($decimals = 3) |
70 | 70 | { |
71 | - return number_format(microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'], $decimals); |
|
71 | + return number_format(microtime(true)-$_SERVER['REQUEST_TIME_FLOAT'], $decimals); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | /** |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | */ |
102 | 102 | public function intuitionMessageExists($message = "") |
103 | 103 | { |
104 | - return $this->getIntuition()->msgExists($message, [ "domain" => "xtools" ]); |
|
104 | + return $this->getIntuition()->msgExists($message, ["domain" => "xtools"]); |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | /** |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | */ |
133 | 133 | public function intuitionMessage($message = "", $vars = []) |
134 | 134 | { |
135 | - return $this->getIntuition()->msg($message, [ "domain" => "xtools", "variables" => $vars ]); |
|
135 | + return $this->getIntuition()->msg($message, ["domain" => "xtools", "variables" => $vars]); |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | /** |
@@ -161,10 +161,10 @@ discard block |
||
161 | 161 | */ |
162 | 162 | public function getAllLangs() |
163 | 163 | { |
164 | - $messageFiles = glob($this->container->getParameter("kernel.root_dir") . '/../i18n/*.json'); |
|
164 | + $messageFiles = glob($this->container->getParameter("kernel.root_dir").'/../i18n/*.json'); |
|
165 | 165 | |
166 | 166 | $languages = array_values(array_unique(array_map( |
167 | - function ($filename) { |
|
167 | + function($filename) { |
|
168 | 168 | return basename($filename, '.json'); |
169 | 169 | }, |
170 | 170 | $messageFiles |
@@ -252,41 +252,41 @@ discard block |
||
252 | 252 | public static function getColorList($num = false) |
253 | 253 | { |
254 | 254 | $colors = [ |
255 | - 0 => '#Cc0000',# '#FF005A', #red '#FF5555', |
|
255 | + 0 => '#Cc0000', # '#FF005A', #red '#FF5555', |
|
256 | 256 | 1 => '#F7b7b7', |
257 | - 2 => '#5c8d20',# '#008800', #green'#55FF55', |
|
257 | + 2 => '#5c8d20', # '#008800', #green'#55FF55', |
|
258 | 258 | 3 => '#85eD82', |
259 | 259 | 4 => '#2E97E0', # blue |
260 | 260 | 5 => '#B9E3F9', |
261 | - 6 => '#e1711d', # orange |
|
261 | + 6 => '#e1711d', # orange |
|
262 | 262 | 7 => '#ffc04c', |
263 | 263 | 8 => '#FDFF98', # yellow |
264 | 264 | 9 => '#5555FF', |
265 | 265 | 10 => '#55FFFF', |
266 | - 11 => '#0000C0', # |
|
267 | - 12 => '#008800', # green |
|
266 | + 11 => '#0000C0', # |
|
267 | + 12 => '#008800', # green |
|
268 | 268 | 13 => '#00C0C0', |
269 | - 14 => '#FFAFAF', # rosé |
|
270 | - 15 => '#808080', # gray |
|
269 | + 14 => '#FFAFAF', # rosé |
|
270 | + 15 => '#808080', # gray |
|
271 | 271 | 16 => '#00C000', |
272 | 272 | 17 => '#404040', |
273 | - 18 => '#C0C000', # green |
|
273 | + 18 => '#C0C000', # green |
|
274 | 274 | 19 => '#C000C0', |
275 | - 100 => '#75A3D1', # blue |
|
276 | - 101 => '#A679D2', # purple |
|
275 | + 100 => '#75A3D1', # blue |
|
276 | + 101 => '#A679D2', # purple |
|
277 | 277 | 102 => '#660000', |
278 | 278 | 103 => '#000066', |
279 | - 104 => '#FAFFAF', # caramel |
|
279 | + 104 => '#FAFFAF', # caramel |
|
280 | 280 | 105 => '#408345', |
281 | 281 | 106 => '#5c8d20', |
282 | - 107 => '#e1711d', # red |
|
283 | - 108 => '#94ef2b', # light green |
|
284 | - 109 => '#756a4a', # brown |
|
282 | + 107 => '#e1711d', # red |
|
283 | + 108 => '#94ef2b', # light green |
|
284 | + 109 => '#756a4a', # brown |
|
285 | 285 | 110 => '#6f1dab', |
286 | 286 | 111 => '#301e30', |
287 | 287 | 112 => '#5c9d96', |
288 | - 113 => '#a8cd8c', # earth green |
|
289 | - 114 => '#f2b3f1', # light purple |
|
288 | + 113 => '#a8cd8c', # earth green |
|
289 | + 114 => '#f2b3f1', # light purple |
|
290 | 290 | 115 => '#9b5828', |
291 | 291 | 118 => '#99FFFF', |
292 | 292 | 119 => '#99BBFF', |
@@ -307,8 +307,8 @@ discard block |
||
307 | 307 | 446 => '#06DCFB', |
308 | 308 | 447 => '#892EE4', |
309 | 309 | 460 => '#99FF66', |
310 | - 461 => '#99CC66', # green |
|
311 | - 470 => '#CCCC33', # ocker |
|
310 | + 461 => '#99CC66', # green |
|
311 | + 470 => '#CCCC33', # ocker |
|
312 | 312 | 471 => '#CCFF33', |
313 | 313 | 480 => '#6699FF', |
314 | 314 | 481 => '#66FFFF', |
@@ -323,18 +323,18 @@ discard block |
||
323 | 323 | 1198 => '#FF34B3', |
324 | 324 | 1199 => '#8B1C62', |
325 | 325 | |
326 | - '#61a9f3',# blue |
|
327 | - '#f381b9',# pink |
|
326 | + '#61a9f3', # blue |
|
327 | + '#f381b9', # pink |
|
328 | 328 | '#61E3A9', |
329 | 329 | '#D56DE2', |
330 | 330 | '#85eD82', |
331 | 331 | '#F7b7b7', |
332 | 332 | '#CFDF49', |
333 | 333 | '#88d8f2', |
334 | - '#07AF7B',# green |
|
334 | + '#07AF7B', # green |
|
335 | 335 | '#B9E3F9', |
336 | 336 | '#FFF3AD', |
337 | - '#EF606A',# red |
|
337 | + '#EF606A', # red |
|
338 | 338 | '#EC8833', |
339 | 339 | '#FFF100', |
340 | 340 | '#87C9A5', |
@@ -525,8 +525,8 @@ discard block |
||
525 | 525 | public function getFilters() |
526 | 526 | { |
527 | 527 | return [ |
528 | - new \Twig_SimpleFilter('capitalize_first', [ $this, 'capitalizeFirst' ]), |
|
529 | - new \Twig_SimpleFilter('percent_format', [ $this, 'percentFormat' ]), |
|
528 | + new \Twig_SimpleFilter('capitalize_first', [$this, 'capitalizeFirst']), |
|
529 | + new \Twig_SimpleFilter('percent_format', [$this, 'percentFormat']), |
|
530 | 530 | ]; |
531 | 531 | } |
532 | 532 | |
@@ -553,10 +553,10 @@ discard block |
||
553 | 553 | if (!$denominator) { |
554 | 554 | $quotient = $numerator; |
555 | 555 | } else { |
556 | - $quotient = ( $numerator / $denominator ) * 100; |
|
556 | + $quotient = ($numerator / $denominator) * 100; |
|
557 | 557 | } |
558 | 558 | |
559 | - return round($quotient, $precision) . '%'; |
|
559 | + return round($quotient, $precision).'%'; |
|
560 | 560 | } |
561 | 561 | |
562 | 562 | /** |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | */ |
31 | 31 | public function intuitionMessage($message = "", $vars = []) |
32 | 32 | { |
33 | - return $this->getIntuition()->msg($message, [ "domain" => "xtools", "variables" => $vars ]); |
|
33 | + return $this->getIntuition()->msg($message, ["domain" => "xtools", "variables" => $vars]); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | /*********************************** FUNCTIONS ***********************************/ |
@@ -41,18 +41,18 @@ discard block |
||
41 | 41 | */ |
42 | 42 | public function getFunctions() |
43 | 43 | { |
44 | - $options = [ 'is_safe' => [ 'html']]; |
|
44 | + $options = ['is_safe' => ['html']]; |
|
45 | 45 | return [ |
46 | - new Twig_SimpleFunction('wiki_link', [ $this, 'wikiLink' ], $options), |
|
47 | - new Twig_SimpleFunction('user_link', [ $this, 'userLink' ], $options), |
|
48 | - new Twig_SimpleFunction('user_log_link', [ $this, 'userLogLink' ], $options), |
|
49 | - new Twig_SimpleFunction('group_link', [ $this, 'groupLink' ], $options), |
|
50 | - new Twig_SimpleFunction('wiki_history_link', [ $this, 'wikiHistoryLink' ], $options), |
|
51 | - new Twig_SimpleFunction('wiki_log_link', [ $this, 'wikiLogLink' ], $options), |
|
52 | - new Twig_SimpleFunction('pageviews_links', [ $this, 'pageviewsLinks' ], $options), |
|
53 | - new Twig_SimpleFunction('diff_link', [ $this, 'diffLink' ], $options), |
|
54 | - new Twig_SimpleFunction('perma_link', [ $this, 'permaLink' ], $options), |
|
55 | - new Twig_SimpleFunction('edit_link', [ $this, 'editLink' ], $options), |
|
46 | + new Twig_SimpleFunction('wiki_link', [$this, 'wikiLink'], $options), |
|
47 | + new Twig_SimpleFunction('user_link', [$this, 'userLink'], $options), |
|
48 | + new Twig_SimpleFunction('user_log_link', [$this, 'userLogLink'], $options), |
|
49 | + new Twig_SimpleFunction('group_link', [$this, 'groupLink'], $options), |
|
50 | + new Twig_SimpleFunction('wiki_history_link', [$this, 'wikiHistoryLink'], $options), |
|
51 | + new Twig_SimpleFunction('wiki_log_link', [$this, 'wikiLogLink'], $options), |
|
52 | + new Twig_SimpleFunction('pageviews_links', [$this, 'pageviewsLinks'], $options), |
|
53 | + new Twig_SimpleFunction('diff_link', [$this, 'diffLink'], $options), |
|
54 | + new Twig_SimpleFunction('perma_link', [$this, 'permaLink'], $options), |
|
55 | + new Twig_SimpleFunction('edit_link', [$this, 'editLink'], $options), |
|
56 | 56 | ]; |
57 | 57 | } |
58 | 58 | |
@@ -277,8 +277,8 @@ discard block |
||
277 | 277 | public function getFilters() |
278 | 278 | { |
279 | 279 | return [ |
280 | - new \Twig_SimpleFilter('diff_format', [ $this, 'diffFormat' ], [ 'is_safe' => [ 'html' ] ]), |
|
281 | - new \Twig_SimpleFilter('wikify_comment', [ $this, 'wikifyComment' ], [ 'is_safe' => [ 'html' ] ]), |
|
280 | + new \Twig_SimpleFilter('diff_format', [$this, 'diffFormat'], ['is_safe' => ['html']]), |
|
281 | + new \Twig_SimpleFilter('wikify_comment', [$this, 'wikifyComment'], ['is_safe' => ['html']]), |
|
282 | 282 | ]; |
283 | 283 | } |
284 | 284 | |
@@ -317,7 +317,7 @@ discard block |
||
317 | 317 | if ($isSection) { |
318 | 318 | $sectionTitle = $sectionMatch[1][0]; |
319 | 319 | $sectionTitleLink = str_replace(' ', '_', $sectionTitle); |
320 | - $sectionWikitext = "<a target='_blank' href='$projectUrl/wiki/$title#$sectionTitleLink'>→</a>" . |
|
320 | + $sectionWikitext = "<a target='_blank' href='$projectUrl/wiki/$title#$sectionTitleLink'>→</a>". |
|
321 | 321 | "<em class='text-muted'>$sectionTitle:</em> "; |
322 | 322 | $wikitext = str_replace($sectionMatch[0][0], $sectionWikitext, $wikitext); |
323 | 323 | } |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | |
42 | 42 | // If we've got a project and user, redirect to results. |
43 | 43 | if ($projectName != '' && $username != '') { |
44 | - $routeParams = [ 'project' => $projectName, 'username' => $username ]; |
|
44 | + $routeParams = ['project' => $projectName, 'username' => $username]; |
|
45 | 45 | return $this->redirectToRoute('SimpleEditCounterResult', $routeParams); |
46 | 46 | } |
47 | 47 | |
@@ -108,8 +108,8 @@ discard block |
||
108 | 108 | $resultQuery->execute(); |
109 | 109 | |
110 | 110 | if ($resultQuery->errorCode() > 0) { |
111 | - $this->addFlash('notice', [ 'no-result', $username ]); |
|
112 | - return $this->redirectToRoute('SimpleEditCounterProject', [ 'project' => $project->getDomain() ]); |
|
111 | + $this->addFlash('notice', ['no-result', $username]); |
|
112 | + return $this->redirectToRoute('SimpleEditCounterProject', ['project' => $project->getDomain()]); |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | // Fetch the result data |
@@ -133,16 +133,16 @@ discard block |
||
133 | 133 | $rev = $row['value']; |
134 | 134 | } |
135 | 135 | if ($row['source'] == 'groups') { |
136 | - $groups .= $row['value']. ', '; |
|
136 | + $groups .= $row['value'].', '; |
|
137 | 137 | } |
138 | 138 | } |
139 | 139 | |
140 | 140 | // Unknown user - If the user is created the $results variable will have 3 entries. |
141 | 141 | // This is a workaround to detect non-existent IPs. |
142 | 142 | if (count($results) < 3 && $arch == 0 && $rev == 0) { |
143 | - $this->addFlash('notice', [ 'no-result', $username ]); |
|
143 | + $this->addFlash('notice', ['no-result', $username]); |
|
144 | 144 | |
145 | - return $this->redirectToRoute('SimpleEditCounterProject', [ 'project' => $project->getDomain() ]); |
|
145 | + return $this->redirectToRoute('SimpleEditCounterProject', ['project' => $project->getDomain()]); |
|
146 | 146 | } |
147 | 147 | |
148 | 148 | // Remove the last comma and space |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | 'project_url' => $url, |
173 | 173 | 'id' => $id, |
174 | 174 | 'arch' => $arch, |
175 | - 'rev' => $rev + $arch, |
|
175 | + 'rev' => $rev+$arch, |
|
176 | 176 | 'live' => $rev, |
177 | 177 | 'groups' => $groups, |
178 | 178 | 'globalGroups' => $globalGroups, |
@@ -76,10 +76,10 @@ discard block |
||
76 | 76 | $username = $request->query->get('username', $request->query->get('user')); |
77 | 77 | |
78 | 78 | if (($project || $queryProject) && $username) { |
79 | - $routeParams = [ 'project'=>($project ?: $queryProject), 'username' => $username ]; |
|
79 | + $routeParams = ['project'=>($project ?: $queryProject), 'username' => $username]; |
|
80 | 80 | return $this->redirectToRoute("EditCounterResult", $routeParams); |
81 | 81 | } elseif (!$project && $queryProject) { |
82 | - return $this->redirectToRoute("EditCounterProject", [ 'project'=>$queryProject ]); |
|
82 | + return $this->redirectToRoute("EditCounterProject", ['project'=>$queryProject]); |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | $project = ProjectRepository::getProject($queryProject, $this->container); |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | $this->setUpEditCounter($project, $username); |
110 | 110 | $isSubRequest = $this->container->get('request_stack')->getParentRequest() !== null; |
111 | 111 | return $this->render('editCounter/result.html.twig', [ |
112 | - 'xtTitle' => $this->user->getUsername() . ' - ' . $this->project->getTitle(), |
|
112 | + 'xtTitle' => $this->user->getUsername().' - '.$this->project->getTitle(), |
|
113 | 113 | 'xtPage' => 'ec', |
114 | 114 | 'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..'), |
115 | 115 | 'is_labs' => $this->project->getRepository()->isLabs(), |
@@ -12,7 +12,6 @@ |
||
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; |
@@ -74,7 +74,7 @@ |
||
74 | 74 | // as required by Labs. We combine $table with |
75 | 75 | // $table_extension in order to generate the new table name |
76 | 76 | if ($this->isLabs() && $table_extension !== null) { |
77 | - $table = $table . "_" . $table_extension; |
|
77 | + $table = $table."_".$table_extension; |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | // Use the table specified in the table mapping configuration, if present. |
@@ -31,7 +31,7 @@ discard block |
||
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 |
||
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 |
||
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 | } |