Schlaefer / Saito

plugins/ImageUploader/tests/TestCase/Controller/ThumbnailControllerTest.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 /**
  * Saito - The Threaded Web Forum
@@ -33,7 +33,7 @@ 
         $Uploads = TableRegistry::get('ImageUploader.Uploads');
         $upload = $Uploads->get(1);
 
-        $file = new File(Configure::read('Saito.Settings.uploadDirectory') . $upload->get('name'));
+        $file = new File(Configure::read('Saito.Settings.uploadDirectory').$upload->get('name'));
         $raw = (new SimpleImage())
             ->fromNew(500, 500, 'blue')
             ->toString($upload->get('type'));
@@ -44,7 +44,7 @@ 
         Plugin::configureCache(); // cache isn't bootstraped through request yet
         $this->assertFalse(Cache::read($upload->get('id'), Plugin::CACHE_KEY));
 
-        $this->get('/api/v2/uploads/thumb/1?h=' . $upload->get('hash'));
+        $this->get('/api/v2/uploads/thumb/1?h='.$upload->get('hash'));
 
         $cache = Cache::read($upload->get('id'), Plugin::CACHE_KEY);
 
@@ -52,7 +52,7 @@ 
         $this->assertSame(300, imagesx($image));
         $this->assertSame(300, imagesy($image));
         $this->assertSame($upload->get('type'), $cache['type']);
-        $this->assertResponseEquals($cache['raw'], (string)$this->_response->getBody());
+        $this->assertResponseEquals($cache['raw'], (string) $this->_response->getBody());
         $this->assertHeader('content-type', 'image/png');
 
         //// cleanup
@@ -71,7 +71,7 @@ 
         $Uploads = TableRegistry::get('ImageUploader.Uploads');
         $upload = $Uploads->get(1);
 
-        $file = new File(Configure::read('Saito.Settings.uploadDirectory') . $upload->get('name'));
+        $file = new File(Configure::read('Saito.Settings.uploadDirectory').$upload->get('name'));
         $raw = (new SimpleImage())
             ->fromNew(100, 100, 'blue')
             ->toString($upload->get('type'));

plugins/ImageUploader/src/Controller/ThumbnailController.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 /**
  * Saito - The Threaded Web Forum
@@ -35,8 +35,8 @@ 
      */
     public function thumb(): Response
     {
-        $id = (int)$this->request->getParam('id');
-        ['hash' => $fingerprint, 'type' => $type, 'raw' => $raw] = Cache::remember((string)$id, function () use ($id) {
+        $id = (int) $this->request->getParam('id');
+        ['hash' => $fingerprint, 'type' => $type, 'raw' => $raw] = Cache::remember((string) $id, function() use ($id) {
             $Uploads = $this->loadModel('ImageUploader.Uploads');
             $document = $Uploads->get($id);
 
@@ -55,7 +55,7 @@ 
             return compact('hash', 'raw', 'type');
         }, Plugin::CACHE_KEY);
 
-        $hash = (string)$this->request->getQuery('h');
+        $hash = (string) $this->request->getQuery('h');
         if ($hash !== $fingerprint) {
             throw new SaitoForbiddenException(
                 "Attempt to access image-thumbnail $id."

src/View/Helper/PostingHelper.php

Spacing +11 added lines, -11 removed lines

@@ -55,12 +55,12 @@ 
         if ($lastAction !== 'add') {
             $session = $this->getView()->getRequest()->getSession();
             if ($session->read('paginator.lastPage')) {
-                $params[] = 'page=' . $session->read('paginator.lastPage');
+                $params[] = 'page='.$session->read('paginator.lastPage');
             }
         }
-        $params[] = 'jump=' . $tid;
+        $params[] = 'jump='.$tid;
 
-        return '/?' . implode('&', $params);
+        return '/?'.implode('&', $params);
     }
 
     /**
@@ -76,7 +76,7 @@ 
         $id = $posting->get('id');
         $webroot = $this->getView()->getRequest()->getAttribute('webroot');
         $url = "{$webroot}entries/view/{$id}";
-        $link = "<a href=\"{$url}\" class=\"{$options['class']}\">" . $this->getSubject($posting) . '</a>';
+        $link = "<a href=\"{$url}\" class=\"{$options['class']}\">".$this->getSubject($posting).'</a>';
 
         return $link;
     }
@@ -131,7 +131,7 @@ 
      */
     public function views(BasicPostingInterface $posting)
     {
-        return __('views_headline') . ': ' . $posting->get('views');
+        return __('views_headline').': '.$posting->get('views');
     }
 
     /**
@@ -147,7 +147,7 @@ 
     {
         $options += [
             'lineCache' => $this->_View->get('LineCache'),
-            'maxThreadDepthIndent' => (int)Configure::read(
+            'maxThreadDepthIndent' => (int) Configure::read(
                 'Saito.Settings.thread_depth_indent'
             ),
             'renderer' => 'thread',
@@ -190,10 +190,10 @@ 
     {
         $out = '';
         if ($entry->isPinned()) {
-            $out .= '<i class="fa fa-thumb-tack" title="' . __('fixed') . '"></i> ';
+            $out .= '<i class="fa fa-thumb-tack" title="'.__('fixed').'"></i> ';
         }
         // anchor for inserting solve-icon via FE-JS
-        $out .= '<span class="solves ' . $entry->get('id') . '">';
+        $out .= '<span class="solves '.$entry->get('id').'">';
         if ($entry->get('solves')) {
             $out .= $this->solvedBadge();
         }
@@ -217,8 +217,8 @@ 
      */
     public function solvedBadge()
     {
-        return '<i class="fa fa-badge-solves solves-isSolved" title="' .
-        __('Helpful entry') . '"></i>';
+        return '<i class="fa fa-badge-solves solves-isSolved" title="'.
+        __('Helpful entry').'"></i>';
     }
 
     /**
@@ -230,7 +230,7 @@ 
      */
     public function getSubject(BasicPostingInterface $posting)
     {
-        return \h($posting->get('subject')) . ($posting->isNt() ? ' n/t' : '');
+        return \h($posting->get('subject')).($posting->isNt() ? ' n/t' : '');
     }
 
     /**

src/View/Helper/JsDataHelper.php

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;

config/bootstrap.php

Spacing +11 added lines, -11 removed lines

@@ -16,7 +16,7 @@ 
 /*
  * Configure paths required to find CakePHP + general filepath constants
  */
-require __DIR__ . '/paths.php';
+require __DIR__.'/paths.php';
 
 /*
  * Bootstrap CakePHP.
@@ -27,7 +27,7 @@ 
  * - Registering the CakePHP autoloader.
  * - Setting the default application paths.
  */
-require CORE_PATH . 'config' . DS . 'bootstrap.php';
+require CORE_PATH.'config'.DS.'bootstrap.php';
 
 use Cake\Cache\Cache;
 use Cake\Console\ConsoleErrorHandler;
@@ -51,8 +51,8 @@ 
  * You should copy `config/.env.default to `config/.env` and set/modify the
  * variables as required.
  */
-if (!env('APP_NAME') && file_exists(CONFIG . '.env')) {
-    $dotenv = new \josegonzalez\Dotenv\Loader([CONFIG . '.env']);
+if (!env('APP_NAME') && file_exists(CONFIG.'.env')) {
+    $dotenv = new \josegonzalez\Dotenv\Loader([CONFIG.'.env']);
     $dotenv->parse()
         ->putenv()
         ->toEnv()
@@ -75,7 +75,7 @@ 
      * Load additional config files
      */
     Configure::load('saito_config', 'default');
-    Configure::config('saitoCore', new PhpConfig(APP . '/Lib/'));
+    Configure::config('saitoCore', new PhpConfig(APP.'/Lib/'));
     Configure::load('version', 'saitoCore');
 
     Configure::write(
@@ -85,7 +85,7 @@ 
 
     Configure::load('email', 'default');
 } catch (\Exception $e) {
-    exit($e->getMessage() . "\n");
+    exit($e->getMessage()."\n");
 }
 
 /*
@@ -137,7 +137,7 @@ 
  * Include the CLI bootstrap overrides.
  */
 if ($isCli) {
-    require __DIR__ . '/bootstrap_cli.php';
+    require __DIR__.'/bootstrap_cli.php';
 }
 
 /*
@@ -154,7 +154,7 @@ 
 
     $httpHost = env('HTTP_HOST');
     if (isset($httpHost)) {
-        Configure::write('App.fullBaseUrl', 'http' . $s . '://' . $httpHost);
+        Configure::write('App.fullBaseUrl', 'http'.$s.'://'.$httpHost);
     }
     unset($httpHost, $s);
 }
@@ -176,12 +176,12 @@ 
 /*
  * Setup detectors for mobile and tablet.
  */
-ServerRequest::addDetector('mobile', function ($request) {
+ServerRequest::addDetector('mobile', function($request) {
     $detector = new \Detection\MobileDetect();
 
     return $detector->isMobile();
 });
-ServerRequest::addDetector('tablet', function ($request) {
+ServerRequest::addDetector('tablet', function($request) {
     $detector = new \Detection\MobileDetect();
 
     return $detector->isTablet();
@@ -220,7 +220,7 @@ 
 Inflector::rules('plural', ['/^(smil)ey$/i' => '\1ies']);
 Inflector::rules('singular', ['/^(smil)ies$/i' => '\1ey']);
 
-include Cake\Core\App::path('Lib')[0] . 'BaseFunctions.php';
+include Cake\Core\App::path('Lib')[0].'BaseFunctions.php';
 
 \Cake\Event\EventManager::instance()->on(\Saito\Event\SaitoEventManager::getInstance());
 

plugins/Admin/src/View/Helper/AdminHelper.php

Doc Comments +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
      *
      * @param string $text text
      * @param null $type type
-     * @return mixed
+     * @return string|null
      */
     public function badge($text, $type = null)
     {

Spacing +7 added lines, -7 removed lines

@@ -99,7 +99,7 @@ 
     {
         $options += ['class' => ''];
         // set breadcrumb item class for Bootstrap
-        $options['class'] = $options['class'] . ' breadcrumb-item';
+        $options['class'] = $options['class'].' breadcrumb-item';
         // last item in breadcrump is current (active) page and not linked
         if ($url === false) {
             // set breadcrumb active item class for Bootstrap
@@ -127,7 +127,7 @@ 
             PREG_SPLIT_NO_EMPTY
         );
         if (empty($errors)) {
-            return '<p>' . __('No log file found.') . '</p>';
+            return '<p>'.__('No log file found.').'</p>';
         }
 
         $out = '';
@@ -138,11 +138,11 @@ 
             $_i = self::tagId();
             $_details = $e->details();
             if (!empty($_details)) {
-                $out .= '<button class="btn btn-mini" style="float:right;" onclick="$(\'#' . $_i . '\').toggle(); return false;">' . __(
+                $out .= '<button class="btn btn-mini" style="float:right;" onclick="$(\'#'.$_i.'\').toggle(); return false;">'.__(
                     'Details'
-                ) . '</button>' . "\n";
+                ).'</button>'."\n";
             }
-            $out .= '<pre style="font-size: 10px;">' . "\n";
+            $out .= '<pre style="font-size: 10px;">'."\n";
             $out .= '<div class="row"><div class="span2" style="text-align: right">';
             $out .= $this->TimeH->formatTime($e->time(), 'eng');
 
@@ -150,12 +150,12 @@ 
             $out .= '<div class="span7">';
             $out .= $e->message();
             if (!empty($_details)) {
-                $out .= '<span id="' . $_i . '" style="display: none;">' . "\n";
+                $out .= '<span id="'.$_i.'" style="display: none;">'."\n";
                 $out .= $_details;
                 $out .= '</span>';
             }
             $out .= '</div></div>';
-            $out .= '</pre>' . "\n";
+            $out .= '</pre>'."\n";
             if ($k++ > $_nErrorsToShow) {
                 break;
             }

src/View/Helper/LayoutHelper.php

Spacing +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
     {
         $html = "<i class=\"saito-icon fa fa-{$icon}\"></i>";
         if (!empty($text)) {
-                $html .= '&nbsp;<span class="saito-icon-text">' . $text . '</span>';
+                $html .= '&nbsp;<span class="saito-icon-text">'.$text.'</span>';
         }
 
         return $html;
@@ -80,7 +80,7 @@ 
     public function dropdownMenuButton(array $menuItems, array $options = [])
     {
         $options += ['class' => 'btn btn-primary'];
-        $options['class'] = $options['class'] . ' dropdown-toggle';
+        $options['class'] = $options['class'].' dropdown-toggle';
         $menu = [];
         foreach ($menuItems as $menuItem) {
             if ($menuItem === 'divider') {
@@ -173,7 +173,7 @@ 
         $contentArray += ['first' => '', 'middle' => '', 'last' => ''];
         $out = '';
         foreach (['first', 'middle', 'last'] as $key) {
-            $out .= '<div class="' . $key . '">';
+            $out .= '<div class="'.$key.'">';
             $out .= $options['escape'] ? h($contentArray[$key]) : $contentArray[$key];
             $out .= '</div>';
         }

src/Controller/UsersController.php

Spacing +8 added lines, -8 removed lines

@@ -234,7 +234,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;
         }
@@ -292,7 +292,7 @@ 
     public function ignore()
     {
         $this->request->allowMethod('POST');
-        $blockedId = (int)$this->request->getData('id');
+        $blockedId = (int) $this->request->getData('id');
         $this->_ignore($blockedId, true);
     }
 
@@ -304,7 +304,7 @@ 
     public function unignore()
     {
         $this->request->allowMethod('POST');
-        $blockedId = (int)$this->request->getData('id');
+        $blockedId = (int) $this->request->getData('id');
         $this->_ignore($blockedId, false);
     }
 
@@ -318,7 +318,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) {
@@ -379,7 +379,7 @@ 
         $user = $this->Users->find()
             ->contain(
                 [
-                    'UserBlocks' => function ($q) {
+                    'UserBlocks' => function($q) {
                         return $q->find('assocUsers');
                     },
                     'UserOnline'
@@ -540,7 +540,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);
         }
@@ -554,7 +554,7 @@ 
             $this->Flash->set($message, ['element' => 'error']);
         } else {
             try {
-                $duration = (int)$this->request->getData('lockPeriod');
+                $duration = (int) $this->request->getData('lockPeriod');
                 $blocker = new ManualBlocker($this->CurrentUser->getId(), $duration);
                 $status = $this->Users->UserBlocks->block($blocker, $id);
                 if (!$status) {
@@ -679,7 +679,7 @@ 
         $allowed = $this->Slidetabs->getAvailable();
         $order = array_filter(
             $order,
-            function ($item) use ($allowed) {
+            function($item) use ($allowed) {
                 return in_array($item, $allowed);
             }
         );

src/Lib/Saito/Posting/Decorator/AbstractPostingDecorator.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
             return call_user_func_array([$this->_Posting, $method], $args);
         }
         throw new \RuntimeException(
-            'Undefined method ' . get_class($this) . '::' . $method
+            'Undefined method '.get_class($this).'::'.$method
         );
     }