Schlaefer / Saito

src/Lib/Saito/User/ReadPostings/ReadPostingsAbstract.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace Saito\User\ReadPostings;
 
 use App\Controller\Component\CurrentUserComponent;
-use Cake\Utility\Hash;
 use Saito\Posting\Posting;
 
 /**

src/Lib/Saito/User/SaitoUserTrait.php

Doc Comments +2 added lines, -1 removed lines

@@ -127,6 +127,7 @@ 
 
     /**
      * {@inheritDoc}
+     * @return boolean|string
      */
     public function isLoggedIn()
     {
@@ -152,7 +153,7 @@ 
     /**
      * Checks if user is forbidden.
      *
-     * @return bool|string
+     * @return string|false
      */
     public function isForbidden()
     {

Unused Use Statements -2 removed lines

@@ -3,8 +3,6 @@
 namespace Saito\User;
 
 use App\Model\Entity\User;
-use Cake\Core\Exception\Exception;
-use Cake\I18n\Time;
 use Cake\Utility\Hash;
 use Saito\App\Registry;
 

Spacing +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
         }
 
         if (!empty($settings['id'])) {
-            $this->_id = (int)$settings['id'];
+            $this->_id = (int) $settings['id'];
             $this->_isLoggedIn = true;
         }
 
@@ -139,7 +139,7 @@ 
     public function isUser($user)
     {
         if (is_numeric($user)) {
-            $id = (int)$user;
+            $id = (int) $user;
         } elseif ($user instanceof ForumsUserInterface || $user instanceof User) {
             $id = $user->get('id');
         } else {

src/Lib/Saito/User/Upload/AvatarFilenameListener.php

Unused Use Statements -2 removed lines

@@ -3,11 +3,9 @@
 namespace Saito\User\Upload;
 
 use App\Model\Entity\User;
-use Cake\Core\Configure;
 use Cake\Event\Event;
 use Cake\Event\EventListenerInterface;
 use Cake\Filesystem\Folder;
-use Cake\ORM\Entity;
 use Cake\Utility\Text;
 use Proffer\Lib\ProfferPath;
 

Spacing +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
 
         // `webroot/files/<table>/<field>/<seed>/<file>`
 
-        $newFilename = Text::uuid() . $ext;
+        $newFilename = Text::uuid().$ext;
 
         // $path->setTable('avatars');
 
@@ -119,7 +119,7 @@ 
         $dir = $user->get('id');
         if (!empty($dir)) {
             $folder = new Folder(
-                $this->rootDirectory . '/users/avatar/' . $dir
+                $this->rootDirectory.'/users/avatar/'.$dir
             );
             $folder->delete();
         }

src/Model/Table/EntriesTable.php

Doc Comments +8 added lines, -6 removed lines

@@ -416,7 +416,7 @@ 
      * get parent id
      *
      * @param int $id id
-     * @return mixed
+     * @return integer
      * @throws \UnexpectedValueException
      */
     public function getParentId($id)
@@ -627,7 +627,7 @@ 
     /**
      * trees for multiple tids
      *
-     * @param array $ids ids
+     * @param integer[] $ids ids
      * @param array $order order
      * @param array $fieldlist fieldlist
      * @return array|bool false if no threads or array of Postings
@@ -679,7 +679,7 @@ 
      * @param array $params params
      * - 'fields' array of thread-ids: [1, 2, 5]
      * - 'order' sort order for threads ['time' => 'ASC'],
-     * @return mixed unhydrated result set
+     * @return Query unhydrated result set
      */
     protected function _getThreadEntries(array $tid, array $params = [])
     {
@@ -747,6 +747,8 @@ 
 
     /**
      * {@inheritDoc}
+     * @param integer $id
+     * @param string $key
      */
     public function toggle($id, $key)
     {
@@ -826,7 +828,7 @@ 
      * Anonymizes the entries for a user
      *
      * @param string $userId user-ID
-     * @return bool success
+     * @return integer success
      */
     public function anonymizeEntriesFromUser($userId)
     {
@@ -933,7 +935,7 @@ 
      * Check if posting is thread-root.
      *
      * @param array $id posting-ID or posting data
-     * @return mixed
+     * @return boolean
      */
     protected function _isRoot(array $id)
     {
@@ -1128,7 +1130,7 @@ 
      *
      * @param null $tid thread-ID
      * @param null $newCategoryId id for new category
-     * @return bool success
+     * @return integer success
      * @throws \NotFoundException
      * @throws \InvalidArgumentException
      */

Unused Use Statements -2 removed lines

@@ -19,8 +19,6 @@
 use Cake\Http\Exception\NotFoundException;
 use Cake\ORM\Entity;
 use Cake\ORM\Query;
-use Cake\ORM\RulesChecker;
-use Cake\ORM\TableRegistry;
 use Cake\Validation\Validator;
 use Saito\App\Registry;
 use Saito\Posting\Posting;

Spacing +7 added lines, -7 removed lines

@@ -170,7 +170,7 @@ 
                 'Users' => ['entry_count'],
                 // cache how many threads a category has
                 'Categories' => [
-                    'thread_count' => function ($event, Entity $entity, $table, $original) {
+                    'thread_count' => function($event, Entity $entity, $table, $original) {
                         if (!$entity->isRoot()) {
                             return false;
                         }
@@ -317,7 +317,7 @@ 
 
         $options['category_id'] = $User->Categories->getAll('read');
 
-        $read = function () use ($options) {
+        $read = function() use ($options) {
             $conditions = [];
             if ($options['user_id'] !== null) {
                 $conditions[]['Entries.user_id'] = $options['user_id'];
@@ -344,7 +344,7 @@ 
             return $result;
         };
 
-        $key = 'Entry.recentEntries-' . md5(serialize($options));
+        $key = 'Entry.recentEntries-'.md5(serialize($options));
         $results = Cache::remember($key, $read, 'entries');
 
         $threads = [];
@@ -375,7 +375,7 @@ 
         )->first();
         if (empty($entry)) {
             throw new \UnexpectedValueException(
-                'Posting not found. Posting-Id: ' . $id
+                'Posting not found. Posting-Id: '.$id
             );
         }
 
@@ -396,7 +396,7 @@ 
         unset($options['return']);
 
         $result = $this->find('entry')
-            ->where([$this->getAlias() . '.id' => $primaryKey])
+            ->where([$this->getAlias().'.id' => $primaryKey])
             ->first();
 
         if (!$result) {
@@ -424,7 +424,7 @@ 
         $entry = $this->find()->select('pid')->where(['id' => $id])->first();
         if (!$entry) {
             throw new \UnexpectedValueException(
-                'Posting not found. Posting-Id: ' . $id
+                'Posting not found. Posting-Id: '.$id
             );
         }
 
@@ -617,7 +617,7 @@ 
         $tree = reset($tree);
 
         //= extract subtree
-        if ((int)$tid !== (int)$id) {
+        if ((int) $tid !== (int) $id) {
             $tree = $tree->getThread()->get($id);
         }
 

src/Model/Table/SettingsTable.php

Doc Comments +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
      * Fast version of Set::combine($results, '{n}.Setting.name',
      * '{n}.Setting.value');
      *
-     * @param array $results results
+     * @param Query $results results
      * @return array
      */
     protected function _compactKeyValue($results)

Unused Use Statements -2 removed lines

@@ -15,8 +15,6 @@
 use App\Lib\Model\Table\AppSettingTable;
 use Cake\Cache\Cache;
 use Cake\Core\Configure;
-use Cake\ORM\Query;
-use Saito\App\Registry;
 use \Stopwatch\Lib\Stopwatch;
 
 class SettingsTable extends AppSettingTable

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 /**
  * Saito - The Threaded Web Forum
@@ -84,11 +84,11 @@ 
     {
         Stopwatch::start('Settings->getSettings()');
 
-        $cacheKey = 'Saito.appSettings.' . Configure::read('Saito.v');
+        $cacheKey = 'Saito.appSettings.'.Configure::read('Saito.v');
 
         $settings = Cache::remember(
             $cacheKey,
-            function () {
+            function() {
                 return $this->getSettings();
             }
         );

src/Model/Table/UserIgnoresTable.php

Doc Comments +2 added lines, -2 removed lines

@@ -131,7 +131,7 @@ 
      *
      * @param int $userId user-ID
      * @param int $blockedId user-ID
-     * @return mixed
+     * @return \Cake\Datasource\EntityInterface
      */
     protected function _get($userId, $blockedId)
     {
@@ -189,7 +189,7 @@ 
      * counts how many users ignore the user with ID $id
      *
      * @param int $id user-ID
-     * @return array
+     * @return integer
      */
     public function countIgnored($id)
     {

Spacing +1 added lines, -1 removed lines

@@ -157,7 +157,7 @@
         $results = $this->find()
             ->contain(
                 [
-                    'Users' => function (Query $query) {
+                    'Users' => function(Query $query) {
                         $query->select(['Users.id', 'Users.username']);
 
                         return $query;

src/Model/Table/UserOnlineTable.php

Doc Comments +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
      * Removes user with uuid `$id` from UserOnline
      *
      * @param string $id id
-     * @return bool
+     * @return integer
      */
     public function setOffline($id)
     {

Unused Use Statements -3 removed lines

@@ -9,9 +9,6 @@
 
 namespace App\Model\Table;
 
-use ArrayObject;
-use Cake\Event\Event;
-use Cake\ORM\Entity;
 use Cake\ORM\Query;
 use Cake\ORM\Table;
 use Cake\Validation\Validator;

src/Model/Table/UsersTable.php

Doc Comments +1 added lines, -1 removed lines

@@ -368,7 +368,7 @@
      * set last refresh
      *
      * @param int $userId user-ID
-     * @param null $lastRefresh last refresh
+     * @param integer $lastRefresh last refresh
      * @return void
      */
     public function setLastRefresh($userId, $lastRefresh = null)

Spacing +4 added lines, -4 removed lines

@@ -77,7 +77,7 @@ 
         $this->addBehavior(
             'Proffer.Proffer',
             [
-                'avatar' => [ // The name of your upload field (filename)
+                'avatar' => [// The name of your upload field (filename)
                     'root' => $avatarRootDir,
                     'dir' => 'avatar_dir', // field for upload directory
                     'thumbnailSizes' => [
@@ -787,8 +787,8 @@ 
             $User->set('user_category_custom', $newCats);
         } else {
             //=if set a single category
-            $category = (int)$category;
-            if ($category > 0 && $this->Entries->Categories->exists((int)$category)
+            $category = (int) $category;
+            if ($category > 0 && $this->Entries->Categories->exists((int) $category)
             ) {
                 $active = $category;
             } else {
@@ -845,7 +845,7 @@ 
             // ->enableHydration(false)
             ->contain(
                 [
-                    'UserIgnores' => function ($query) {
+                    'UserIgnores' => function($query) {
                         return $query->enableHydration(false)->select(
                             ['blocked_user_id', 'user_id']
                         );

src/View/Helper/JsDataHelper.php

Unused Use Statements -1 removed lines

@@ -9,7 +9,6 @@
 
 namespace App\View\Helper;
 
-use App\Controller\Component\CurrentUserComponent;
 use Cake\Core\Configure;
 use Cake\Event\Event;
 use Cake\View\Helper;

Spacing +5 added lines, -5 removed lines

@@ -63,7 +63,7 @@ 
                 'version' => Configure::read('Saito.v'),
                 'settings' => [
                     'autoPageReload' => (isset($View->viewVars['autoPageReload']) ? $View->viewVars['autoPageReload'] : 0),
-                    'editPeriod' => (int)Configure::read(
+                    'editPeriod' => (int) Configure::read(
                         'Saito.Settings.edit_period'
                     ),
                     'language' => Configure::read('Saito.language'),
@@ -77,9 +77,9 @@ 
                     'quote_symbol' => $settings['quote_symbol'],
                     'subject_maxlength' => $settings['subject_maxlength'],
                     'upload_max_img_size' => $settings['upload_max_img_size'] * 1024,
-                    'upload_max_number_of_uploads' => (int)$settings['upload_max_number_of_uploads'],
+                    'upload_max_number_of_uploads' => (int) $settings['upload_max_number_of_uploads'],
                     'theme' => $View->getTheme(),
-                    'apiroot' => $request->getAttribute('webroot') . 'api/v2/',
+                    'apiroot' => $request->getAttribute('webroot').'api/v2/',
                     'webroot' => $request->getAttribute('webroot')
                 ]
             ],
@@ -91,7 +91,7 @@ 
                 'csrf' => $this->_getCsrf($View)
             ],
             'currentUser' => [
-                'id' => (int)$CurrentUser->get('id'),
+                'id' => (int) $CurrentUser->get('id'),
                 'username' => $CurrentUser->get('username'),
                 'user_show_inline' => $CurrentUser->get('inline_view_on_click') || false,
                 'user_show_thread_collapsed' => $CurrentUser->get('user_show_thread_collapsed') || false
@@ -102,7 +102,7 @@ 
                 'afterViewInit' => []
             ]
         ];
-        $out = 'var SaitoApp = ' . json_encode($js);
+        $out = 'var SaitoApp = '.json_encode($js);
         $out .= '; SaitoApp.timeAppStart = new Date().getTime();';
 
         return $out;