@@ -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 | /** |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | $this->page = $page; |
| 50 | 50 | |
| 51 | 51 | // Copy over supported attributes |
| 52 | - $this->id = (int) $attrs['id']; |
|
| 52 | + $this->id = (int)$attrs['id']; |
|
| 53 | 53 | |
| 54 | 54 | // Allow DateTime or string (latter assumed to be of format YmdHis) |
| 55 | 55 | if ($attrs['timestamp'] instanceof DateTime) { |
@@ -204,8 +204,8 @@ discard block |
||
| 204 | 204 | // Must have underscores for the link to properly go to the section |
| 205 | 205 | $sectionTitleLink = htmlspecialchars(str_replace(' ', '_', $sectionTitle)); |
| 206 | 206 | |
| 207 | - $sectionWikitext = "<a target='_blank' href='$pageUrl#$sectionTitleLink'>→</a>" . |
|
| 208 | - "<em class='text-muted'>" . htmlspecialchars($sectionTitle) . ":</em> "; |
|
| 207 | + $sectionWikitext = "<a target='_blank' href='$pageUrl#$sectionTitleLink'>→</a>". |
|
| 208 | + "<em class='text-muted'>".htmlspecialchars($sectionTitle).":</em> "; |
|
| 209 | 209 | $summary = str_replace($sectionMatch[0][0], $sectionWikitext, $summary); |
| 210 | 210 | } |
| 211 | 211 | |
@@ -257,8 +257,8 @@ discard block |
||
| 257 | 257 | public function getDiffUrl() |
| 258 | 258 | { |
| 259 | 259 | $project = $this->getProject(); |
| 260 | - $path = str_replace('$1', 'Special:Diff/' . $this->id, $project->getArticlePath()); |
|
| 261 | - return rtrim($project->getUrl(), '/') . $path; |
|
| 260 | + $path = str_replace('$1', 'Special:Diff/'.$this->id, $project->getArticlePath()); |
|
| 261 | + return rtrim($project->getUrl(), '/').$path; |
|
| 262 | 262 | } |
| 263 | 263 | |
| 264 | 264 | /** |
@@ -268,8 +268,8 @@ discard block |
||
| 268 | 268 | public function getPermaUrl() |
| 269 | 269 | { |
| 270 | 270 | $project = $this->getProject(); |
| 271 | - $path = str_replace('$1', 'Special:PermaLink/' . $this->id, $project->getArticlePath()); |
|
| 272 | - return rtrim($project->getUrl(), '/') . $path; |
|
| 271 | + $path = str_replace('$1', 'Special:PermaLink/'.$this->id, $project->getArticlePath()); |
|
| 272 | + return rtrim($project->getUrl(), '/').$path; |
|
| 273 | 273 | } |
| 274 | 274 | |
| 275 | 275 | /** |
@@ -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. |
@@ -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 | 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 | /** |
@@ -489,7 +489,9 @@ |
||
| 489 | 489 | */ |
| 490 | 490 | public function quote() |
| 491 | 491 | { |
| 492 | - if (!$this->container->getParameter("enable.bash")) return ""; |
|
| 492 | + if (!$this->container->getParameter("enable.bash")) { |
|
| 493 | + return ""; |
|
| 494 | + } |
|
| 493 | 495 | $quotes = $this->container->getParameter('quotes'); |
| 494 | 496 | $id = array_rand($quotes); |
| 495 | 497 | return $quotes[$id]; |
@@ -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_sub_request' => $isSubRequest, |
@@ -6,7 +6,6 @@ |
||
| 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. |
@@ -200,7 +200,7 @@ |
||
| 200 | 200 | /** |
| 201 | 201 | * Get an array of this project's namespaces and their IDs. |
| 202 | 202 | * |
| 203 | - * @return string[] Keys are IDs, values are names. |
|
| 203 | + * @return string Keys are IDs, values are names. |
|
| 204 | 204 | */ |
| 205 | 205 | public function getNamespaces() |
| 206 | 206 | { |
@@ -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 | } |
@@ -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 | } |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | |
| 50 | 50 | /** |
| 51 | 51 | * Get all functions provided by this extension. |
| 52 | - * @return array |
|
| 52 | + * @return \Twig_SimpleFilter[] |
|
| 53 | 53 | */ |
| 54 | 54 | public function getFilters() |
| 55 | 55 | { |
@@ -5,8 +5,6 @@ |
||
| 5 | 5 | |
| 6 | 6 | namespace AppBundle\Twig; |
| 7 | 7 | |
| 8 | -use Twig_SimpleFunction; |
|
| 9 | - |
|
| 10 | 8 | /** |
| 11 | 9 | * Twig extension filters and functions for MediaWiki project links. |
| 12 | 10 | */ |
@@ -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,7 +41,7 @@ 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 | 46 | } |
| 47 | 47 | |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | public function getFilters() |
| 55 | 55 | { |
| 56 | 56 | return [ |
| 57 | - new \Twig_SimpleFilter('diff_format', [ $this, 'diffFormat' ], [ 'is_safe' => [ 'html' ] ]), |
|
| 57 | + new \Twig_SimpleFilter('diff_format', [$this, 'diffFormat'], ['is_safe' => ['html']]), |
|
| 58 | 58 | ]; |
| 59 | 59 | } |
| 60 | 60 | |
@@ -255,7 +255,7 @@ |
||
| 255 | 255 | * Adapted from https://github.com/MusikAnimal/pageviews |
| 256 | 256 | * @param array $params Associative array of params to pass to API |
| 257 | 257 | * @param string $project Project to query, e.g. en.wikipedia.org |
| 258 | - * @param string|func $dataKey The key for the main chunk of data, in the query hash |
|
| 258 | + * @param string $dataKey The key for the main chunk of data, in the query hash |
|
| 259 | 259 | * (e.g. 'categorymembers' for API:Categorymembers). |
| 260 | 260 | * If this is a function it is given the response data, |
| 261 | 261 | * and expected to return the data we want to concatentate. |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | public function groups($project, $username) |
| 61 | 61 | { |
| 62 | 62 | $this->setUp($project); |
| 63 | - $params = [ "list"=>"users", "ususers"=>$username, "usprop"=>"groups" ]; |
|
| 63 | + $params = ["list"=>"users", "ususers"=>$username, "usprop"=>"groups"]; |
|
| 64 | 64 | $query = new SimpleRequest('query', $params); |
| 65 | 65 | $result = []; |
| 66 | 66 | |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | public function globalGroups($project, $username) |
| 89 | 89 | { |
| 90 | 90 | $this->setUp($project); |
| 91 | - $params = [ "meta"=>"globaluserinfo", "guiuser"=>$username, "guiprop"=>"groups" ]; |
|
| 91 | + $params = ["meta"=>"globaluserinfo", "guiuser"=>$username, "guiprop"=>"groups"]; |
|
| 92 | 92 | $query = new SimpleRequest('query', $params); |
| 93 | 93 | $result = []; |
| 94 | 94 | |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | $groups[] = "B"; |
| 139 | 139 | } |
| 140 | 140 | if (in_array("steward", $admin["groups"])) { |
| 141 | - $groups[] = "S" ; |
|
| 141 | + $groups[] = "S"; |
|
| 142 | 142 | } |
| 143 | 143 | if (in_array("checkuser", $admin["groups"])) { |
| 144 | 144 | $groups[] = "CU"; |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | if (in_array("bot", $admin["groups"])) { |
| 150 | 150 | $groups[] = "Bot"; |
| 151 | 151 | } |
| 152 | - $result[ $admin["name"] ] = [ |
|
| 152 | + $result[$admin["name"]] = [ |
|
| 153 | 153 | "groups" => implode('/', $groups) |
| 154 | 154 | ]; |
| 155 | 155 | } |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | $normalized = []; |
| 183 | 183 | if (isset($result['query']['normalized'])) { |
| 184 | 184 | array_map( |
| 185 | - function ($e) use (&$normalized) { |
|
| 185 | + function($e) use (&$normalized) { |
|
| 186 | 186 | $normalized[$e['to']] = $e['from']; |
| 187 | 187 | }, |
| 188 | 188 | $result['query']['normalized'] |
@@ -267,7 +267,7 @@ discard block |
||
| 267 | 267 | $query = FluentRequest::factory()->setAction('query')->setParams($requestData); |
| 268 | 268 | $innerPromise = $this->api->getRequestAsync($query); |
| 269 | 269 | |
| 270 | - $innerPromise->then(function ($result) use (&$data) { |
|
| 270 | + $innerPromise->then(function($result) use (&$data) { |
|
| 271 | 271 | // some failures come back as 200s, so we still resolve and let the outer function handle it |
| 272 | 272 | if (isset($result['error']) || !isset($result['query'])) { |
| 273 | 273 | return $data['promise']->resolve($data); |
@@ -347,7 +347,7 @@ discard block |
||
| 347 | 347 | |
| 348 | 348 | $titleText = join("|", $titles); |
| 349 | 349 | |
| 350 | - $params= [ |
|
| 350 | + $params = [ |
|
| 351 | 351 | "titles" => $titleText, |
| 352 | 352 | "prop" => "revisions", |
| 353 | 353 | "rvprop" =>"content" |
@@ -360,8 +360,8 @@ discard block |
||
| 360 | 360 | if (!isset($res["query"]["pages"])) { |
| 361 | 361 | return []; |
| 362 | 362 | } |
| 363 | - foreach($res["query"]["pages"] as $key => $value) { |
|
| 364 | - if(isset($value["revisions"][0]["*"])) { |
|
| 363 | + foreach ($res["query"]["pages"] as $key => $value) { |
|
| 364 | + if (isset($value["revisions"][0]["*"])) { |
|
| 365 | 365 | $result[$value["title"]] = $value["revisions"][0]["*"]; |
| 366 | 366 | } |
| 367 | 367 | else { |
@@ -363,8 +363,7 @@ |
||
| 363 | 363 | foreach($res["query"]["pages"] as $key => $value) { |
| 364 | 364 | if(isset($value["revisions"][0]["*"])) { |
| 365 | 365 | $result[$value["title"]] = $value["revisions"][0]["*"]; |
| 366 | - } |
|
| 367 | - else { |
|
| 366 | + } else { |
|
| 368 | 367 | $result[$value["title"]] = ""; |
| 369 | 368 | } |
| 370 | 369 | } |