Fix loadModel was removed and fix redirect should be used with a return

Author: williamdes

composer.json

@@ -26,8 +26,9 @@
         "composer/ca-bundle": "^1.3"
     },
     "require-dev": {
+        "cakedc/cakephp-phpstan": "^4",
         "cakephp/bake": "^3.6",
-        "cakephp/debug_kit": "^5.2",
+        "cakephp/debug_kit": "^5.0",
         "php-mock/php-mock-phpunit": "^2.6",
         "phpmyadmin/coding-standard": "^3",
         "phpstan/phpstan": "^2",

src/Controller/AppController.php

@@ -39,11 +39,12 @@
  *
  * @see    http://book.cakephp.org/2.0/en/controllers.html#the-app-controller
  *
- * @property NotificationsTable $Notifications
- * @property DevelopersTable $Developers
  */
 class AppController extends Controller
 {
+    protected NotificationsTable $Notifications;
+    protected DevelopersTable $Developers;
+
     /** @var array */
     public $whitelist = [
         'Developers',
@@ -114,8 +115,9 @@ public function initialize(): void
     {
         parent::initialize();
         $this->loadComponent('Flash');
-        $this->loadModel('Notifications');
-        $this->loadModel('Developers');
+        $this->Notifications = $this->fetchTable('Notifications');
+        $this->Developers = $this->fetchTable('Developers');
+
         /*  $this->loadComponent(
                 'Auth', [
                     'loginAction' => [

src/Controller/DevelopersController.php

@@ -103,7 +103,7 @@ public function callback(): ?Response
         return $this->redirect($last_page);
     }
 
-    public function logout(): void
+    public function logout(): Response
     {
         $this->request->getSession()->destroy();
 
@@ -112,7 +112,7 @@ public function logout(): void
             'You have been logged out successfully',
             ['params' => ['class' => $flash_class]]
         );
-        $this->redirect('/');
+        return $this->redirect('/');
     }
 
     protected function authenticateDeveloper(array $userInfo, string $accessToken): void

src/Controller/GithubController.php

@@ -24,6 +24,7 @@
 use Cake\Log\Log;
 use Cake\ORM\TableRegistry;
 use Cake\Routing\Router;
+use Cake\Http\Response;
 use InvalidArgumentException;
 
 use function __;
@@ -63,12 +64,11 @@ public function initialize(): void
      * @param int $reportId The report number
      *
      * @throws NotFoundException
-     * @return void Nothing
      */
-    public function create_issue($reportId): void
+    public function create_issue($reportId): ?Response
     {
         if (empty($reportId)) {
-            throw new NotFoundException(__('Invalid report Id.'));
+            throw new NotFoundException('Invalid report Id.');
         }
 
         $reportId = (int) $reportId;
@@ -77,15 +77,15 @@ public function create_issue($reportId): void
         $report = $reportsTable->findById($reportId)->all()->first();
 
         if (! $report) {
-            throw new NotFoundException(__('The report does not exist.'));
+            throw new NotFoundException('The report does not exist.');
         }
 
         $reportArray = $report->toArray();
         if (empty($this->request->getParsedBody())) {
             $this->set('error_name', $reportArray['error_name']);
             $this->set('error_message', $reportArray['error_message']);
 
-            return;
+            return null;
         }
 
         $this->disableAutoRender();
@@ -113,7 +113,7 @@ public function create_issue($reportId): void
             $report->status = $this->getReportStatusFromIssueState($issueDetails['state']);
             $reportsTable->save($report);
 
-            $this->redirect([
+            return $this->redirect([
                 '_name' => 'reports:view',
                 'id' => $reportId,
             ]);
@@ -123,6 +123,7 @@ public function create_issue($reportId): void
                 $this->getErrors($issueDetails, $status),
                 ['params' => ['class' => $flash_class]]
             );
+            return null;
         }
     }
 
@@ -136,7 +137,7 @@ public function create_issue($reportId): void
     public function link_issue($reportId): void
     {
         if (empty($reportId)) {
-            throw new NotFoundException(__('Invalid report Id.'));
+            throw new NotFoundException('Invalid report Id.');
         }
 
         $reportId = (int) $reportId;
@@ -145,12 +146,12 @@ public function link_issue($reportId): void
         $report = $reportsTable->findById($reportId)->all()->first();
 
         if (! $report) {
-            throw new NotFoundException(__('The report does not exist.'));
+            throw new NotFoundException('The report does not exist.');
         }
 
         $ticket_id = intval($this->request->getQuery('ticket_id'));
         if (! $ticket_id) {
-            throw new NotFoundException(__('Invalid Ticket ID!!'));
+            throw new NotFoundException('Invalid Ticket ID!!');
         }
 
         $reportArray = $report->toArray();
@@ -195,7 +196,7 @@ public function link_issue($reportId): void
             );
         }
 
-        $this->redirect([
+        return $this->redirect([
             '_name' => 'reports:view',
             'id' => $reportId,
         ]);
@@ -206,12 +207,11 @@ public function link_issue($reportId): void
      *
      * @param int $reportId The report Id
      * @throws NotFoundException
-     * @return void Nothing
      */
-    public function unlink_issue($reportId): void
+    public function unlink_issue($reportId): Response
     {
         if (empty($reportId)) {
-            throw new NotFoundException(__('Invalid report Id.'));
+            throw new NotFoundException('Invalid report Id.');
         }
 
         $reportId = (int) $reportId;
@@ -220,14 +220,14 @@ public function unlink_issue($reportId): void
         $report = $reportsTable->findById($reportId)->all()->first();
 
         if (! $report) {
-            throw new NotFoundException(__('The report does not exist.'));
+            throw new NotFoundException('The report does not exist.');
         }
 
         $reportArray = $report->toArray();
         $ticket_id = $reportArray['sourceforge_bug_id'];
 
         if (! $ticket_id) {
-            throw new NotFoundException(__('Invalid Ticket ID!!'));
+            throw new NotFoundException('Invalid Ticket ID!!');
         }
 
         // "formatted" text of the comment.
@@ -260,7 +260,7 @@ public function unlink_issue($reportId): void
             );
         }
 
-        $this->redirect([
+        return $this->redirect([
             '_name' => 'reports:view',
             'id' => $reportId,
         ]);
@@ -487,9 +487,8 @@ protected function getReportStatusFromIssueState(string $issueState): string
      *
      * Can not (& should not) be directly accessed via web.
      *
-     * @return void Nothing
      */
-    public function sync_issue_status(): void
+    public function sync_issue_status(): ?Response
     {
         if (! Configure::read('CronDispatcher')) {
             $flash_class = 'alert alert-error';
@@ -498,9 +497,7 @@ public function sync_issue_status(): void
                 ['params' => ['class' => $flash_class]]
             );
 
-            $this->redirect('/');
-
-            return;
+            return $this->redirect('/');
         }
 
         $this->disableAutoRender();
@@ -556,5 +553,7 @@ public function sync_issue_status(): void
                 ['scope' => 'cron_jobs']
             );
         }
+
+        return null;
     }
 }

src/Controller/IncidentsController.php

@@ -41,12 +41,13 @@
 /**
  * Incidents controller handling incident creation and rendering.
  *
- * @property NotificationsTable $Notifications
- * @property IncidentsTable $Incidents
- * @property ReportsTable $Reports
  */
 class IncidentsController extends AppController
 {
+    protected NotificationsTable $Notifications;
+    protected IncidentsTable $Incidents;
+    protected ReportsTable $Reports;
+
     /**
      * Initialization hook method.
      *
@@ -58,8 +59,9 @@ public function initialize(): void
     {
         parent::initialize();
         $this->loadComponent('Mailer');
-        $this->loadModel('Notifications');
-        $this->loadModel('Incidents');
+        $this->Notifications = $this->fetchTable('Notifications');
+        $this->Incidents = $this->fetchTable('Incidents');
+        $this->Reports = $this->fetchTable('Reports');
     }
 
     public function create(): ?Response
@@ -114,13 +116,13 @@ public function create(): ?Response
     public function json(?string $id): ?Response
     {
         if (empty($id)) {
-            throw new NotFoundException(__('Invalid Incident'));
+            throw new NotFoundException('Invalid Incident');
         }
 
         $this->Incidents->recursive = -1;
         $incident = $this->Incidents->findById($id)->all()->first();
         if (! $incident) {
-            throw new NotFoundException(__('The incident does not exist.'));
+            throw new NotFoundException('The incident does not exist.');
         }
 
         $incident['full_report'] =
@@ -138,14 +140,14 @@ public function json(?string $id): ?Response
     public function view(?string $incidentId): void
     {
         if (empty($incidentId)) {
-            throw new NotFoundException(__('Invalid Incident'));
+            throw new NotFoundException('Invalid Incident');
         }
 
         $incidentId = (int) $incidentId;
 
         $incident = $this->Incidents->findById($incidentId)->all()->first();
         if (! $incident) {
-            throw new NotFoundException(__('The incident does not exist.'));
+            throw new NotFoundException('The incident does not exist.');
         }
 
         $incident['full_report'] =

src/Controller/NotificationsController.php

@@ -18,6 +18,9 @@
 
 namespace App\Controller;
 
+use App\Model\Table\NotificationsTable;
+use App\Model\Table\DevelopersTable;
+use App\Model\Table\ReportsTable;
 use Cake\Event\EventInterface;
 use Cake\Http\Response;
 use Cake\ORM\TableRegistry;
@@ -32,6 +35,10 @@
  */
 class NotificationsController extends AppController
 {
+    protected NotificationsTable $Notifications;
+    protected DevelopersTable $Developers;
+    protected ReportsTable $Reports;
+
     /**
      * Initialization hook method.
      *
@@ -49,9 +56,9 @@ public function initialize(): void
             'Form',
             'Reports',
         ]);
-        $this->loadModel('Notifications');
-        $this->loadModel('Developers');
-        $this->loadModel('Reports');
+        $this->Notifications = $this->fetchTable('Notifications');
+        $this->Developers = $this->fetchTable('Developers');
+        $this->Reports = $this->fetchTable('Reports');
     }
 
     public function beforeFilter(EventInterface $event)
@@ -153,10 +160,8 @@ public function data_tables(): Response
      * Currently it deletes them (marks them "read").
      * Can be Extended for other mass operations as well.
      * Expects an array of Notification Ids as a POST parameter.
-     *
-     * @return void Nothing
      */
-    public function mass_action(): void
+    public function mass_action(): Response
     {
         $msg = 'Selected Notifications have been marked \'Read\'!';
         $flash_class = 'alert alert-success';
@@ -184,6 +189,6 @@ public function mass_action(): void
             $msg,
             ['params' => ['class' => $flash_class]]
         );
-        $this->redirect('/notifications/');
+        return $this->redirect('/notifications/');
     }
 }