Schlaefer / Saito

config/bootstrap.php

Unused Use Statements -1 removed lines

@@ -41,7 +41,6 @@
 use Cake\Http\ServerRequest;
 use Cake\Log\Log;
 use Cake\Mailer\Email;
-use Cake\Routing\DispatcherFactory;
 use Cake\Utility\Inflector;
 use Cake\Utility\Security;
 

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;
@@ -50,8 +50,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()
@@ -74,7 +74,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(
@@ -84,7 +84,7 @@ 
 
     Configure::load('email', 'default');
 } catch (\Exception $e) {
-    exit($e->getMessage() . "\n");
+    exit($e->getMessage()."\n");
 }
 
 /*
@@ -136,7 +136,7 @@ 
  * Include the CLI bootstrap overrides.
  */
 if ($isCli) {
-    require __DIR__ . '/bootstrap_cli.php';
+    require __DIR__.'/bootstrap_cli.php';
 }
 
 /*
@@ -153,7 +153,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);
 }
@@ -175,12 +175,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();
@@ -231,7 +231,7 @@ 
 
 Plugin::load('ImageUploader', ['bootstrap' => true, 'routes' => true]);
 
-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/Api/src/Controller/ApiAppController.php

Unused Use Statements -1 removed lines

@@ -15,7 +15,6 @@
 use App\Controller\AppController;
 use Cake\Controller\Component\AuthComponent;
 use Cake\Core\Configure;
-use Cake\Event\Event;
 
 /**
  * Api App Controller

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 /**
  * Saito - The Threaded Web Forum

plugins/Bookmarks/src/Controller/BookmarksController.php

Unused Use Statements -2 removed lines

@@ -20,8 +20,6 @@
 use Cake\Http\Exception\NotFoundException;
 use Cake\Network\Exception\MethodNotAllowedException;
 use Cake\ORM\Entity;
-use Cake\ORM\Query;
-use Saito\App\Registry;
 use Saito\Exception\SaitoForbiddenException;
 
 /**

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,7 +84,7 @@ 
      */
     public function edit($id)
     {
-        $id = (int)$id;
+        $id = (int) $id;
         $bookmark = $this->getBookmark($id);
 
         $this->Bookmarks->patchEntity(
@@ -109,7 +109,7 @@ 
      */
     public function delete($id)
     {
-        $id = (int)$id;
+        $id = (int) $id;
         $bookmark = $this->getBookmark($id);
         if (!$this->Bookmarks->delete($bookmark)) {
             throw new GenericApiException('The bookmark could not be deleted.');

plugins/Bookmarks/src/Lib/Bookmarks.php

Unused Use Statements -1 removed lines

@@ -12,7 +12,6 @@
 
 namespace Bookmarks\Lib;
 
-use App\Controller\Component\CurrentUserComponent;
 use Cake\ORM\TableRegistry;
 use Saito\User\CurrentUser\CurrentUserInterface;
 

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 /**
  * Saito - The Threaded Web Forum

plugins/Feeds/src/Controller/PostingsController.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use App\Controller\AppController;
 use App\Model\Table\EntriesTable;
-use Cake\Core\Configure;
 use Cake\Event\Event;
 use Cake\Http\Exception\BadRequestException;
 use Feeds\Model\Behavior\FeedsPostingBehavior;

plugins/ImageUploader/src/Model/Table/UploadsTable.php

Unused Use Statements -1 removed lines

@@ -14,7 +14,6 @@
 
 use App\Lib\Model\Table\AppTable;
 use Cake\Core\Configure;
-use Cake\Datasource\EntityInterface;
 use Cake\Event\Event;
 use Cake\Filesystem\File;
 use Cake\ORM\RulesChecker;

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 /**
  * Saito - The Threaded Web Forum
@@ -51,12 +51,12 @@ 
             ->notBlank('user_id')
             ->requirePresence(['name', 'size', 'type', 'user_id'], 'create');
 
-        $maxUploadSize = (int)Configure::read('Saito.Settings.upload_max_img_size');
+        $maxUploadSize = (int) Configure::read('Saito.Settings.upload_max_img_size');
         $validator->add(
             'document',
             [
                 'fileSize' => [
-                    'rule' => ['fileSize', '<', $maxUploadSize . 'kB'],
+                    'rule' => ['fileSize', '<', $maxUploadSize.'kB'],
                     'message' => __d(
                         'image_uploader',
                         'validation.error.fileSize',
@@ -83,9 +83,9 @@ 
     public function buildRules(RulesChecker $rules)
     {
         // check max allowed number of uploads per user
-        $nMax = (int)Configure::read('Saito.Settings.upload_max_number_of_uploads');
+        $nMax = (int) Configure::read('Saito.Settings.upload_max_number_of_uploads');
         $rules->add(
-            function (Upload $entity, array $options) use ($nMax) {
+            function(Upload $entity, array $options) use ($nMax) {
                 $count = $this->findByUserId($entity->get('user_id'))->count();
 
                 return $count < $nMax;
@@ -205,8 +205,8 @@ 
         $ratio = $size / $target;
         $ratio = sqrt($ratio);
 
-        $newwidth = (int)($width / $ratio);
-        $newheight = (int)($height / $ratio);
+        $newwidth = (int) ($width / $ratio);
+        $newheight = (int) ($height / $ratio);
         $destination = imagecreatetruecolor($newwidth, $newheight);
 
         $source = imagecreatefromstring($raw);

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

Unused Use Statements -2 removed lines

@@ -13,13 +13,11 @@
 namespace ImageUploader\Test\TestCase\Controller;
 
 use Api\Error\Exception\GenericApiException;
-use Cake\Cache\Cache;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\Filesystem\File;
 use Cake\Http\Exception\UnauthorizedException;
 use Cake\ORM\TableRegistry;
-use claviska\SimpleImage;
 use Saito\Exception\SaitoForbiddenException;
 use Saito\Test\IntegrationTestCase;
 

Spacing +11 added lines, -11 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 /**
  * Saito - The Threaded Web Forum
@@ -45,7 +45,7 @@ 
     {
         parent::setUp();
 
-        $this->file = new File(TMP . 'my new-upload.png');
+        $this->file = new File(TMP.'my new-upload.png');
         $this->mockMediaFile($this->file);
     }
 
@@ -73,7 +73,7 @@ 
                 0 => [
                     'file' => [
                         'tmp_name' => $this->file->path,
-                        'name' => $this->file->name() . '.' . $this->file->ext(),
+                        'name' => $this->file->name().'.'.$this->file->ext(),
                         'size' => $this->file->size(),
                         'type' => $this->file->mime(),
                     ]
@@ -82,7 +82,7 @@ 
         ];
         $this->post('api/v2/uploads.json', $data);
 
-        $response = json_decode((string)$this->_response->getBody(), true);
+        $response = json_decode((string) $this->_response->getBody(), true);
 
         $this->assertResponseCode(200);
 
@@ -112,12 +112,12 @@ 
     {
         $this->loginJwt(1);
         unset($this->file);
-        $this->file = new File(TMP . 'tmp_exif.jpg');
+        $this->file = new File(TMP.'tmp_exif.jpg');
 
-        $fixture = new File($path = Plugin::path('ImageUploader') . 'tests/Fixture/exif-with-location.jpg');
+        $fixture = new File($path = Plugin::path('ImageUploader').'tests/Fixture/exif-with-location.jpg');
         $fixture->copy($this->file->path);
 
-        $readExif = function (File $file) {
+        $readExif = function(File $file) {
             //@codingStandardsIgnoreStart
             return @exif_read_data($file->path);
             //@codingStandardsIgnoreEnd
@@ -132,7 +132,7 @@ 
                 0 => [
                     'file' => [
                         'tmp_name' => $this->file->path,
-                        'name' => $this->file->name() . '.' . $this->file->ext(),
+                        'name' => $this->file->name().'.'.$this->file->ext(),
                         'size' => $this->file->size(),
                         'type' => $this->file->mime(),
                     ]
@@ -141,7 +141,7 @@ 
         ];
         $this->post('api/v2/uploads.json', $data);
 
-        $response = json_decode((string)$this->_response->getBody(), true);
+        $response = json_decode((string) $this->_response->getBody(), true);
 
         $this->assertResponseCode(200);
 
@@ -222,7 +222,7 @@ 
 
         $this->get('api/v2/uploads');
 
-        $response = json_decode((string)$this->_response->getBody(), true);
+        $response = json_decode((string) $this->_response->getBody(), true);
 
         $this->assertResponseCode(200);
 
@@ -260,7 +260,7 @@ 
 
         $this->delete('api/v2/uploads/1');
 
-        $response = json_decode((string)$this->_response->getBody(), true);
+        $response = json_decode((string) $this->_response->getBody(), true);
 
         $this->assertResponseCode(204);
 

plugins/Installer/src/Controller/InstallController.php

Unused Use Statements -2 removed lines

@@ -14,8 +14,6 @@
 
 use Cake\Core\Configure;
 use Cake\Datasource\ConnectionManager;
-use Cake\Datasource\ConnectionRegistry;
-use Cake\Event\Event;
 use Cake\Filesystem\File;
 use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 /**
  * Saito - The Threaded Web Forum
@@ -66,7 +66,7 @@ 
         if ($hasSettingsTable) {
             $this->log('Installer found Settings-table. Moving on to Updater.', LogLevel::INFO, ['saito.install']);
             //// disable installer and move on to updater instead
-            (new File(CONFIG . 'installer'))->delete();
+            (new File(CONFIG.'installer'))->delete();
 
             return $this->redirect('/');
         }

plugins/Installer/src/Controller/UpdaterController.php

Unused Use Statements -4 removed lines

@@ -13,11 +13,7 @@
 namespace Installer\Controller;
 
 use Cake\Core\Configure;
-use Cake\Event\Event;
 use Cake\Filesystem\File;
-use Cake\I18n\I18n;
-use Cake\ORM\Table;
-use Cake\ORM\TableRegistry;
 use Installer\Form\UpdaterStartForm;
 use Installer\Lib\DbVersion;
 use Psr\Log\LogLevel;

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
@@ -50,7 +50,7 @@ 
      */
     public function start()
     {
-        $token = new File(CONFIG . 'updater');
+        $token = new File(CONFIG.'updater');
 
         if ($token->exists()) {
             $this->renderFailure(__d('installer', 'update.failure.explanation'), 1529737182);
@@ -106,7 +106,7 @@ 
             (new DbVersion($this->Settings))->set($this->saitoVersion);
             $this->logCurrentState('Post upgrade state.');
         } catch (\Throwable $e) {
-            $this->logCurrentState('Migration failed: ' . $e->getMessage());
+            $this->logCurrentState('Migration failed: '.$e->getMessage());
 
             return $this->redirect('/');
         }