Apply coding standard fixes

Author: williamdes

config/app.default.php

@@ -5,6 +5,7 @@
 use Cake\Database\Driver\Mysql;
 use Cake\Log\Engine\FileLog;
 use Cake\Mailer\Transport\MailTransport;
+
 use function Cake\Core\env;
 
 return [

config/bootstrap.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 /**
@@ -45,6 +46,7 @@
 use Cake\Routing\Router;
 use Cake\Utility\Security;
 use Detection\MobileDetect;
+
 use function Cake\Core\env;
 
 /*
@@ -84,7 +86,7 @@
 try {
     Configure::config('default', new PhpConfig());
     Configure::load('app', 'default', false);
-} catch (Exception $e) {
+} catch (Throwable $e) {
     exit($e->getMessage() . "\n");
 }
 
@@ -155,6 +157,7 @@
     if (Configure::check('Log.debug')) {
         Configure::write('Log.debug.file', 'cli-debug');
     }
+
     if (Configure::check('Log.error')) {
         Configure::write('Log.error.file', 'cli-error');
     }
@@ -173,7 +176,7 @@
  * Example: APP_FULL_BASE_URL=https://example.com
  */
 $fullBaseUrl = Configure::read('App.fullBaseUrl');
-if (!$fullBaseUrl) {
+if (! $fullBaseUrl) {
     $httpHost = env('HTTP_HOST');
 
     /*
@@ -186,13 +189,17 @@
         if (env('HTTPS') || env('HTTP_X_FORWARDED_PROTO') === 'https') {
             $s = 's';
         }
+
         $fullBaseUrl = 'http' . $s . '://' . $httpHost;
     }
+
     unset($httpHost, $s);
 }
+
 if ($fullBaseUrl) {
     Router::fullBaseUrl($fullBaseUrl);
 }
+
 unset($fullBaseUrl);
 
 /*
@@ -211,12 +218,12 @@
  * If you don't use these checks you can safely remove this code
  * and the mobiledetect package from composer.json.
  */
-ServerRequest::addDetector('mobile', function ($request) {
+ServerRequest::addDetector('mobile', static function ($request) {
     $detector = new MobileDetect();
 
     return $detector->isMobile();
 });
-ServerRequest::addDetector('tablet', function ($request) {
+ServerRequest::addDetector('tablet', static function ($request) {
     $detector = new MobileDetect();
 
     return $detector->isTablet();

config/paths.php

@@ -15,7 +15,7 @@
 /*
  * Use the DS to separate the directories in other defines
  */
-if (!defined('DS')) {
+if (! defined('DS')) {
     define('DS', DIRECTORY_SEPARATOR);
 }
 

config/routes.php

@@ -29,7 +29,7 @@
  * So you can use `$this` to reference the application class instance
  * if required.
  */
-return function (RouteBuilder $routes): void {
+return static function (RouteBuilder $routes): void {
     /*
      * The default class to use for all routes
      *
@@ -137,4 +137,4 @@
  * });
  * ```
  */
- };
+};

src/Application.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 /**
@@ -14,6 +15,7 @@
  * @since     3.3.0
  * @license   https://opensource.org/licenses/mit-license.php MIT License
  */
+
 namespace App;
 
 use App\Middleware\HostHeaderMiddleware;
@@ -36,14 +38,12 @@
  * This defines the bootstrapping logic and middleware layers you
  * want to use in your application.
  *
- * @extends \Cake\Http\BaseApplication<\App\Application>
+ * @extends BaseApplication<Application>
  */
 class Application extends BaseApplication
 {
     /**
      * Load all the application configuration and bootstrap logic.
-     *
-     * @return void
      */
     public function bootstrap(): void
     {
@@ -57,8 +57,8 @@ public function bootstrap(): void
     /**
      * Setup the middleware queue your application will use.
      *
-     * @param \Cake\Http\MiddlewareQueue $middlewareQueue The middleware queue to setup.
-     * @return \Cake\Http\MiddlewareQueue The updated middleware queue.
+     * @param MiddlewareQueue $middlewareQueue The middleware queue to setup.
+     * @return MiddlewareQueue The updated middleware queue.
      */
     public function middleware(MiddlewareQueue $middlewareQueue): MiddlewareQueue
     {
@@ -90,18 +90,15 @@ public function middleware(MiddlewareQueue $middlewareQueue): MiddlewareQueue
 
             // Cross Site Request Forgery (CSRF) Protection Middleware
             // https://book.cakephp.org/5/en/security/csrf.html#cross-site-request-forgery-csrf-middleware
-            ->add(new CsrfProtectionMiddleware([
-                'httponly' => true,
-            ]));
+            ->add(new CsrfProtectionMiddleware(['httponly' => true]));
 
         return $middlewareQueue;
     }
 
     /**
      * Register application container services.
      *
-     * @param \Cake\Core\ContainerInterface $container The Container to update.
-     * @return void
+     * @param ContainerInterface $container The Container to update.
      * @link https://book.cakephp.org/5/en/development/dependency-injection.html#dependency-injection
      */
     public function services(ContainerInterface $container): void
@@ -113,8 +110,6 @@ public function services(ContainerInterface $container): void
     /**
      * Register custom event listeners here
      *
-     * @param \Cake\Event\EventManagerInterface $eventManager
-     * @return \Cake\Event\EventManagerInterface
      * @link https://book.cakephp.org/5/en/core-libraries/events.html#registering-listeners
      */
     public function events(EventManagerInterface $eventManager): EventManagerInterface

src/Controller/AppController.php

@@ -38,7 +38,6 @@
  * will inherit them.
  *
  * @see    http://book.cakephp.org/2.0/en/controllers.html#the-app-controller
- *
  */
 class AppController extends Controller
 {

src/Controller/DevelopersController.php

@@ -112,6 +112,7 @@ public function logout(): Response
             'You have been logged out successfully',
             ['params' => ['class' => $flash_class]]
         );
+
         return $this->redirect('/');
     }
 

src/Controller/GithubController.php

@@ -21,13 +21,12 @@
 use App\Controller\Component\GithubApiComponent;
 use Cake\Core\Configure;
 use Cake\Http\Exception\NotFoundException;
+use Cake\Http\Response;
 use Cake\Log\Log;
 use Cake\ORM\TableRegistry;
 use Cake\Routing\Router;
-use Cake\Http\Response;
 use InvalidArgumentException;
 
-use function __;
 use function array_key_exists;
 use function explode;
 use function in_array;
@@ -117,14 +116,15 @@ public function create_issue($reportId): ?Response
                 '_name' => 'reports:view',
                 'id' => $reportId,
             ]);
-        } else {
-            $flash_class = 'alert alert-error';
-            $this->Flash->set(
-                $this->getErrors($issueDetails, $status),
-                ['params' => ['class' => $flash_class]]
-            );
-            return null;
         }
+
+        $flash_class = 'alert alert-error';
+        $this->Flash->set(
+            $this->getErrors($issueDetails, $status),
+            ['params' => ['class' => $flash_class]]
+        );
+
+        return null;
     }
 
     /**
@@ -486,7 +486,6 @@ protected function getReportStatusFromIssueState(string $issueState): string
      * To be used as a cron job (using webroot/cron_dispatcher.php).
      *
      * Can not (& should not) be directly accessed via web.
-     *
      */
     public function sync_issue_status(): ?Response
     {

src/Controller/IncidentsController.php

@@ -28,7 +28,6 @@
 use Cake\Http\Response;
 use Cake\ORM\TableRegistry;
 
-use function __;
 use function array_merge;
 use function count;
 use function in_array;
@@ -40,7 +39,6 @@
 
 /**
  * Incidents controller handling incident creation and rendering.
- *
  */
 class IncidentsController extends AppController
 {

src/Controller/NotificationsController.php

@@ -18,8 +18,8 @@
 
 namespace App\Controller;
 
-use App\Model\Table\NotificationsTable;
 use App\Model\Table\DevelopersTable;
+use App\Model\Table\NotificationsTable;
 use App\Model\Table\ReportsTable;
 use Cake\Event\EventInterface;
 use Cake\Http\Response;
@@ -189,6 +189,7 @@ public function mass_action(): Response
             $msg,
             ['params' => ['class' => $flash_class]]
         );
+
         return $this->redirect('/notifications/');
     }
 }