Schlaefer / Saito

src/Controller/AppController.php

Doc Comments +1 added lines, -1 removed lines

@@ -188,7 +188,7 @@
     /**
      * manually require auth and redirect cycle
      *
-     * @return Response
+     * @return \Cake\Http\Response|null
      */
     protected function _requireAuth()
     {

Unused Use Statements -1 removed lines

@@ -9,7 +9,6 @@
 use Cake\Event\Event;
 use Cake\I18n\I18n;
 use Cake\Network\Http\Response;
-use Cake\Routing\Router;
 use Saito\App\SettingsImmutable;
 use Saito\Event\SaitoEventManager;
 use Saito\User\CurrentUser\CurrentUser;

Spacing +4 added lines, -4 removed lines

@@ -216,10 +216,10 @@
             return;
         }
 
-        $check = function ($locale) {
-            $l10nViewPath = $this->viewBuilder()->getTemplatePath() . DS . $locale;
-            $l10nViewFile = $l10nViewPath . DS . $this->viewBuilder()->getName() . '.ctp';
-            if (!file_exists(APP . 'Template' . DS . $l10nViewFile)) {
+        $check = function($locale) {
+            $l10nViewPath = $this->viewBuilder()->getTemplatePath().DS.$locale;
+            $l10nViewFile = $l10nViewPath.DS.$this->viewBuilder()->getName().'.ctp';
+            if (!file_exists(APP.'Template'.DS.$l10nViewFile)) {
                 return false;
             }
 

src/Controller/Component/CurrentUserComponent.php

Unused Use Statements -2 removed lines

@@ -16,7 +16,6 @@ 
 use Cake\Core\Configure;
 use Cake\Event\Event;
 use Cake\ORM\TableRegistry;
-use Cake\Routing\Router;
 use Cake\Utility\Security;
 use Firebase\JWT\JWT;
 use Saito\App\Registry;
@@ -26,7 +25,6 @@ 
 use Saito\User\CurrentUser\CurrentUserInterface;
 use Saito\User\CurrentUser\CurrentUserTrait;
 use Saito\User\LastRefresh;
-use Saito\User\ReadPostings;
 use Saito\User\ReadPostings\ReadPostingsCookie;
 use Saito\User\ReadPostings\ReadPostingsDatabase;
 use Saito\User\ReadPostings\ReadPostingsDummy;

Spacing +3 added lines, -3 removed lines

@@ -180,7 +180,7 @@ 
         }
 
         //= set persistent Cookie
-        $setCookie = (bool)$this->request->getData('remember_me');
+        $setCookie = (bool) $this->request->getData('remember_me');
         if ($setCookie) {
             (new CurrentUserCookie($this->getController()))->write($this->getId());
         };
@@ -292,7 +292,7 @@ 
         $auth->setConfig('loginAction', '/login');
 
         $here = urlencode($this->getController()->getRequest()->getRequestTarget());
-        $auth->setConfig('unauthorizedRedirect', '/login?redirect=' . $here);
+        $auth->setConfig('unauthorizedRedirect', '/login?redirect='.$here);
 
         if ($this->isLoggedIn()) {
             $auth->allow();
@@ -318,7 +318,7 @@ 
      */
     private function setJwtCookie(Controller $controller): void
     {
-        $cookieKey = Configure::read('Session.cookie') . '-jwt';
+        $cookieKey = Configure::read('Session.cookie').'-jwt';
         $cookie = (new Storage($controller, $cookieKey, ['http' => false, 'expire' => '+1 week']));
 
         $existingToken = $cookie->read();

src/Controller/Component/SlidetabsComponent.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace App\Controller\Component;
 
 use Cake\Controller\Component;
-use Cake\Core\Configure;
 use Saito\User\ForumsUserInterface;
 
 class SlidetabsComponent extends Component

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
             $tabs = $slidetabs;
         }
         $tabs = array_map(
-            function ($v) {
+            function($v) {
                 return $this->_available[$v];
             },
             $tabs

src/Controller/Component/ThreadsComponent.php

Unused Use Statements -1 removed lines

@@ -15,7 +15,6 @@
 use Cake\Core\Configure;
 use Cake\ORM\Entity;
 use Cake\ORM\TableRegistry;
-use Cake\Utility\Hash;
 use Saito\App\Registry;
 use Saito\Posting\Posting;
 use Stopwatch\Lib\Stopwatch;

Spacing +2 added lines, -2 removed lines

@@ -80,14 +80,14 @@
             'order' => $order,
             // Performance: Custom counter from categories counter-cache;
             // avoids a costly COUNT(*) DB call counting all pages for pagination.
-            'counter' => function ($query) use ($categories) {
+            'counter' => function($query) use ($categories) {
                 $results = $this->Entries->Categories->find('all')
                 ->select(['thread_count'])
                 ->where(['id IN' => $categories])
                 ->all();
                 $count = array_reduce(
                     $results->toArray(),
-                    function ($carry, Entity $entity) {
+                    function($carry, Entity $entity) {
                         return $carry + $entity->get('thread_count');
                     },
                     0

src/Controller/ContactsController.php

Doc Comments +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
      * @param Form $contact contact-form
      * @param mixed $recipient recipient
      * @param mixed $sender sender
-     * @return \Cake\Network\Response|void
+     * @return \Cake\Http\Response|null
      */
     protected function _contact(Form $contact, $recipient, $sender)
     {

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
                         'subject' => $this->request->getData('subject'),
                         'message' => $this->request->getData('text'),
                         'template' => 'user_contact',
-                        'ccsender' => (bool)$this->request->getData('cc'),
+                        'ccsender' => (bool) $this->request->getData('cc'),
                     ];
                     $this->SaitoEmail->email($email);
                     $message = __('Message was send.');

src/Controller/EntriesController.php

Doc Comments +7 added lines, -7 removed lines

@@ -64,7 +64,7 @@ 
     /**
      * posting index
      *
-     * @return void|\Cake\Network\Response
+     * @return \Cake\Http\Response|null
      */
     public function index()
     {
@@ -111,7 +111,7 @@ 
      * Mix view
      *
      * @param string $tid thread-ID
-     * @return void|Response
+     * @return \Cake\Http\Response|null
      * @throws NotFoundException
      */
     public function mix($tid)
@@ -184,7 +184,7 @@ 
      * View posting.
      *
      * @param string $id posting-ID
-     * @return \Cake\Network\Response|void
+     * @return \Cake\Http\Response|null
      */
     public function view($id = null)
     {
@@ -236,7 +236,7 @@ 
      * Add new posting.
      *
      * @param null|string $id parent-ID if is answer
-     * @return void|\Cake\Network\Response
+     * @return \Cake\Http\Response|null
      * @throws ForbiddenException
      */
     public function add($id = null)
@@ -345,7 +345,7 @@ 
      * Get thread-line to insert after an inline-answer
      *
      * @param string $id posting-ID
-     * @return void|\Cake\Network\Response
+     * @return \Cake\Http\Response|null
      */
     public function threadLine($id = null)
     {
@@ -364,7 +364,7 @@ 
      * Edit posting
      *
      * @param string $id posting-ID
-     * @return void|\Cake\Network\Response
+     * @return \Cake\Http\Response|null
      * @throws NotFoundException
      * @throws BadRequestException
      */
@@ -570,7 +570,7 @@ 
      * @param string $id posting-ID
      * @param string $toggle property
      *
-     * @return \Cake\Network\Response
+     * @return \Cake\Http\Response
      */
     public function ajaxToggle($id = null, $toggle = null)
     {

Unused Use Statements -3 removed lines

@@ -9,7 +9,6 @@ 
 
 namespace App\Controller;
 
-use App\Controller\Component\CurrentUserComponent;
 use App\Controller\Component\MarkAsReadComponent;
 use App\Controller\Component\ThreadsComponent;
 use App\Model\Entity\Entry;
@@ -19,11 +18,9 @@ 
 use Cake\Http\Exception\BadRequestException;
 use Cake\Http\Exception\ForbiddenException;
 use Cake\Http\Exception\NotFoundException;
-use Cake\I18n\Time;
 use Cake\Network\Exception\MethodNotAllowedException;
 use Cake\Network\Http\Response;
 use Cake\Routing\RequestActionTrait;
-use Saito\App\Registry;
 use Saito\Posting\Posting;
 use Saito\User\ForumsUserInterface;
 use Stopwatch\Lib\Stopwatch;

Spacing +8 added lines, -8 removed lines

@@ -81,9 +81,9 @@ 
         $threads = $this->Threads->paginate($order);
         $this->set('entries', $threads);
 
-        $currentPage = (int)$this->request->getQuery('page') ?: 1;
+        $currentPage = (int) $this->request->getQuery('page') ?: 1;
         if ($currentPage > 1) {
-            $this->set('titleForLayout', __('page') . ' ' . $currentPage);
+            $this->set('titleForLayout', __('page').' '.$currentPage);
         }
         if ($currentPage === 1) {
             if ($this->MarkAsRead->refresh()) {
@@ -116,7 +116,7 @@ 
      */
     public function mix($tid)
     {
-        $tid = (int)$tid;
+        $tid = (int) $tid;
         if ($tid <= 0) {
             throw new BadRequestException();
         }
@@ -485,7 +485,7 @@ 
                 $redirect = '/';
             } else {
                 $message = __('delete_subtree_success');
-                $redirect = '/entries/view/' . $posting->get('pid');
+                $redirect = '/entries/view/'.$posting->get('pid');
             }
         } else {
             $flashType = 'error';
@@ -552,7 +552,7 @@ 
         $targetId = $this->request->getData('targetId');
         if (!empty($targetId)) {
             if ($this->Entries->threadMerge($sourceId, $targetId)) {
-                $this->redirect('/entries/view/' . $sourceId);
+                $this->redirect('/entries/view/'.$sourceId);
 
                 return;
             } else {
@@ -583,11 +583,11 @@ 
             throw new BadRequestException;
         }
 
-        $current = $this->Entries->toggle((int)$id, $toggle);
+        $current = $this->Entries->toggle((int) $id, $toggle);
         if ($current) {
-            $out['html'] = __d('nondynamic', $toggle . '_unset_entry_link');
+            $out['html'] = __d('nondynamic', $toggle.'_unset_entry_link');
         } else {
-            $out['html'] = __d('nondynamic', $toggle . '_set_entry_link');
+            $out['html'] = __d('nondynamic', $toggle.'_set_entry_link');
         }
 
         $this->response = $this->response->withType('json');

src/Controller/PreviewController.php

Doc Comments +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     /**
      * Generate posting preview for JSON frontend.
      *
-     * @return \Cake\Network\Response|void
+     * @return null|\Cake\Http\Response
      * @throws BadRequestException
      * @throws ForbiddenException
      */

Spacing +2 added lines, -2 removed lines

@@ -68,9 +68,9 @@
             $jsonApiErrors = ['errors' => []];
             foreach ($errors as $field => $error) {
                 $out = [
-                    'meta' => ['field' => '#' . $this->_domId($field)],
+                    'meta' => ['field' => '#'.$this->_domId($field)],
                     'status' => '400',
-                    'title' => __d('nondynamic', $field) . ": " . __d('nondynamic', current($error)),
+                    'title' => __d('nondynamic', $field).": ".__d('nondynamic', current($error)),
                 ];
 
                 $jsonApiErrors['errors'][] = $out;

src/Controller/StatusController.php

Doc Comments +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
     /**
      * Current app status ping
      *
-     * @return string
+     * @return \Cake\Http\Response
      * @throws BadRequestException
      */
     public function status()
@@ -55,7 +55,7 @@ 
      * Get status as JSON response
      *
      * @param string $data json-encoded data
-     * @return mixed
+     * @return string
      */
     protected function _statusAsJson($data)
     {

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Cake\Event\Event;
 use Cake\Http\Exception\BadRequestException;
-use Cake\ORM\TableRegistry;
 
 class StatusController extends AppController
 {

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
         $this->response->disableCache();
         $out = '';
         $out .= "retry: $retry\n";
-        $out .= 'data: ' . $data . "\n\n";
+        $out .= 'data: '.$data."\n\n";
 
         return $out;
     }

src/Controller/UsersController.php

Doc Comments +8 added lines, -8 removed lines

@@ -56,7 +56,7 @@ 
     /**
      * Login user.
      *
-     * @return void|\Cake\Network\Response
+     * @return null|Response
      */
     public function login()
     {
@@ -309,7 +309,7 @@ 
      *
      * @param int $blockedId user to ignore
      * @param bool $set block or unblock
-     * @return \Cake\Network\Response
+     * @return Response|null
      */
     protected function _ignore($blockedId, $set)
     {
@@ -359,7 +359,7 @@ 
      * View user profile.
      *
      * @param null $id user-ID
-     * @return \Cake\Network\Response|void
+     * @return null|Response
      */
     public function view($id = null)
     {
@@ -420,8 +420,8 @@ 
     /**
      * Set user avatar.
      *
-     * @param string $userId user-ID
-     * @return void|\Cake\Network\Response
+     * @param integer $userId user-ID
+     * @return Response|null
      */
     public function avatar(int $userId)
     {
@@ -454,7 +454,7 @@ 
      *
      * @param null $id user-ID
      *
-     * @return \Cake\Network\Response|void
+     * @return Response|null
      */
     public function edit($id = null)
     {
@@ -661,7 +661,7 @@ 
     /**
      * Set slidetab-order.
      *
-     * @return \Cake\Network\Response
+     * @return Response
      * @throws BadRequestException
      */
     public function slidetabOrder()
@@ -709,7 +709,7 @@ 
      * Set category for user.
      *
      * @param null $id category-ID
-     * @return \Cake\Network\Response
+     * @return Response|null
      * @throws ForbiddenException
      */
     public function setcategory($id = null)

Unused Use Statements -1 removed lines

@@ -10,7 +10,6 @@
 namespace App\Controller;
 
 use App\Controller\Component\RefererComponent;
-use App\Controller\Component\ThemesComponent;
 use App\Form\BlockForm;
 use App\Model\Entity\User;
 use App\Model\Table\UsersTable;

Spacing +8 added lines, -8 removed lines

@@ -230,7 +230,7 @@ 
         }
         $code = $this->request->getQuery('c');
         try {
-            $activated = $this->Users->activate((int)$id, $code);
+            $activated = $this->Users->activate((int) $id, $code);
         } catch (\Exception $e) {
             $activated = false;
         }
@@ -288,7 +288,7 @@ 
     public function ignore()
     {
         $this->request->allowMethod('POST');
-        $blockedId = (int)$this->request->getData('id');
+        $blockedId = (int) $this->request->getData('id');
         $this->_ignore($blockedId, true);
     }
 
@@ -300,7 +300,7 @@ 
     public function unignore()
     {
         $this->request->allowMethod('POST');
-        $blockedId = (int)$this->request->getData('id');
+        $blockedId = (int) $this->request->getData('id');
         $this->_ignore($blockedId, false);
     }
 
@@ -314,7 +314,7 @@ 
     protected function _ignore($blockedId, $set)
     {
         $userId = $this->CurrentUser->getId();
-        if ((int)$userId === (int)$blockedId) {
+        if ((int) $userId === (int) $blockedId) {
             throw new BadRequestException();
         }
         if ($set) {
@@ -375,7 +375,7 @@ 
         $user = $this->Users->find()
             ->contain(
                 [
-                    'UserBlocks' => function ($q) {
+                    'UserBlocks' => function($q) {
                         return $q->find('assocUsers');
                     },
                     'UserOnline'
@@ -536,7 +536,7 @@ 
             throw new BadRequestException;
         }
 
-        $id = (int)$this->request->getData('lockUserId');
+        $id = (int) $this->request->getData('lockUserId');
         if (!$this->Users->exists($id)) {
             throw new NotFoundException('User does not exist.', 1524298280);
         }
@@ -550,7 +550,7 @@ 
             $this->Flash->set($message, ['element' => 'error']);
         } else {
             try {
-                $duration = (int)$this->request->getData('lockPeriod');
+                $duration = (int) $this->request->getData('lockPeriod');
                 $status = $this->Users->UserBlocks->block(
                     new ManualBlocker,
                     $id,
@@ -678,7 +678,7 @@ 
         $allowed = $this->Slidetabs->getAvailable();
         $order = array_filter(
             $order,
-            function ($item) use ($allowed) {
+            function($item) use ($allowed) {
                 return in_array($item, $allowed);
             }
         );