@@ -27,7 +27,7 @@ |
||
27 | 27 | new AppBundle\AppBundle(), |
28 | 28 | ]; |
29 | 29 | |
30 | - if (in_array($this->getEnvironment(), [ 'dev', 'test' ], true)) { |
|
30 | + if (in_array($this->getEnvironment(), ['dev', 'test'], true)) { |
|
31 | 31 | $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle(); |
32 | 32 | $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); |
33 | 33 | $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); |
@@ -251,9 +251,9 @@ |
||
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, |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | if ($projMetadata['dbname'] == "$project" |
140 | 140 | || $projMetadata['url'] == "$project" |
141 | 141 | || $projMetadata['url'] == "https://$project") { |
142 | - $this->log->debug(__METHOD__ . " Using cached data for $project"); |
|
142 | + $this->log->debug(__METHOD__." Using cached data for $project"); |
|
143 | 143 | return $projMetadata; |
144 | 144 | } |
145 | 145 | } |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | $optedIn = $this->container->getParameter('opted_in'); |
260 | 260 | // In case there's just one given. |
261 | 261 | if (!is_array($optedIn)) { |
262 | - $optedIn = [ $optedIn ]; |
|
262 | + $optedIn = [$optedIn]; |
|
263 | 263 | } |
264 | 264 | return $optedIn; |
265 | 265 | } |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Xtools; |
4 | 4 | |
5 | 5 | use Xtools\User; |
6 | -use AppBundle\Helper\AutomatedEditsHelper; |
|
7 | 6 | use DateTime; |
8 | 7 | |
9 | 8 | /** |
@@ -46,11 +46,11 @@ discard block |
||
46 | 46 | $this->page = $page; |
47 | 47 | |
48 | 48 | // Copy over supported attributes |
49 | - $this->id = (int) $attrs['id']; |
|
49 | + $this->id = (int)$attrs['id']; |
|
50 | 50 | $this->timestamp = DateTime::createFromFormat('YmdHis', $attrs['timestamp']); |
51 | 51 | $this->minor = $attrs['minor'] === '1'; |
52 | - $this->length = (int) $attrs['length']; |
|
53 | - $this->length_change = (int) $attrs['length_change']; |
|
52 | + $this->length = (int)$attrs['length']; |
|
53 | + $this->length_change = (int)$attrs['length_change']; |
|
54 | 54 | $this->user = new User($attrs['username']); |
55 | 55 | $this->comment = $attrs['comment']; |
56 | 56 | } |
@@ -179,8 +179,8 @@ discard block |
||
179 | 179 | public function getDiffUrl() |
180 | 180 | { |
181 | 181 | $project = $this->getProject(); |
182 | - $path = str_replace('$1', 'Special:Diff/' . $this->id, $project->getArticlePath()); |
|
183 | - return rtrim($project->getUrl(), '/') . $path; |
|
182 | + $path = str_replace('$1', 'Special:Diff/'.$this->id, $project->getArticlePath()); |
|
183 | + return rtrim($project->getUrl(), '/').$path; |
|
184 | 184 | } |
185 | 185 | |
186 | 186 | /** |
@@ -190,8 +190,8 @@ discard block |
||
190 | 190 | public function getPermaUrl() |
191 | 191 | { |
192 | 192 | $project = $this->getProject(); |
193 | - $path = str_replace('$1', 'Special:PermaLink/' . $this->id, $project->getArticlePath()); |
|
194 | - return rtrim($project->getUrl(), '/') . $path; |
|
193 | + $path = str_replace('$1', 'Special:PermaLink/'.$this->id, $project->getArticlePath()); |
|
194 | + return rtrim($project->getUrl(), '/').$path; |
|
195 | 195 | } |
196 | 196 | |
197 | 197 | /** |
@@ -2,13 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace AppBundle\Controller; |
4 | 4 | |
5 | -use AppBundle\Helper\AutomatedEditsHelper; |
|
6 | -use Exception; |
|
7 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
|
8 | 5 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
9 | -use Symfony\Component\HttpFoundation\Request; |
|
10 | 6 | use Symfony\Component\HttpFoundation\Response; |
11 | -use Symfony\Component\Debug\Exception\FatalErrorException; |
|
12 | 7 | use FOS\RestBundle\Controller\Annotations as Rest; |
13 | 8 | use FOS\RestBundle\Controller\FOSRestController; |
14 | 9 | use FOS\RestBundle\View\View; |
@@ -139,7 +139,7 @@ |
||
139 | 139 | } |
140 | 140 | |
141 | 141 | $conn = $this->getDoctrine()->getManager('default')->getConnection(); |
142 | - $date = date('Y-m-d'); |
|
142 | + $date = date('Y-m-d'); |
|
143 | 143 | |
144 | 144 | // Increment count in timeline |
145 | 145 | $existsSql = "SELECT 1 FROM usage_timeline |
@@ -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; |
@@ -47,9 +47,9 @@ discard block |
||
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 != '') { |
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 |
||
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 |
||
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 |
||
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', [ |
@@ -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 | { |
@@ -235,7 +235,7 @@ |
||
235 | 235 | $classAttrs = $config['class']['Unknown']; |
236 | 236 | $assessment['class']['value'] = '???'; |
237 | 237 | $assessment['class']['category'] = $classAttrs['category']; |
238 | - $assessment['class']['badge'] = "https://upload.wikimedia.org/wikipedia/commons/". $classAttrs['badge']; |
|
238 | + $assessment['class']['badge'] = "https://upload.wikimedia.org/wikipedia/commons/".$classAttrs['badge']; |
|
239 | 239 | } else { |
240 | 240 | $classAttrs = $config['class'][$classValue]; |
241 | 241 | $assessment['class'] = [ |
@@ -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 | /** |
@@ -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; |
@@ -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_labs' => $this->project->getRepository()->isLabs(), |