@@ -26,7 +26,7 @@ |
||
26 | 26 | /** |
27 | 27 | * Generate posting preview for JSON frontend. |
28 | 28 | * |
29 | - * @return \Cake\Network\Response|void |
|
29 | + * @return null|\Cake\Http\Response |
|
30 | 30 | * @throws BadRequestException |
31 | 31 | * @throws ForbiddenException |
32 | 32 | */ |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | /** |
15 | 15 | * Current app status ping |
16 | 16 | * |
17 | - * @return string |
|
17 | + * @return \Cake\Http\Response |
|
18 | 18 | * @throws BadRequestException |
19 | 19 | */ |
20 | 20 | public function status() |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | * Get status as JSON response |
56 | 56 | * |
57 | 57 | * @param string $data json-encoded data |
58 | - * @return mixed |
|
58 | + * @return string |
|
59 | 59 | */ |
60 | 60 | protected function _statusAsJson($data) |
61 | 61 | { |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Cake\Event\Event; |
6 | 6 | use Cake\Http\Exception\BadRequestException; |
7 | -use Cake\ORM\TableRegistry; |
|
8 | 7 | |
9 | 8 | class StatusController extends AppController |
10 | 9 | { |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | /** |
57 | 57 | * Login user. |
58 | 58 | * |
59 | - * @return void|\Cake\Network\Response |
|
59 | + * @return null|Response |
|
60 | 60 | */ |
61 | 61 | public function login() |
62 | 62 | { |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | * |
310 | 310 | * @param int $blockedId user to ignore |
311 | 311 | * @param bool $set block or unblock |
312 | - * @return \Cake\Network\Response |
|
312 | + * @return Response|null |
|
313 | 313 | */ |
314 | 314 | protected function _ignore($blockedId, $set) |
315 | 315 | { |
@@ -359,7 +359,7 @@ discard block |
||
359 | 359 | * View user profile. |
360 | 360 | * |
361 | 361 | * @param null $id user-ID |
362 | - * @return \Cake\Network\Response|void |
|
362 | + * @return null|Response |
|
363 | 363 | */ |
364 | 364 | public function view($id = null) |
365 | 365 | { |
@@ -420,8 +420,8 @@ discard block |
||
420 | 420 | /** |
421 | 421 | * Set user avatar. |
422 | 422 | * |
423 | - * @param string $userId user-ID |
|
424 | - * @return void|\Cake\Network\Response |
|
423 | + * @param integer $userId user-ID |
|
424 | + * @return Response|null |
|
425 | 425 | */ |
426 | 426 | public function avatar(int $userId) |
427 | 427 | { |
@@ -454,7 +454,7 @@ discard block |
||
454 | 454 | * |
455 | 455 | * @param null $id user-ID |
456 | 456 | * |
457 | - * @return \Cake\Network\Response|void |
|
457 | + * @return Response|null |
|
458 | 458 | */ |
459 | 459 | public function edit($id = null) |
460 | 460 | { |
@@ -661,7 +661,7 @@ discard block |
||
661 | 661 | /** |
662 | 662 | * Set slidetab-order. |
663 | 663 | * |
664 | - * @return \Cake\Network\Response |
|
664 | + * @return Response |
|
665 | 665 | * @throws BadRequestException |
666 | 666 | */ |
667 | 667 | public function slidetabOrder() |
@@ -709,7 +709,7 @@ discard block |
||
709 | 709 | * Set category for user. |
710 | 710 | * |
711 | 711 | * @param null $id category-ID |
712 | - * @return \Cake\Network\Response |
|
712 | + * @return Response|null |
|
713 | 713 | * @throws ForbiddenException |
714 | 714 | */ |
715 | 715 | public function setcategory($id = null) |
@@ -10,7 +10,6 @@ |
||
10 | 10 | namespace App\Controller; |
11 | 11 | |
12 | 12 | use App\Controller\Component\RefererComponent; |
13 | -use App\Controller\Component\ThemesComponent; |
|
14 | 13 | use App\Form\BlockForm; |
15 | 14 | use App\Model\Entity\User; |
16 | 15 | use App\Model\Table\UsersTable; |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | } |
229 | 229 | $code = $this->request->getQuery('c'); |
230 | 230 | try { |
231 | - $activated = $this->Users->activate((int)$id, $code); |
|
231 | + $activated = $this->Users->activate((int) $id, $code); |
|
232 | 232 | } catch (\Exception $e) { |
233 | 233 | $activated = false; |
234 | 234 | } |
@@ -286,7 +286,7 @@ discard block |
||
286 | 286 | public function ignore() |
287 | 287 | { |
288 | 288 | $this->request->allowMethod('POST'); |
289 | - $blockedId = (int)$this->request->getData('id'); |
|
289 | + $blockedId = (int) $this->request->getData('id'); |
|
290 | 290 | $this->_ignore($blockedId, true); |
291 | 291 | } |
292 | 292 | |
@@ -298,7 +298,7 @@ discard block |
||
298 | 298 | public function unignore() |
299 | 299 | { |
300 | 300 | $this->request->allowMethod('POST'); |
301 | - $blockedId = (int)$this->request->getData('id'); |
|
301 | + $blockedId = (int) $this->request->getData('id'); |
|
302 | 302 | $this->_ignore($blockedId, false); |
303 | 303 | } |
304 | 304 | |
@@ -312,7 +312,7 @@ discard block |
||
312 | 312 | protected function _ignore($blockedId, $set) |
313 | 313 | { |
314 | 314 | $userId = $this->CurrentUser->getId(); |
315 | - if ((int)$userId === (int)$blockedId) { |
|
315 | + if ((int) $userId === (int) $blockedId) { |
|
316 | 316 | throw new BadRequestException(); |
317 | 317 | } |
318 | 318 | if ($set) { |
@@ -534,7 +534,7 @@ discard block |
||
534 | 534 | throw new BadRequestException; |
535 | 535 | } |
536 | 536 | |
537 | - $id = (int)$this->request->getData('lockUserId'); |
|
537 | + $id = (int) $this->request->getData('lockUserId'); |
|
538 | 538 | if (!$this->Users->exists($id)) { |
539 | 539 | throw new NotFoundException('User does not exist.', 1524298280); |
540 | 540 | } |
@@ -548,7 +548,7 @@ discard block |
||
548 | 548 | $this->Flash->set($message, ['element' => 'error']); |
549 | 549 | } else { |
550 | 550 | try { |
551 | - $duration = (int)$this->request->getData('lockPeriod'); |
|
551 | + $duration = (int) $this->request->getData('lockPeriod'); |
|
552 | 552 | $blocker = new ManualBlocker($this->CurrentUser->getId(), $duration); |
553 | 553 | $status = $this->Users->UserBlocks->block($blocker, $id); |
554 | 554 | if (!$status) { |
@@ -14,7 +14,7 @@ |
||
14 | 14 | * |
15 | 15 | * @param Event $event event |
16 | 16 | * @param Entity $entity entity |
17 | - * @param array|\ArrayObject $options options |
|
17 | + * @param \ArrayObject $options options |
|
18 | 18 | * - 'clearCache' set to 'false' to prevent cache clearing |
19 | 19 | * @return void |
20 | 20 | */ |
@@ -6,7 +6,6 @@ |
||
6 | 6 | use Cake\Database\Expression\QueryExpression; |
7 | 7 | use Cake\Event\Event; |
8 | 8 | use Cake\Event\EventManager; |
9 | -use Cake\ORM\Entity; |
|
10 | 9 | use Cake\ORM\Table; |
11 | 10 | use Saito\Event\SaitoEventManager; |
12 | 11 |
@@ -125,6 +125,7 @@ |
||
125 | 125 | |
126 | 126 | /** |
127 | 127 | * {@inheritdoc} |
128 | + * @param string $key |
|
128 | 129 | */ |
129 | 130 | public function getConfig($key = null, $default = null) |
130 | 131 | { |
@@ -62,7 +62,7 @@ |
||
62 | 62 | /** |
63 | 63 | * attaches event-listener |
64 | 64 | * |
65 | - * @param string|SaitoEventListener $key key |
|
65 | + * @param \Saito\Cache\EntriesCacheSupportCachelet $key key |
|
66 | 66 | * @param null $callable function if $key is set |
67 | 67 | * @return void |
68 | 68 | * @throws InvalidArgumentException |
@@ -43,7 +43,7 @@ |
||
43 | 43 | /** |
44 | 44 | * Checks if answering an entry is allowed |
45 | 45 | * |
46 | - * @return bool |
|
46 | + * @return string|boolean |
|
47 | 47 | */ |
48 | 48 | public function isAnsweringForbidden() |
49 | 49 | { |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Saito\Posting\Basic\BasicPostingInterface; |
6 | 6 | use Saito\Posting\Basic\BasicPostingTrait; |
7 | -use Saito\Posting\Decorator\PostingTrait; |
|
8 | 7 | use Saito\Posting\Decorator\UserPostingTrait; |
9 | 8 | use Saito\Thread\Thread; |
10 | 9 | use Saito\User\CurrentUser\CurrentUser; |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Saito\Smiley; |
4 | 4 | |
5 | 5 | use Cake\Cache\Cache; |
6 | -use Cake\Core\Configure; |
|
7 | 6 | use Cake\ORM\TableRegistry; |
8 | 7 | |
9 | 8 | class SmileyLoader |