@@ -473,7 +473,7 @@ discard block |
||
473 | 473 | |
474 | 474 | /** |
475 | 475 | * Get the date and time of the user's first edit. |
476 | - * @return DateTime|bool The time of the first revision, or false. |
|
476 | + * @return DateInterval The time of the first revision, or false. |
|
477 | 477 | */ |
478 | 478 | public function datetimeFirstRevision() |
479 | 479 | { |
@@ -483,7 +483,7 @@ discard block |
||
483 | 483 | |
484 | 484 | /** |
485 | 485 | * Get the date and time of the user's first edit. |
486 | - * @return DateTime|bool The time of the last revision, or false. |
|
486 | + * @return DateInterval The time of the last revision, or false. |
|
487 | 487 | */ |
488 | 488 | public function datetimeLastRevision() |
489 | 489 | { |
@@ -6,7 +6,6 @@ |
||
6 | 6 | namespace Xtools; |
7 | 7 | |
8 | 8 | use DateTime; |
9 | -use Exception; |
|
10 | 9 | use DatePeriod; |
11 | 10 | use DateInterval; |
12 | 11 | use GuzzleHttp; |
@@ -117,8 +117,8 @@ discard block |
||
117 | 117 | $promises[] = $promise; |
118 | 118 | |
119 | 119 | // Handle response of $promise asynchronously. |
120 | - $promise->then(function ($response) use ($key, $endpoint) { |
|
121 | - $result = (array) json_decode($response->getBody()->getContents()); |
|
120 | + $promise->then(function($response) use ($key, $endpoint) { |
|
121 | + $result = (array)json_decode($response->getBody()->getContents()); |
|
122 | 122 | |
123 | 123 | if (isset($result)) { |
124 | 124 | // Copy result to the class class instance. From here any subsequent |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | // We'll log this to see how often it happens. |
132 | 132 | $this->getRepository() |
133 | 133 | ->getLog() |
134 | - ->error("Failed to fetch data for $endpoint via async, " . |
|
134 | + ->error("Failed to fetch data for $endpoint via async, ". |
|
135 | 135 | "re-attempting synchoronously."); |
136 | 136 | } |
137 | 137 | }); |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | |
188 | 188 | // Filter out unblocks unless requested. |
189 | 189 | if ($blocksOnly) { |
190 | - $blocks = array_filter($blocks, function ($block) { |
|
190 | + $blocks = array_filter($blocks, function($block) { |
|
191 | 191 | return $block['log_action'] === 'block'; |
192 | 192 | }); |
193 | 193 | } |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | */ |
222 | 222 | public function countAllRevisions() |
223 | 223 | { |
224 | - return $this->countLiveRevisions() + $this->countDeletedRevisions(); |
|
224 | + return $this->countLiveRevisions()+$this->countDeletedRevisions(); |
|
225 | 225 | } |
226 | 226 | |
227 | 227 | /** |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | */ |
241 | 241 | public function countRevisionsWithoutComments() |
242 | 242 | { |
243 | - return $this->countLiveRevisions() - $this->countRevisionsWithComments(); |
|
243 | + return $this->countLiveRevisions()-$this->countRevisionsWithComments(); |
|
244 | 244 | } |
245 | 245 | |
246 | 246 | /** |
@@ -279,7 +279,7 @@ discard block |
||
279 | 279 | */ |
280 | 280 | public function countAllPagesEdited() |
281 | 281 | { |
282 | - return $this->countLivePagesEdited() + $this->countDeletedPagesEdited(); |
|
282 | + return $this->countLivePagesEdited()+$this->countDeletedPagesEdited(); |
|
283 | 283 | } |
284 | 284 | |
285 | 285 | /** |
@@ -289,7 +289,7 @@ discard block |
||
289 | 289 | */ |
290 | 290 | public function countPagesCreated() |
291 | 291 | { |
292 | - return $this->countCreatedPagesLive() + $this->countPagesCreatedDeleted(); |
|
292 | + return $this->countCreatedPagesLive()+$this->countPagesCreatedDeleted(); |
|
293 | 293 | } |
294 | 294 | |
295 | 295 | /** |
@@ -429,7 +429,7 @@ discard block |
||
429 | 429 | } elseif ($block['log_action'] === 'unblock') { |
430 | 430 | // The last block was lifted. So the duration will be the time from when the |
431 | 431 | // last block was set to the time of the unblock. |
432 | - $timeSinceLastBlock = $timestamp - $lastBlock[0]; |
|
432 | + $timeSinceLastBlock = $timestamp-$lastBlock[0]; |
|
433 | 433 | if ($timeSinceLastBlock > $this->longestBlockSeconds) { |
434 | 434 | $this->longestBlockSeconds = $timeSinceLastBlock; |
435 | 435 | |
@@ -440,8 +440,8 @@ discard block |
||
440 | 440 | // The last block was modified. So we will adjust $lastBlock to include |
441 | 441 | // the difference of the duration of the new reblock, and time since the last block. |
442 | 442 | // $lastBlock is left unchanged if its duration was indefinite. |
443 | - $timeSinceLastBlock = $timestamp - $lastBlock[0]; |
|
444 | - $lastBlock[1] = $timeSinceLastBlock + $duration; |
|
443 | + $timeSinceLastBlock = $timestamp-$lastBlock[0]; |
|
444 | + $lastBlock[1] = $timeSinceLastBlock+$duration; |
|
445 | 445 | } |
446 | 446 | } |
447 | 447 | |
@@ -451,7 +451,7 @@ discard block |
||
451 | 451 | } |
452 | 452 | |
453 | 453 | // Test if the last block is still active, and if so use the expiry as the duration. |
454 | - $lastBlockExpiry = $lastBlock[0] + $lastBlock[1]; |
|
454 | + $lastBlockExpiry = $lastBlock[0]+$lastBlock[1]; |
|
455 | 455 | if ($lastBlockExpiry > time() && $lastBlockExpiry > $this->longestBlockSeconds) { |
456 | 456 | $this->longestBlockSeconds = $lastBlock[1]; |
457 | 457 | // Otherwise, test if the duration of the last block is now the longest overall. |
@@ -492,7 +492,7 @@ discard block |
||
492 | 492 | // If invalid, $duration is left as null. |
493 | 493 | if (strtotime($durationStr)) { |
494 | 494 | $expiry = strtotime($durationStr, $timestamp); |
495 | - $duration = $expiry - $timestamp; |
|
495 | + $duration = $expiry-$timestamp; |
|
496 | 496 | } |
497 | 497 | |
498 | 498 | return [$timestamp, $duration]; |
@@ -569,7 +569,7 @@ discard block |
||
569 | 569 | $import = isset($logCounts['import-import']) ? (int)$logCounts['import-import'] : 0; |
570 | 570 | $interwiki = isset($logCounts['import-interwiki']) ? (int)$logCounts['import-interwiki'] : 0; |
571 | 571 | $upload = isset($logCounts['import-upload']) ? (int)$logCounts['import-upload'] : 0; |
572 | - return $import + $interwiki + $upload; |
|
572 | + return $import+$interwiki+$upload; |
|
573 | 573 | } |
574 | 574 | |
575 | 575 | /** |
@@ -693,9 +693,9 @@ discard block |
||
693 | 693 | public function approvals() |
694 | 694 | { |
695 | 695 | $logCounts = $this->getLogCounts(); |
696 | - $total = $logCounts['review-approve'] + |
|
697 | - (!empty($logCounts['review-approve-a']) ? $logCounts['review-approve-a'] : 0) + |
|
698 | - (!empty($logCounts['review-approve-i']) ? $logCounts['review-approve-i'] : 0) + |
|
696 | + $total = $logCounts['review-approve']+ |
|
697 | + (!empty($logCounts['review-approve-a']) ? $logCounts['review-approve-a'] : 0)+ |
|
698 | + (!empty($logCounts['review-approve-i']) ? $logCounts['review-approve-i'] : 0)+ |
|
699 | 699 | (!empty($logCounts['review-approve-ia']) ? $logCounts['review-approve-ia'] : 0); |
700 | 700 | return $total; |
701 | 701 | } |
@@ -719,7 +719,7 @@ discard block |
||
719 | 719 | $logCounts = $this->getLogCounts(); |
720 | 720 | $create2 = $logCounts['newusers-create2'] ?: 0; |
721 | 721 | $byemail = $logCounts['newusers-byemail'] ?: 0; |
722 | - return $create2 + $byemail; |
|
722 | + return $create2+$byemail; |
|
723 | 723 | } |
724 | 724 | |
725 | 725 | /** |
@@ -771,7 +771,7 @@ discard block |
||
771 | 771 | |
772 | 772 | $totals = $this->getRepository()->getMonthCounts($this->project, $this->user); |
773 | 773 | $out = [ |
774 | - 'yearLabels' => [], // labels for years |
|
774 | + 'yearLabels' => [], // labels for years |
|
775 | 775 | 'monthLabels' => [], // labels for months |
776 | 776 | 'totals' => [], // actual totals, grouped by namespace, year and then month |
777 | 777 | ]; |
@@ -799,7 +799,7 @@ discard block |
||
799 | 799 | $out['totals'][$ns][$total['year']] = []; |
800 | 800 | } |
801 | 801 | |
802 | - $out['totals'][$ns][$total['year']][$total['month']] = (int) $total['count']; |
|
802 | + $out['totals'][$ns][$total['year']][$total['month']] = (int)$total['count']; |
|
803 | 803 | } |
804 | 804 | |
805 | 805 | $dateRange = new DatePeriod( |
@@ -809,8 +809,8 @@ discard block |
||
809 | 809 | ); |
810 | 810 | |
811 | 811 | foreach ($dateRange as $monthObj) { |
812 | - $year = (int) $monthObj->format('Y'); |
|
813 | - $month = (int) $monthObj->format('n'); |
|
812 | + $year = (int)$monthObj->format('Y'); |
|
813 | + $month = (int)$monthObj->format('n'); |
|
814 | 814 | |
815 | 815 | // Fill in labels |
816 | 816 | $out['monthLabels'][] = $monthObj->format('Y-m'); |
@@ -926,8 +926,8 @@ discard block |
||
926 | 926 | |
927 | 927 | if ($sorted) { |
928 | 928 | // Sort. |
929 | - uasort($this->globalEditCounts, function ($a, $b) { |
|
930 | - return $b['total'] - $a['total']; |
|
929 | + uasort($this->globalEditCounts, function($a, $b) { |
|
930 | + return $b['total']-$a['total']; |
|
931 | 931 | }); |
932 | 932 | } |
933 | 933 | |
@@ -963,7 +963,7 @@ discard block |
||
963 | 963 | $nsName = $project->getNamespaces()[$revision['page_namespace']]; |
964 | 964 | } |
965 | 965 | $page = $project->getRepository() |
966 | - ->getPage($project, $nsName . ':' . $revision['page_title']); |
|
966 | + ->getPage($project, $nsName.':'.$revision['page_title']); |
|
967 | 967 | $edit = new Edit($page, $revision); |
968 | 968 | $globalEdits[$edit->getTimestamp()->getTimestamp().'-'.$edit->getId()] = $edit; |
969 | 969 | } |
@@ -1004,7 +1004,7 @@ discard block |
||
1004 | 1004 | public function countSmallEdits() |
1005 | 1005 | { |
1006 | 1006 | $editSizeData = $this->getEditSizeData(); |
1007 | - return isset($editSizeData['small_edits']) ? (int) $editSizeData['small_edits'] : 0; |
|
1007 | + return isset($editSizeData['small_edits']) ? (int)$editSizeData['small_edits'] : 0; |
|
1008 | 1008 | } |
1009 | 1009 | |
1010 | 1010 | /** |
@@ -1014,7 +1014,7 @@ discard block |
||
1014 | 1014 | public function countLargeEdits() |
1015 | 1015 | { |
1016 | 1016 | $editSizeData = $this->getEditSizeData(); |
1017 | - return isset($editSizeData['large_edits']) ? (int) $editSizeData['large_edits'] : 0; |
|
1017 | + return isset($editSizeData['large_edits']) ? (int)$editSizeData['large_edits'] : 0; |
|
1018 | 1018 | } |
1019 | 1019 | |
1020 | 1020 | /** |
@@ -5,12 +5,9 @@ |
||
5 | 5 | |
6 | 6 | namespace AppBundle\Controller; |
7 | 7 | |
8 | -use Exception; |
|
9 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
|
10 | 8 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
11 | 9 | use Symfony\Component\HttpFoundation\Request; |
12 | 10 | use Symfony\Component\HttpFoundation\Response; |
13 | -use Symfony\Component\Debug\Exception\FatalErrorException; |
|
14 | 11 | use FOS\RestBundle\Controller\Annotations as Rest; |
15 | 12 | use FOS\RestBundle\Controller\FOSRestController; |
16 | 13 | use FOS\RestBundle\View\View; |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | $view = View::create()->setStatusCode(Response::HTTP_OK); |
169 | 169 | |
170 | 170 | if ($request->query->get('format') === 'html') { |
171 | - $edits = array_map(function ($attrs) use ($project, $username) { |
|
171 | + $edits = array_map(function($attrs) use ($project, $username) { |
|
172 | 172 | $page = $project->getRepository() |
173 | 173 | ->getPage($project, $attrs['full_page_title']); |
174 | 174 | $pageTitles[] = $attrs['full_page_title']; |
@@ -244,19 +244,19 @@ discard block |
||
244 | 244 | $info = $page->getBasicEditingInfo(); |
245 | 245 | $creationDateTime = DateTime::createFromFormat('YmdHis', $info['created_at']); |
246 | 246 | $modifiedDateTime = DateTime::createFromFormat('YmdHis', $info['modified_at']); |
247 | - $secsSinceLastEdit = (new DateTime)->getTimestamp() - $modifiedDateTime->getTimestamp(); |
|
247 | + $secsSinceLastEdit = (new DateTime)->getTimestamp()-$modifiedDateTime->getTimestamp(); |
|
248 | 248 | |
249 | 249 | $data = [ |
250 | - 'revisions' => (int) $info['num_edits'], |
|
251 | - 'editors' => (int) $info['num_editors'], |
|
250 | + 'revisions' => (int)$info['num_edits'], |
|
251 | + 'editors' => (int)$info['num_editors'], |
|
252 | 252 | 'author' => $info['author'], |
253 | - 'author_editcount' => (int) $info['author_editcount'], |
|
253 | + 'author_editcount' => (int)$info['author_editcount'], |
|
254 | 254 | 'created_at' => $creationDateTime->format('Y-m-d'), |
255 | 255 | 'created_rev_id' => $info['created_rev_id'], |
256 | 256 | 'modified_at' => $modifiedDateTime->format('Y-m-d H:i'), |
257 | 257 | 'secs_since_last_edit' => $secsSinceLastEdit, |
258 | - 'last_edit_id' => (int) $info['modified_rev_id'], |
|
259 | - 'watchers' => (int) $page->getWatchers(), |
|
258 | + 'last_edit_id' => (int)$info['modified_rev_id'], |
|
259 | + 'watchers' => (int)$page->getWatchers(), |
|
260 | 260 | 'pageviews' => $page->getLastPageviews($pageviewsOffset), |
261 | 261 | 'pageviews_offset' => $pageviewsOffset, |
262 | 262 | ]; |
@@ -314,7 +314,7 @@ discard block |
||
314 | 314 | } |
315 | 315 | |
316 | 316 | $conn = $this->getDoctrine()->getManager('default')->getConnection(); |
317 | - $date = date('Y-m-d'); |
|
317 | + $date = date('Y-m-d'); |
|
318 | 318 | |
319 | 319 | // Increment count in timeline |
320 | 320 | $existsSql = "SELECT 1 FROM usage_timeline |
@@ -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 | { |
@@ -420,8 +420,8 @@ discard block |
||
420 | 420 | |
421 | 421 | /** |
422 | 422 | * Get the sum of pageviews for the given page and timeframe. |
423 | - * @param string|DateTime $start In the format YYYYMMDD |
|
424 | - * @param string|DateTime $end In the format YYYYMMDD |
|
423 | + * @param string $start In the format YYYYMMDD |
|
424 | + * @param string $end In the format YYYYMMDD |
|
425 | 425 | * @return string[] |
426 | 426 | */ |
427 | 427 | public function getPageviews($start, $end) |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | $info = $this->getPageInfo(); |
82 | 82 | $title = isset($info['title']) ? $info['title'] : $this->unnormalizedPageName; |
83 | 83 | $nsName = $this->getNamespaceName(); |
84 | - return str_replace($nsName . ':', '', $title); |
|
84 | + return str_replace($nsName.':', '', $title); |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | /** |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | { |
218 | 218 | // If a user is given, we will not cache the result via instance variable. |
219 | 219 | if ($user !== null) { |
220 | - return (int) $this->getRepository()->getNumRevisions($this, $user); |
|
220 | + return (int)$this->getRepository()->getNumRevisions($this, $user); |
|
221 | 221 | } |
222 | 222 | |
223 | 223 | // Return cached value, if present. |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | $this->numRevisions = count($this->revisions); |
231 | 231 | } else { |
232 | 232 | // Otherwise do a COUNT in the event fetching all revisions is not desired. |
233 | - $this->numRevisions = (int) $this->getRepository()->getNumRevisions($this); |
|
233 | + $this->numRevisions = (int)$this->getRepository()->getNumRevisions($this); |
|
234 | 234 | } |
235 | 235 | |
236 | 236 | return $this->numRevisions; |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | { |
261 | 261 | $content = $this->getRepository()->getPagesWikitext( |
262 | 262 | $this->getProject(), |
263 | - [ $this->getTitle() ] |
|
263 | + [$this->getTitle()] |
|
264 | 264 | ); |
265 | 265 | |
266 | 266 | return isset($content[$this->getTitle()]) |
@@ -417,7 +417,7 @@ discard block |
||
417 | 417 | |
418 | 418 | $wikidataInfo = $this->getRepository()->getWikidataInfo($this); |
419 | 419 | |
420 | - $terms = array_map(function ($entry) { |
|
420 | + $terms = array_map(function($entry) { |
|
421 | 421 | return $entry['term']; |
422 | 422 | }, $wikidataInfo); |
423 | 423 | |
@@ -428,7 +428,7 @@ discard block |
||
428 | 428 | 'prio' => 2, |
429 | 429 | 'name' => 'Wikidata', |
430 | 430 | 'notice' => "Label for language <em>$lang</em> is missing", // FIXME: i18n |
431 | - 'explanation' => "See: <a target='_blank' " . |
|
431 | + 'explanation' => "See: <a target='_blank' ". |
|
432 | 432 | "href='//www.wikidata.org/wiki/Help:Label'>Help:Label</a>", |
433 | 433 | ]; |
434 | 434 | } |
@@ -438,7 +438,7 @@ discard block |
||
438 | 438 | 'prio' => 3, |
439 | 439 | 'name' => 'Wikidata', |
440 | 440 | 'notice' => "Description for language <em>$lang</em> is missing", // FIXME: i18n |
441 | - 'explanation' => "See: <a target='_blank' " . |
|
441 | + 'explanation' => "See: <a target='_blank' ". |
|
442 | 442 | "href='//www.wikidata.org/wiki/Help:Description'>Help:Description</a>", |
443 | 443 | ]; |
444 | 444 | } |
@@ -517,8 +517,8 @@ discard block |
||
517 | 517 | return 0; |
518 | 518 | } |
519 | 519 | |
520 | - return array_sum(array_map(function ($item) { |
|
521 | - return (int) $item['views']; |
|
520 | + return array_sum(array_map(function($item) { |
|
521 | + return (int)$item['views']; |
|
522 | 522 | }, $pageviews['items'])); |
523 | 523 | } |
524 | 524 |
@@ -56,8 +56,8 @@ discard block |
||
56 | 56 | */ |
57 | 57 | public function onKernelController(FilterControllerEvent $event) |
58 | 58 | { |
59 | - $this->rateLimit = (int) $this->container->getParameter('app.rate_limit_count'); |
|
60 | - $this->rateDuration = (int) $this->container->getParameter('app.rate_limit_time'); |
|
59 | + $this->rateLimit = (int)$this->container->getParameter('app.rate_limit_count'); |
|
60 | + $this->rateDuration = (int)$this->container->getParameter('app.rate_limit_time'); |
|
61 | 61 | |
62 | 62 | // Zero values indicate the rate limiting feature should be disabled. |
63 | 63 | if ($this->rateLimit === 0 || $this->rateDuration === 0) { |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | } |
66 | 66 | |
67 | 67 | $controller = $event->getController(); |
68 | - $loggedIn = (bool) $this->container->get('session')->get('logged_in_user'); |
|
68 | + $loggedIn = (bool)$this->container->get('session')->get('logged_in_user'); |
|
69 | 69 | |
70 | 70 | /** |
71 | 71 | * Rate limiting will not apply to these actions |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | $cacheItem = $cache->getItem($cacheKey); |
92 | 92 | |
93 | 93 | // If increment value already in cache, or start with 1. |
94 | - $count = $cacheItem->isHit() ? (int) $cacheItem->get() + 1 : 1; |
|
94 | + $count = $cacheItem->isHit() ? (int)$cacheItem->get()+1 : 1; |
|
95 | 95 | |
96 | 96 | // Check if limit has been exceeded, and if so, throw an error. |
97 | 97 | if ($count > $this->rateLimit) { |
@@ -143,14 +143,14 @@ discard block |
||
143 | 143 | // Log the denied request |
144 | 144 | $logger = $this->container->get('monolog.logger.rate_limit'); |
145 | 145 | $logger->info( |
146 | - "<URI>: " . $request->getRequestUri() . |
|
147 | - ($logComment != '' ? "\t<Reason>: $logComment" : '') . |
|
148 | - "\t<User agent>: " . $request->headers->get('User-Agent') |
|
146 | + "<URI>: ".$request->getRequestUri(). |
|
147 | + ($logComment != '' ? "\t<Reason>: $logComment" : ''). |
|
148 | + "\t<User agent>: ".$request->headers->get('User-Agent') |
|
149 | 149 | ); |
150 | 150 | |
151 | - throw new AccessDeniedHttpException("Possible spider crawl detected. " . |
|
152 | - 'If you are human, you are making too many requests during a short period of time. ' . |
|
153 | - "Please wait $this->rateDuration minutes before reloading this tool. You can then " . |
|
151 | + throw new AccessDeniedHttpException("Possible spider crawl detected. ". |
|
152 | + 'If you are human, you are making too many requests during a short period of time. '. |
|
153 | + "Please wait $this->rateDuration minutes before reloading this tool. You can then ". |
|
154 | 154 | 'login to prevent this from happening again.'); |
155 | 155 | } |
156 | 156 | } |
@@ -8,7 +8,6 @@ |
||
8 | 8 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
9 | 9 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
10 | 10 | use Symfony\Component\HttpFoundation\Request; |
11 | -use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
|
12 | 11 | use Xtools\ProjectRepository; |
13 | 12 | use Xtools\Page; |
14 | 13 | use Xtools\PagesRepository; |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | * @Route("/rfx/{project}", name="rfxAnalysisProject") |
45 | 45 | * @Route("/rfx/{project}/{type}", name="rfxAnalysisProjectType") |
46 | 46 | * |
47 | - * @return Response|RedirectResponse |
|
47 | + * @return \Symfony\Component\HttpFoundation\Response |
|
48 | 48 | */ |
49 | 49 | public function indexAction(Request $request, $project = null, $type = null) |
50 | 50 | { |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | * |
111 | 111 | * @Route("/rfx/{project}/{type}/{username}", name="rfxAnalysisResult") |
112 | 112 | * |
113 | - * @return Response|RedirectResponse |
|
113 | + * @return \Symfony\Component\HttpFoundation\Response |
|
114 | 114 | */ |
115 | 115 | public function resultAction($project, $type, $username) |
116 | 116 | { |
@@ -166,7 +166,7 @@ |
||
166 | 166 | $neutral = $rfx->getSection('neutral'); |
167 | 167 | $dup = $rfx->getDuplicates(); |
168 | 168 | |
169 | - $total = count($support) + count($oppose) + count($neutral); |
|
169 | + $total = count($support)+count($oppose)+count($neutral); |
|
170 | 170 | |
171 | 171 | if ($total === 0) { |
172 | 172 | $this->addFlash('notice', ['no-result', $pagename]); |
@@ -35,7 +35,7 @@ |
||
35 | 35 | * Returns matches. |
36 | 36 | * |
37 | 37 | * @param string $input The line we're looking for |
38 | - * @param array $matches Pointer to an array where we stash results |
|
38 | + * @param string[] $matches Pointer to an array where we stash results |
|
39 | 39 | * |
40 | 40 | * @TODO: Make this cleaner |
41 | 41 | * |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | } |
120 | 120 | } |
121 | 121 | |
122 | - $final = []; // initialize the final array |
|
122 | + $final = []; // initialize the final array |
|
123 | 123 | $finalRaw = []; // Initialize the raw data array |
124 | 124 | |
125 | 125 | foreach ($this->data as $key => $value) { |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | |
133 | 133 | $final = array_count_values($final); // find repetition and its count |
134 | 134 | |
135 | - $final = array_diff($final, [1]); // remove single occurrences |
|
135 | + $final = array_diff($final, [1]); // remove single occurrences |
|
136 | 136 | |
137 | 137 | $this->duplicates = array_keys($final); |
138 | 138 | } |
@@ -170,7 +170,7 @@ |
||
170 | 170 | /** |
171 | 171 | * Get edit count within given timeframe and namespace |
172 | 172 | * @param Project $project |
173 | - * @param int|string $namespace Namespace ID or 'all' for all namespaces |
|
173 | + * @param integer $namespace Namespace ID or 'all' for all namespaces |
|
174 | 174 | * @param string $start Start date in a format accepted by strtotime() |
175 | 175 | * @param string $end End date in a format accepted by strtotime() |
176 | 176 | */ |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | $this->getUsername() |
90 | 90 | ); |
91 | 91 | |
92 | - return (int) $editCount; |
|
92 | + return (int)$editCount; |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | /** |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | */ |
142 | 142 | public function isAnon() |
143 | 143 | { |
144 | - return (bool) filter_var($this->username, FILTER_VALIDATE_IP); |
|
144 | + return (bool)filter_var($this->username, FILTER_VALIDATE_IP); |
|
145 | 145 | } |
146 | 146 | |
147 | 147 | /** |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | */ |
205 | 205 | public function countAutomatedEdits(Project $project, $namespace = 'all', $start = '', $end = '') |
206 | 206 | { |
207 | - return (int) $this->getRepository()->countAutomatedEdits($project, $this, $namespace, $start, $end); |
|
207 | + return (int)$this->getRepository()->countAutomatedEdits($project, $this, $namespace, $start, $end); |
|
208 | 208 | } |
209 | 209 | |
210 | 210 | /** |
@@ -236,12 +236,12 @@ discard block |
||
236 | 236 | |
237 | 237 | $namespaces = $project->getNamespaces(); |
238 | 238 | |
239 | - return array_map(function ($rev) use ($namespaces) { |
|
239 | + return array_map(function($rev) use ($namespaces) { |
|
240 | 240 | $pageTitle = $rev['page_title']; |
241 | 241 | $fullPageTitle = ''; |
242 | 242 | |
243 | 243 | if ($rev['page_namespace'] !== '0') { |
244 | - $fullPageTitle = $namespaces[$rev['page_namespace']] . ":$pageTitle"; |
|
244 | + $fullPageTitle = $namespaces[$rev['page_namespace']].":$pageTitle"; |
|
245 | 245 | } else { |
246 | 246 | $fullPageTitle = $pageTitle; |
247 | 247 | } |
@@ -249,12 +249,12 @@ discard block |
||
249 | 249 | return [ |
250 | 250 | 'full_page_title' => $fullPageTitle, |
251 | 251 | 'page_title' => $pageTitle, |
252 | - 'page_namespace' => (int) $rev['page_namespace'], |
|
253 | - 'rev_id' => (int) $rev['rev_id'], |
|
252 | + 'page_namespace' => (int)$rev['page_namespace'], |
|
253 | + 'rev_id' => (int)$rev['rev_id'], |
|
254 | 254 | 'timestamp' => DateTime::createFromFormat('YmdHis', $rev['timestamp']), |
255 | - 'minor' => (bool) $rev['minor'], |
|
256 | - 'length' => (int) $rev['length'], |
|
257 | - 'length_change' => (int) $rev['length_change'], |
|
255 | + 'minor' => (bool)$rev['minor'], |
|
256 | + 'length' => (int)$rev['length'], |
|
257 | + 'length_change' => (int)$rev['length_change'], |
|
258 | 258 | 'comment' => $rev['comment'], |
259 | 259 | ]; |
260 | 260 | }, $revs); |
@@ -13,7 +13,6 @@ |
||
13 | 13 | use Symfony\Component\HttpFoundation\JsonResponse; |
14 | 14 | use Xtools\EditCounter; |
15 | 15 | use Xtools\EditCounterRepository; |
16 | -use Xtools\Page; |
|
17 | 16 | use Xtools\Project; |
18 | 17 | use Xtools\ProjectRepository; |
19 | 18 | use Xtools\User; |
@@ -136,7 +136,7 @@ |
||
136 | 136 | $isSubRequest = $this->container->get('request_stack')->getParentRequest() !== null; |
137 | 137 | |
138 | 138 | return $this->render('editCounter/result.html.twig', [ |
139 | - 'xtTitle' => $this->user->getUsername() . ' - ' . $this->project->getTitle(), |
|
139 | + 'xtTitle' => $this->user->getUsername().' - '.$this->project->getTitle(), |
|
140 | 140 | 'xtPage' => 'ec', |
141 | 141 | 'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..'), |
142 | 142 | 'is_sub_request' => $isSubRequest, |
@@ -505,7 +505,7 @@ |
||
505 | 505 | /** |
506 | 506 | * Get a list of (semi-)automated tools that were used to edit the page, including |
507 | 507 | * the number of times they were used, and a link to the tool's homepage. |
508 | - * @return mixed[] |
|
508 | + * @return string[] |
|
509 | 509 | */ |
510 | 510 | public function getTools() |
511 | 511 | { |
@@ -389,7 +389,7 @@ |
||
389 | 389 | * The edit previously deemed as having the maximum amount of content added. |
390 | 390 | * This is used to discount content that was reverted. |
391 | 391 | * @var Edit|null |
392 | - */ |
|
392 | + */ |
|
393 | 393 | $prevMaxAddEdit = null; |
394 | 394 | |
395 | 395 | /** |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | public function getMaxRevisions() |
160 | 160 | { |
161 | 161 | if (!isset($this->maxRevisions)) { |
162 | - $this->maxRevisions = (int) $this->container->getParameter('app.max_page_revisions'); |
|
162 | + $this->maxRevisions = (int)$this->container->getParameter('app.max_page_revisions'); |
|
163 | 163 | } |
164 | 164 | return $this->maxRevisions; |
165 | 165 | } |
@@ -638,7 +638,7 @@ discard block |
||
638 | 638 | |
639 | 639 | if ($revCount === 0) { |
640 | 640 | $this->firstEdit = $edit; |
641 | - $firstEditMonth = mktime(0, 0, 0, (int) $this->firstEdit->getMonth(), 1, $this->firstEdit->getYear()); |
|
641 | + $firstEditMonth = mktime(0, 0, 0, (int)$this->firstEdit->getMonth(), 1, $this->firstEdit->getYear()); |
|
642 | 642 | } |
643 | 643 | |
644 | 644 | $username = $edit->getUser()->getUsername(); |
@@ -824,7 +824,7 @@ discard block |
||
824 | 824 | $userGroupsTable = $this->getProject()->getTableName('user_groups'); |
825 | 825 | $userFromerGroupsTable = $this->getProject()->getTableName('user_former_groups'); |
826 | 826 | $sql = "SELECT COUNT(rev_user_text) AS count, rev_user_text AS username, ug_group AS current |
827 | - FROM " . $this->getProject()->getTableName('revision') . " |
|
827 | + FROM " . $this->getProject()->getTableName('revision')." |
|
828 | 828 | LEFT JOIN $userGroupsTable ON rev_user = ug_user |
829 | 829 | LEFT JOIN $userFromerGroupsTable ON rev_user = ufg_user |
830 | 830 | WHERE rev_page = :pageId AND (ug_group = 'bot' OR ufg_group = 'bot') |
@@ -839,14 +839,14 @@ discard block |
||
839 | 839 | $sum = 0; |
840 | 840 | while ($bot = $resultQuery->fetch()) { |
841 | 841 | $bots[$bot['username']] = [ |
842 | - 'count' => (int) $bot['count'], |
|
842 | + 'count' => (int)$bot['count'], |
|
843 | 843 | 'current' => $bot['current'] === 'bot' |
844 | 844 | ]; |
845 | 845 | $sum += $bot['count']; |
846 | 846 | } |
847 | 847 | |
848 | - uasort($bots, function ($a, $b) { |
|
849 | - return $b['count'] - $a['count']; |
|
848 | + uasort($bots, function($a, $b) { |
|
849 | + return $b['count']-$a['count']; |
|
850 | 850 | }); |
851 | 851 | |
852 | 852 | $this->botRevisionCount = $sum; |
@@ -869,7 +869,7 @@ discard block |
||
869 | 869 | $title = str_replace(' ', '_', $this->page->getTitle()); |
870 | 870 | $sql = "SELECT log_action, log_type, log_timestamp AS timestamp |
871 | 871 | FROM $loggingTable |
872 | - WHERE log_namespace = '" . $this->page->getNamespace() . "' |
|
872 | + WHERE log_namespace = '".$this->page->getNamespace()."' |
|
873 | 873 | AND log_title = :title AND log_timestamp > 1 |
874 | 874 | AND log_type IN ('delete', 'move', 'protect', 'stable')"; |
875 | 875 | $resultQuery = $this->conn->prepare($sql); |
@@ -944,7 +944,7 @@ discard block |
||
944 | 944 | |
945 | 945 | if ($info['all'] > 1) { |
946 | 946 | // Number of seconds/days between first and last edit |
947 | - $secs = $info['last']->getTimestamp() - $info['first']->getTimestamp(); |
|
947 | + $secs = $info['last']->getTimestamp()-$info['first']->getTimestamp(); |
|
948 | 948 | $days = $secs / (60 * 60 * 24); |
949 | 949 | |
950 | 950 | // Average time between edits (in days) |
@@ -963,7 +963,7 @@ discard block |
||
963 | 963 | |
964 | 964 | // First sort editors array by the amount of text they added |
965 | 965 | $topTenEditorsByAdded = $this->editors; |
966 | - uasort($topTenEditorsByAdded, function ($a, $b) { |
|
966 | + uasort($topTenEditorsByAdded, function($a, $b) { |
|
967 | 967 | if ($a['added'] === $b['added']) { |
968 | 968 | return 0; |
969 | 969 | } |
@@ -972,7 +972,7 @@ discard block |
||
972 | 972 | |
973 | 973 | // Then build a new array of top 10 editors by added text, |
974 | 974 | // in the data structure needed for the chart |
975 | - $this->topTenEditorsByAdded = array_map(function ($editor) { |
|
975 | + $this->topTenEditorsByAdded = array_map(function($editor) { |
|
976 | 976 | $added = $this->editors[$editor]['added']; |
977 | 977 | return [ |
978 | 978 | 'label' => $editor, |