@@ -5,7 +5,6 @@ |
||
| 5 | 5 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
| 6 | 6 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
| 7 | 7 | use Symfony\Component\HttpFoundation\Request; |
| 8 | -use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
|
| 9 | 8 | use Xtools\ProjectRepository; |
| 10 | 9 | |
| 11 | 10 | class AutomatedEditsController extends Controller |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | $archiveTable = $lh->getTable('archive', $dbName); |
| 155 | 155 | |
| 156 | 156 | $condBegin = $start ? " AND rev_timestamp > :start " : null; |
| 157 | - $condEnd = $end ? " AND rev_timestamp < :end ": null; |
|
| 157 | + $condEnd = $end ? " AND rev_timestamp < :end " : null; |
|
| 158 | 158 | |
| 159 | 159 | $regexes = []; |
| 160 | 160 | |
@@ -248,8 +248,8 @@ discard block |
||
| 248 | 248 | } |
| 249 | 249 | |
| 250 | 250 | // Sort the array and do some simple math. |
| 251 | - uasort($results, function ($a, $b) { |
|
| 252 | - return $b['count'] - $a['count']; |
|
| 251 | + uasort($results, function($a, $b) { |
|
| 252 | + return $b['count']-$a['count']; |
|
| 253 | 253 | }); |
| 254 | 254 | |
| 255 | 255 | if ($total != 0) { |
@@ -6,7 +6,6 @@ |
||
| 6 | 6 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
| 7 | 7 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
| 8 | 8 | use Symfony\Component\HttpFoundation\Request; |
| 9 | -use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
|
| 10 | 9 | use Xtools\ProjectRepository; |
| 11 | 10 | |
| 12 | 11 | class PagesController extends Controller |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | 'username' => $username, |
| 58 | 58 | ]); |
| 59 | 59 | } elseif ($projectQuery != "") { |
| 60 | - return $this->redirectToRoute("PagesProject", [ 'project'=>$projectQuery ]); |
|
| 60 | + return $this->redirectToRoute("PagesProject", ['project'=>$projectQuery]); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | // set default wiki so we can populate the namespace selector |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | JOIN $revisionTable ON page_id = rev_page |
| 184 | 184 | $paJoin |
| 185 | 185 | WHERE $whereRev AND rev_parent_id = '0' $namespaceConditionRev $redirectCondition |
| 186 | - " . ($hasPageAssessments ? "GROUP BY rev_page" : "") . " |
|
| 186 | + ".($hasPageAssessments ? "GROUP BY rev_page" : "")." |
|
| 187 | 187 | ) |
| 188 | 188 | |
| 189 | 189 | UNION |
@@ -267,8 +267,8 @@ discard block |
||
| 267 | 267 | } |
| 268 | 268 | |
| 269 | 269 | if ($total < 1) { |
| 270 | - $this->addFlash("notice", [ "no-result", $username ]); |
|
| 271 | - return $this->redirectToRoute("PagesProject", [ "project"=>$project ]); |
|
| 270 | + $this->addFlash("notice", ["no-result", $username]); |
|
| 271 | + return $this->redirectToRoute("PagesProject", ["project"=>$project]); |
|
| 272 | 272 | } |
| 273 | 273 | |
| 274 | 274 | ksort($pagesByNamespaceByDate); |
@@ -2,10 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace AppBundle\Helper; |
| 4 | 4 | |
| 5 | -use Symfony\Component\Config\Definition\Exception\Exception; |
|
| 6 | 5 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
| 7 | 6 | use Symfony\Component\DependencyInjection\ContainerInterface; |
| 8 | -use Symfony\Component\VarDumper\VarDumper; |
|
| 9 | 7 | |
| 10 | 8 | class LabsHelper |
| 11 | 9 | { |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | // Create the query we're going to run against the meta database |
| 79 | 79 | $wikiQuery = $this->client->createQueryBuilder(); |
| 80 | 80 | $wikiQuery |
| 81 | - ->select([ 'dbname', 'name', 'url', 'lang' ]) |
|
| 81 | + ->select(['dbname', 'name', 'url', 'lang']) |
|
| 82 | 82 | ->from('wiki') |
| 83 | 83 | ->where($wikiQuery->expr()->eq('dbname', ':project')) |
| 84 | 84 | // The meta database will have the project's URL stored as https://en.wikipedia.org |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | public function allProjects() |
| 130 | 130 | { |
| 131 | 131 | $wikiQuery = $this->client->createQueryBuilder(); |
| 132 | - $wikiQuery->select([ 'dbName', 'name', 'url' ])->from('wiki'); |
|
| 132 | + $wikiQuery->select(['dbName', 'name', 'url'])->from('wiki'); |
|
| 133 | 133 | $stmt = $wikiQuery->execute(); |
| 134 | 134 | $out = $stmt->fetchAll(); |
| 135 | 135 | return $out; |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | // as required by Labs. We combine $table with |
| 153 | 153 | // $table_extension in order to generate the new table name |
| 154 | 154 | if ($this->isLabs() && $table_extension !== null) { |
| 155 | - $table = $table . "_" . $table_extension; |
|
| 155 | + $table = $table."_".$table_extension; |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | // Use the table specified in the table mapping configuration, if present. |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | $this->assertEquals(200, $client->getResponse()->getStatusCode()); |
| 35 | 35 | |
| 36 | 36 | // Check that a correct namespace value was returned |
| 37 | - $namespaces = (array) json_decode($client->getResponse()->getContent()); |
|
| 37 | + $namespaces = (array)json_decode($client->getResponse()->getContent()); |
|
| 38 | 38 | $this->assertEquals('Utilisateur', array_values($namespaces)[2]); // User in French |
| 39 | 39 | } |
| 40 | 40 | } |
@@ -8,6 +8,6 @@ |
||
| 8 | 8 | */ |
| 9 | 9 | $loader = require __DIR__.'/../vendor/autoload.php'; |
| 10 | 10 | |
| 11 | -AnnotationRegistry::registerLoader([ $loader, 'loadClass' ]); |
|
| 11 | +AnnotationRegistry::registerLoader([$loader, 'loadClass']); |
|
| 12 | 12 | |
| 13 | 13 | return $loader; |
@@ -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,7 +251,6 @@ discard block |
||
| 251 | 251 | * Get a user's total edit count on one or more project. |
| 252 | 252 | * Requires the CentralAuth extension to be installed on the project. |
| 253 | 253 | * |
| 254 | - * @param string $username The username. |
|
| 255 | 254 | * @param Project $project The project to start from. |
| 256 | 255 | * @return mixed[]|boolean Array of total edit counts, or false if none could be found. |
| 257 | 256 | */ |
@@ -301,7 +300,7 @@ discard block |
||
| 301 | 300 | |
| 302 | 301 | /** |
| 303 | 302 | * Get total edit counts for the top 10 projects for this user. |
| 304 | - * @param string $username The username. |
|
| 303 | + * @param string $stopwatchName |
|
| 305 | 304 | * @return string[] Elements are arrays with 'dbName', 'url', 'name', and 'total'. |
| 306 | 305 | */ |
| 307 | 306 | protected function getRevisionCountsAllProjectsNoCentralAuth( |
@@ -413,7 +412,6 @@ discard block |
||
| 413 | 412 | |
| 414 | 413 | /** |
| 415 | 414 | * Get data for a bar chart of monthly edit totals per namespace. |
| 416 | - * @param string $username The username. |
|
| 417 | 415 | * @return string[] |
| 418 | 416 | */ |
| 419 | 417 | public function getMonthCounts(Project $project, User $user) |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | public function getRevisionCounts(Project $project, User $user) |
| 20 | 20 | { |
| 21 | 21 | // Set up cache. |
| 22 | - $cacheKey = 'revisioncounts.' . $project->getDatabaseName() . '.' . $user->getUsername(); |
|
| 22 | + $cacheKey = 'revisioncounts.'.$project->getDatabaseName().'.'.$user->getUsername(); |
|
| 23 | 23 | if ($this->cache->hasItem($cacheKey)) { |
| 24 | 24 | return $this->cache->getItem($cacheKey)->get(); |
| 25 | 25 | } |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | public function getRevisionDates(Project $project, User $user) |
| 81 | 81 | { |
| 82 | 82 | // Set up cache. |
| 83 | - $cacheKey = 'revisiondates.' . $project->getDatabaseName() . '.' . $user->getUsername(); |
|
| 83 | + $cacheKey = 'revisiondates.'.$project->getDatabaseName().'.'.$user->getUsername(); |
|
| 84 | 84 | if ($this->cache->hasItem($cacheKey)) { |
| 85 | 85 | return $this->cache->getItem($cacheKey)->get(); |
| 86 | 86 | } |
@@ -152,10 +152,10 @@ discard block |
||
| 152 | 152 | $results = $resultQuery->fetchAll(); |
| 153 | 153 | |
| 154 | 154 | $pageCounts = array_combine( |
| 155 | - array_map(function ($e) { |
|
| 155 | + array_map(function($e) { |
|
| 156 | 156 | return $e['source']; |
| 157 | 157 | }, $results), |
| 158 | - array_map(function ($e) { |
|
| 158 | + array_map(function($e) { |
|
| 159 | 159 | return $e['value']; |
| 160 | 160 | }, $results) |
| 161 | 161 | ); |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | |
| 187 | 187 | // Query. |
| 188 | 188 | $sql = "SELECT CONCAT(log_type, '-', log_action) AS source, COUNT(log_id) AS value |
| 189 | - FROM " . $this->getTableName($project->getDatabaseName(), 'logging') . " |
|
| 189 | + FROM " . $this->getTableName($project->getDatabaseName(), 'logging')." |
|
| 190 | 190 | WHERE log_user = :userId |
| 191 | 191 | GROUP BY log_type, log_action"; |
| 192 | 192 | $resultQuery = $this->getProjectsConnection()->prepare($sql); |
@@ -195,10 +195,10 @@ discard block |
||
| 195 | 195 | $resultQuery->execute(); |
| 196 | 196 | $results = $resultQuery->fetchAll(); |
| 197 | 197 | $logCounts = array_combine( |
| 198 | - array_map(function ($e) { |
|
| 198 | + array_map(function($e) { |
|
| 199 | 199 | return $e['source']; |
| 200 | 200 | }, $results), |
| 201 | - array_map(function ($e) { |
|
| 201 | + array_map(function($e) { |
|
| 202 | 202 | return $e['value']; |
| 203 | 203 | }, $results) |
| 204 | 204 | ); |
@@ -355,9 +355,9 @@ discard block |
||
| 355 | 355 | $resultQuery->bindParam(":id", $userId); |
| 356 | 356 | $resultQuery->execute(); |
| 357 | 357 | $results = $resultQuery->fetchAll(); |
| 358 | - $namespaceTotals = array_combine(array_map(function ($e) { |
|
| 358 | + $namespaceTotals = array_combine(array_map(function($e) { |
|
| 359 | 359 | return $e['page_namespace']; |
| 360 | - }, $results), array_map(function ($e) { |
|
| 360 | + }, $results), array_map(function($e) { |
|
| 361 | 361 | return $e['total']; |
| 362 | 362 | }, $results)); |
| 363 | 363 | |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | $end = $request->query->get('end'); |
| 22 | 22 | |
| 23 | 23 | if ($start != '' && $end != '') { |
| 24 | - return $this->redirectToRoute('MetaResult', [ 'start' => $start, 'end' => $end ]); |
|
| 24 | + return $this->redirectToRoute('MetaResult', ['start' => $start, 'end' => $end]); |
|
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | return $this->render('meta/index.html.twig', [ |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | ->getConnection(); |
| 46 | 46 | |
| 47 | 47 | $query = $this->client->createQueryBuilder(); |
| 48 | - $query->select([ 'date', 'tool', 'count' ]) |
|
| 48 | + $query->select(['date', 'tool', 'count']) |
|
| 49 | 49 | ->where($query->expr()->gte('date', ':start')) |
| 50 | 50 | ->where($query->expr()->lte('date', ':end')) |
| 51 | 51 | ->where($query->expr()->neq('tool', '""')) |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | $timeline = []; |
| 62 | 62 | $startObj = new DateTime($start); |
| 63 | 63 | $endObj = new DateTime($end); |
| 64 | - $numDays = (int) $endObj->diff($startObj)->format("%a"); |
|
| 64 | + $numDays = (int)$endObj->diff($startObj)->format("%a"); |
|
| 65 | 65 | $grandSum = 0; |
| 66 | 66 | |
| 67 | 67 | foreach ($data as $entry) { |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | $date = new DateTime($entry['date']); |
| 79 | - $dateIndex = (int) $date->diff($startObj)->format("%a"); |
|
| 79 | + $dateIndex = (int)$date->diff($startObj)->format("%a"); |
|
| 80 | 80 | $timeline[$entry['tool']][$dateIndex] = $entry['count']; |
| 81 | 81 | |
| 82 | 82 | $grandSum += $entry['count']; |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | public function loginAction(Request $request) |
| 80 | 80 | { |
| 81 | 81 | try { |
| 82 | - list( $next, $token ) = $this->getOauthClient()->initiate(); |
|
| 82 | + list($next, $token) = $this->getOauthClient()->initiate(); |
|
| 83 | 83 | } catch (Exception $oauthException) { |
| 84 | 84 | throw $oauthException; |
| 85 | 85 | // @TODO Make this work. |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | . '/index.php?title=Special:OAuth'; |
| 142 | 142 | $conf = new ClientConfig($endpoint); |
| 143 | 143 | $consumerKey = $this->getParameter('oauth_key'); |
| 144 | - $consumerSecret = $this->getParameter('oauth_secret'); |
|
| 144 | + $consumerSecret = $this->getParameter('oauth_secret'); |
|
| 145 | 145 | $conf->setConsumer(new Consumer($consumerKey, $consumerSecret)); |
| 146 | 146 | $this->oauthClient = new Client($conf); |
| 147 | 147 | // Callback URL is hardcoded in the consumer registration. |