@@ -2,9 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Saito\Test; |
| 4 | 4 | |
| 5 | -use Cake\Event\Event; |
|
| 6 | -use Cake\Event\EventManager; |
|
| 7 | - |
|
| 8 | 5 | trait SecurityMockTrait |
| 9 | 6 | { |
| 10 | 7 | |
@@ -7,7 +7,6 @@ |
||
| 7 | 7 | use Cake\Filesystem\File; |
| 8 | 8 | use Cake\Mailer\Email; |
| 9 | 9 | use Cake\Utility\Inflector; |
| 10 | -use claviska\SimpleImage; |
|
| 11 | 10 | use Cron\Lib\Cron; |
| 12 | 11 | use Plugin\BbcodeParser\src\Lib\Markup; |
| 13 | 12 | use Saito\App\Registry; |
@@ -211,7 +211,7 @@ |
||
| 211 | 211 | /** |
| 212 | 212 | * Filter out unallowed categories |
| 213 | 213 | * |
| 214 | - * @param array $action action to filter for |
|
| 214 | + * @param string $action action to filter for |
|
| 215 | 215 | * @param array $categories categories to filter |
| 216 | 216 | * @return array categories |
| 217 | 217 | */ |
@@ -48,10 +48,10 @@ discard block |
||
| 48 | 48 | public function getAll($action, $format = 'short') |
| 49 | 49 | { |
| 50 | 50 | Stopwatch::start('User\Categories::getAll()'); |
| 51 | - $key = $action . '.' . $format; |
|
| 51 | + $key = $action.'.'.$format; |
|
| 52 | 52 | $categories = $this->remember( |
| 53 | 53 | $key, |
| 54 | - function () use ($action, $format) { |
|
| 54 | + function() use ($action, $format) { |
|
| 55 | 55 | /* @var CategoriesTable $Categories */ |
| 56 | 56 | $Categories = TableRegistry::get('Categories'); |
| 57 | 57 | $all = $Categories->getAllCategories(); |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | case 'custom': |
| 91 | 91 | return $this->getCustom($action); |
| 92 | 92 | case 'single': |
| 93 | - $category = (int)$this->_User->get('user_category_active'); |
|
| 93 | + $category = (int) $this->_User->get('user_category_active'); |
|
| 94 | 94 | $categories = [$category => $category]; |
| 95 | 95 | |
| 96 | 96 | return $this->_filterAllowed($action, $categories); |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | */ |
| 143 | 143 | public function getType() |
| 144 | 144 | { |
| 145 | - $active = (int)$this->_User->get('user_category_active'); |
|
| 145 | + $active = (int) $this->_User->get('user_category_active'); |
|
| 146 | 146 | if ($active > 0) { |
| 147 | 147 | return 'single'; |
| 148 | 148 | } |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | } elseif (is_array($category)) { |
| 171 | 171 | $category = $category['id']; |
| 172 | 172 | } |
| 173 | - $resource = 'saito.core.category.' . $category . '.' . $action; |
|
| 173 | + $resource = 'saito.core.category.'.$category.'.'.$action; |
|
| 174 | 174 | |
| 175 | 175 | return $this->_User->permission($resource); |
| 176 | 176 | } |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | { |
| 185 | 185 | return $this->remember( |
| 186 | 186 | 'isCustomAllowed', |
| 187 | - function () { |
|
| 187 | + function() { |
|
| 188 | 188 | if (!$this->_User->isLoggedIn()) { |
| 189 | 189 | return false; |
| 190 | 190 | } |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | * tested if new for user. |
| 38 | 38 | * |
| 39 | 39 | * @param string|\DateTimeInterface $timestamp int unix-timestamp or date as string |
| 40 | - * @return mixed bool or null if not determinable |
|
| 40 | + * @return null|boolean bool or null if not determinable |
|
| 41 | 41 | */ |
| 42 | 42 | public function isNewerThan($timestamp) |
| 43 | 43 | { |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | /** |
| 61 | 61 | * Set timestamp. |
| 62 | 62 | * |
| 63 | - * @param mixed $timestamp null|'now'|<`Y-m-d H:i:s` timestamp> |
|
| 63 | + * @param string $timestamp null|'now'|<`Y-m-d H:i:s` timestamp> |
|
| 64 | 64 | * @return void |
| 65 | 65 | */ |
| 66 | 66 | public function set($timestamp = null) |
@@ -2,7 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Saito\User\LastRefresh; |
| 4 | 4 | |
| 5 | -use App\Controller\Component\CurrentUserComponent; |
|
| 6 | 5 | use Saito\User\Cookie; |
| 7 | 6 | |
| 8 | 7 | /** |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | namespace Saito\User\ReadPostings; |
| 4 | 4 | |
| 5 | 5 | use App\Controller\Component\CurrentUserComponent; |
| 6 | -use Cake\Utility\Hash; |
|
| 7 | 6 | use Saito\Posting\Posting; |
| 8 | 7 | |
| 9 | 8 | /** |
@@ -127,6 +127,7 @@ discard block |
||
| 127 | 127 | |
| 128 | 128 | /** |
| 129 | 129 | * {@inheritDoc} |
| 130 | + * @return boolean|string |
|
| 130 | 131 | */ |
| 131 | 132 | public function isLoggedIn() |
| 132 | 133 | { |
@@ -152,7 +153,7 @@ discard block |
||
| 152 | 153 | /** |
| 153 | 154 | * Checks if user is forbidden. |
| 154 | 155 | * |
| 155 | - * @return bool|string |
|
| 156 | + * @return string|false |
|
| 156 | 157 | */ |
| 157 | 158 | public function isForbidden() |
| 158 | 159 | { |
@@ -3,8 +3,6 @@ |
||
| 3 | 3 | namespace Saito\User; |
| 4 | 4 | |
| 5 | 5 | use App\Model\Entity\User; |
| 6 | -use Cake\Core\Exception\Exception; |
|
| 7 | -use Cake\I18n\Time; |
|
| 8 | 6 | use Cake\Utility\Hash; |
| 9 | 7 | use Saito\App\Registry; |
| 10 | 8 | |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | if (!empty($settings['id'])) { |
| 59 | - $this->_id = (int)$settings['id']; |
|
| 59 | + $this->_id = (int) $settings['id']; |
|
| 60 | 60 | $this->_isLoggedIn = true; |
| 61 | 61 | } |
| 62 | 62 | |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | public function isUser($user) |
| 140 | 140 | { |
| 141 | 141 | if (is_numeric($user)) { |
| 142 | - $id = (int)$user; |
|
| 142 | + $id = (int) $user; |
|
| 143 | 143 | } elseif ($user instanceof ForumsUserInterface || $user instanceof User) { |
| 144 | 144 | $id = $user->get('id'); |
| 145 | 145 | } else { |
@@ -3,11 +3,9 @@ |
||
| 3 | 3 | namespace Saito\User\Upload; |
| 4 | 4 | |
| 5 | 5 | use App\Model\Entity\User; |
| 6 | -use Cake\Core\Configure; |
|
| 7 | 6 | use Cake\Event\Event; |
| 8 | 7 | use Cake\Event\EventListenerInterface; |
| 9 | 8 | use Cake\Filesystem\Folder; |
| 10 | -use Cake\ORM\Entity; |
|
| 11 | 9 | use Cake\Utility\Text; |
| 12 | 10 | use Proffer\Lib\ProfferPath; |
| 13 | 11 | |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | |
| 74 | 74 | // `webroot/files/<table>/<field>/<seed>/<file>` |
| 75 | 75 | |
| 76 | - $newFilename = Text::uuid() . $ext; |
|
| 76 | + $newFilename = Text::uuid().$ext; |
|
| 77 | 77 | |
| 78 | 78 | // $path->setTable('avatars'); |
| 79 | 79 | |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | $dir = $user->get('id'); |
| 120 | 120 | if (!empty($dir)) { |
| 121 | 121 | $folder = new Folder( |
| 122 | - $this->rootDirectory . '/users/avatar/' . $dir |
|
| 122 | + $this->rootDirectory.'/users/avatar/'.$dir |
|
| 123 | 123 | ); |
| 124 | 124 | $folder->delete(); |
| 125 | 125 | } |
@@ -416,7 +416,7 @@ discard block |
||
| 416 | 416 | * get parent id |
| 417 | 417 | * |
| 418 | 418 | * @param int $id id |
| 419 | - * @return mixed |
|
| 419 | + * @return integer |
|
| 420 | 420 | * @throws \UnexpectedValueException |
| 421 | 421 | */ |
| 422 | 422 | public function getParentId($id) |
@@ -627,7 +627,7 @@ discard block |
||
| 627 | 627 | /** |
| 628 | 628 | * trees for multiple tids |
| 629 | 629 | * |
| 630 | - * @param array $ids ids |
|
| 630 | + * @param integer[] $ids ids |
|
| 631 | 631 | * @param array $order order |
| 632 | 632 | * @param array $fieldlist fieldlist |
| 633 | 633 | * @return array|bool false if no threads or array of Postings |
@@ -679,7 +679,7 @@ discard block |
||
| 679 | 679 | * @param array $params params |
| 680 | 680 | * - 'fields' array of thread-ids: [1, 2, 5] |
| 681 | 681 | * - 'order' sort order for threads ['time' => 'ASC'], |
| 682 | - * @return mixed unhydrated result set |
|
| 682 | + * @return Query unhydrated result set |
|
| 683 | 683 | */ |
| 684 | 684 | protected function _getThreadEntries(array $tid, array $params = []) |
| 685 | 685 | { |
@@ -747,6 +747,8 @@ discard block |
||
| 747 | 747 | |
| 748 | 748 | /** |
| 749 | 749 | * {@inheritDoc} |
| 750 | + * @param integer $id |
|
| 751 | + * @param string $key |
|
| 750 | 752 | */ |
| 751 | 753 | public function toggle($id, $key) |
| 752 | 754 | { |
@@ -826,7 +828,7 @@ discard block |
||
| 826 | 828 | * Anonymizes the entries for a user |
| 827 | 829 | * |
| 828 | 830 | * @param string $userId user-ID |
| 829 | - * @return bool success |
|
| 831 | + * @return integer success |
|
| 830 | 832 | */ |
| 831 | 833 | public function anonymizeEntriesFromUser($userId) |
| 832 | 834 | { |
@@ -933,7 +935,7 @@ discard block |
||
| 933 | 935 | * Check if posting is thread-root. |
| 934 | 936 | * |
| 935 | 937 | * @param array $id posting-ID or posting data |
| 936 | - * @return mixed |
|
| 938 | + * @return boolean |
|
| 937 | 939 | */ |
| 938 | 940 | protected function _isRoot(array $id) |
| 939 | 941 | { |
@@ -1128,7 +1130,7 @@ discard block |
||
| 1128 | 1130 | * |
| 1129 | 1131 | * @param null $tid thread-ID |
| 1130 | 1132 | * @param null $newCategoryId id for new category |
| 1131 | - * @return bool success |
|
| 1133 | + * @return integer success |
|
| 1132 | 1134 | * @throws \NotFoundException |
| 1133 | 1135 | * @throws \InvalidArgumentException |
| 1134 | 1136 | */ |
@@ -19,8 +19,6 @@ |
||
| 19 | 19 | use Cake\Http\Exception\NotFoundException; |
| 20 | 20 | use Cake\ORM\Entity; |
| 21 | 21 | use Cake\ORM\Query; |
| 22 | -use Cake\ORM\RulesChecker; |
|
| 23 | -use Cake\ORM\TableRegistry; |
|
| 24 | 22 | use Cake\Validation\Validator; |
| 25 | 23 | use Saito\App\Registry; |
| 26 | 24 | use Saito\Posting\Posting; |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | 'Users' => ['entry_count'], |
| 171 | 171 | // cache how many threads a category has |
| 172 | 172 | 'Categories' => [ |
| 173 | - 'thread_count' => function ($event, Entity $entity, $table, $original) { |
|
| 173 | + 'thread_count' => function($event, Entity $entity, $table, $original) { |
|
| 174 | 174 | if (!$entity->isRoot()) { |
| 175 | 175 | return false; |
| 176 | 176 | } |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | |
| 318 | 318 | $options['category_id'] = $User->Categories->getAll('read'); |
| 319 | 319 | |
| 320 | - $read = function () use ($options) { |
|
| 320 | + $read = function() use ($options) { |
|
| 321 | 321 | $conditions = []; |
| 322 | 322 | if ($options['user_id'] !== null) { |
| 323 | 323 | $conditions[]['Entries.user_id'] = $options['user_id']; |
@@ -344,7 +344,7 @@ discard block |
||
| 344 | 344 | return $result; |
| 345 | 345 | }; |
| 346 | 346 | |
| 347 | - $key = 'Entry.recentEntries-' . md5(serialize($options)); |
|
| 347 | + $key = 'Entry.recentEntries-'.md5(serialize($options)); |
|
| 348 | 348 | $results = Cache::remember($key, $read, 'entries'); |
| 349 | 349 | |
| 350 | 350 | $threads = []; |
@@ -375,7 +375,7 @@ discard block |
||
| 375 | 375 | )->first(); |
| 376 | 376 | if (empty($entry)) { |
| 377 | 377 | throw new \UnexpectedValueException( |
| 378 | - 'Posting not found. Posting-Id: ' . $id |
|
| 378 | + 'Posting not found. Posting-Id: '.$id |
|
| 379 | 379 | ); |
| 380 | 380 | } |
| 381 | 381 | |
@@ -396,7 +396,7 @@ discard block |
||
| 396 | 396 | unset($options['return']); |
| 397 | 397 | |
| 398 | 398 | $result = $this->find('entry') |
| 399 | - ->where([$this->getAlias() . '.id' => $primaryKey]) |
|
| 399 | + ->where([$this->getAlias().'.id' => $primaryKey]) |
|
| 400 | 400 | ->first(); |
| 401 | 401 | |
| 402 | 402 | if (!$result) { |
@@ -424,7 +424,7 @@ discard block |
||
| 424 | 424 | $entry = $this->find()->select('pid')->where(['id' => $id])->first(); |
| 425 | 425 | if (!$entry) { |
| 426 | 426 | throw new \UnexpectedValueException( |
| 427 | - 'Posting not found. Posting-Id: ' . $id |
|
| 427 | + 'Posting not found. Posting-Id: '.$id |
|
| 428 | 428 | ); |
| 429 | 429 | } |
| 430 | 430 | |
@@ -617,7 +617,7 @@ discard block |
||
| 617 | 617 | $tree = reset($tree); |
| 618 | 618 | |
| 619 | 619 | //= extract subtree |
| 620 | - if ((int)$tid !== (int)$id) { |
|
| 620 | + if ((int) $tid !== (int) $id) { |
|
| 621 | 621 | $tree = $tree->getThread()->get($id); |
| 622 | 622 | } |
| 623 | 623 | |