| @@ -41,7 +41,6 @@ | ||
| 41 | 41 | use Cake\Http\ServerRequest; | 
| 42 | 42 | use Cake\Log\Log; | 
| 43 | 43 | use Cake\Mailer\Email; | 
| 44 | -use Cake\Routing\DispatcherFactory; | |
| 45 | 44 | use Cake\Utility\Inflector; | 
| 46 | 45 | use Cake\Utility\Security; | 
| 47 | 46 | |
| @@ -35,7 +35,7 @@ discard block | ||
| 35 | 35 | /** | 
| 36 | 36 | * add new category | 
| 37 | 37 | * | 
| 38 | - * @return \Cake\Network\Response|void | |
| 38 | + * @return \Cake\Http\Response|null | |
| 39 | 39 | */ | 
| 40 | 40 | public function add() | 
| 41 | 41 |      { | 
| @@ -66,7 +66,7 @@ discard block | ||
| 66 | 66 | * edit category | 
| 67 | 67 | * | 
| 68 | 68 | * @param string $id category-ID | 
| 69 | - * @return \Cake\Network\Response|void | |
| 69 | + * @return \Cake\Http\Response|null | |
| 70 | 70 | */ | 
| 71 | 71 | public function edit($id) | 
| 72 | 72 |      { | 
| @@ -106,7 +106,7 @@ discard block | ||
| 106 | 106 | * | 
| 107 | 107 | * @param string $id category-ID | 
| 108 | 108 | * | 
| 109 | - * @return \Cake\Network\Response|void | |
| 109 | + * @return \Cake\Http\Response|null | |
| 110 | 110 | */ | 
| 111 | 111 | public function delete($id) | 
| 112 | 112 |      { | 
| @@ -89,7 +89,7 @@ | ||
| 89 | 89 | * | 
| 90 | 90 | * @param null $id settings-ID | 
| 91 | 91 | * | 
| 92 | - * @return \Cake\Network\Response|void | |
| 92 | + * @return \Cake\Http\Response|null | |
| 93 | 93 | */ | 
| 94 | 94 | public function edit($id = null) | 
| 95 | 95 |      { | 
| @@ -45,7 +45,7 @@ discard block | ||
| 45 | 45 | /** | 
| 46 | 46 | * add user | 
| 47 | 47 | * | 
| 48 | - * @return \Cake\Network\Response|void | |
| 48 | + * @return \Cake\Http\Response|null | |
| 49 | 49 | */ | 
| 50 | 50 | public function add() | 
| 51 | 51 |      { | 
| @@ -68,7 +68,7 @@ discard block | ||
| 68 | 68 | * delete user | 
| 69 | 69 | * | 
| 70 | 70 | * @param string $id user-ID | 
| 71 | - * @return \Cake\Network\Response|void | |
| 71 | + * @return \Cake\Http\Response|null | |
| 72 | 72 | */ | 
| 73 | 73 | public function delete($id) | 
| 74 | 74 |      { | 
| @@ -2,8 +2,6 @@ | ||
| 2 | 2 | |
| 3 | 3 | namespace Admin\Controller; | 
| 4 | 4 | |
| 5 | -use App\Controller\AppController; | |
| 6 | - | |
| 7 | 5 | class UsersController extends AdminAppController | 
| 8 | 6 |  { | 
| 9 | 7 | public $actionAuthConfig = [ | 
| @@ -15,7 +15,6 @@ | ||
| 15 | 15 | use App\Controller\AppController; | 
| 16 | 16 | use Cake\Controller\Component\AuthComponent; | 
| 17 | 17 | use Cake\Core\Configure; | 
| 18 | -use Cake\Event\Event; | |
| 19 | 18 | |
| 20 | 19 | /** | 
| 21 | 20 | * Api App Controller | 
| @@ -566,6 +566,7 @@ | ||
| 566 | 566 | |
| 567 | 567 | /** | 
| 568 | 568 |       * {@inheritDoc} | 
| 569 | + * @param string $content | |
| 569 | 570 | */ | 
| 570 | 571 | protected function _getUrl($content, $attributes) | 
| 571 | 572 |      { | 
| @@ -208,7 +208,7 @@ discard block | ||
| 208 | 208 | * Constructor | 
| 209 | 209 | * | 
| 210 | 210 | * @param Helper $Helper helper | 
| 211 | - * @param array $settings settings | |
| 211 | + * @param MarkupSettings $settings settings | |
| 212 | 212 | */ | 
| 213 | 213 | public function __construct(Helper $Helper, MarkupSettings $settings) | 
| 214 | 214 |      { | 
| @@ -225,7 +225,7 @@ discard block | ||
| 225 | 225 | * - `multimedia` bool true|false parse or ignore multimedia content | 
| 226 | 226 | * - `embed` bool true|false parse or ignore embed content | 
| 227 | 227 | * | 
| 228 | - * @return mixed|string | |
| 228 | + * @return string | |
| 229 | 229 | */ | 
| 230 | 230 | public function parse($string, array $options = []) | 
| 231 | 231 |      { | 
| @@ -315,7 +315,7 @@ discard block | ||
| 315 | 315 | * Add definitin set | 
| 316 | 316 | * | 
| 317 | 317 | * @param string $set set | 
| 318 | - * @param array $options options | |
| 318 | + * @param MarkupSettings $options options | |
| 319 | 319 | * | 
| 320 | 320 | * @return void | 
| 321 | 321 | * @throws \Exception | 
| @@ -20,8 +20,6 @@ | ||
| 20 | 20 | use Cake\Http\Exception\NotFoundException; | 
| 21 | 21 | use Cake\Network\Exception\MethodNotAllowedException; | 
| 22 | 22 | use Cake\ORM\Entity; | 
| 23 | -use Cake\ORM\Query; | |
| 24 | -use Saito\App\Registry; | |
| 25 | 23 | use Saito\Exception\SaitoForbiddenException; | 
| 26 | 24 | |
| 27 | 25 | /** | 
| @@ -12,7 +12,6 @@ | ||
| 12 | 12 | |
| 13 | 13 | namespace Bookmarks\Lib; | 
| 14 | 14 | |
| 15 | -use App\Controller\Component\CurrentUserComponent; | |
| 16 | 15 | use Cake\ORM\TableRegistry; | 
| 17 | 16 | use Saito\User\CurrentUser\CurrentUserInterface; | 
| 18 | 17 | |