Fix deprecations findAll wants named params

Author: williamdes

src/Controller/NotificationsController.php

@@ -108,7 +108,15 @@ public function data_tables(): Response
         $pagedParams['limit'] = intval($this->request->getQuery('iDisplayLength'));
         $pagedParams['offset'] = intval($this->request->getQuery('iDisplayStart'));
 
-        $rows = $this->Notifications->find('all', $pagedParams);
+        $rows = $this->Notifications->find(
+            'all',
+            contain: $pagedParams['contain'],
+            fields: $pagedParams['fields'],
+            conditions: $pagedParams['conditions'],
+            order: $pagedParams['order'],
+            limit: $pagedParams['limit'],
+            offset: $pagedParams['offset'],
+        );
         $totalFiltered = $this->Notifications->find(
             'all',
             conditions: [

src/Controller/ReportsController.php

@@ -186,7 +186,14 @@ public function data_tables(): ?Response
         $pagedParams['offset'] = (int) $this->request->getQuery('iDisplayStart');
 
         $rows = $this->findAllDataTable(
-            $this->Reports->find('all', $pagedParams)->innerJoin(
+            $this->Reports->find(
+                'all',
+                fields: $pagedParams['fields'],
+                conditions: $pagedParams['conditions'],
+                order: $pagedParams['order'],
+                limit: $pagedParams['limit'],
+                offset: $pagedParams['offset'],
+            )->innerJoin(
                 ['incidents' => $subquery],
                 ['incidents.report_id = Reports.id']
             )

src/Model/Table/ReportsTable.php

@@ -221,7 +221,6 @@ public function getRelatedByField(
             'conditions' => [
                 'NOT' => ['Incidents.' . $fieldName . ' is null'],
             ],
-            'limit' => $limit,
         ];
 
         if ($related) {
@@ -232,7 +231,11 @@ public function getRelatedByField(
             $queryDetails['conditions'][] = ['Incidents.created >=' => $timeLimit];
         }
 
-        $groupedCount = TableRegistry::getTableLocator()->get('Incidents')->find('all', $queryDetails);
+        $groupedCount = TableRegistry::getTableLocator()->get('Incidents')->find(
+            'all',
+            conditions: $queryDetails['conditions'],
+            limit: $limit,
+        );
 
         /* Ommit version number in case of browser and server_software fields.
          * In case of browser field, version number is seperated by space,

tests/TestCase/Controller/IncidentsControllerTest.php

@@ -56,7 +56,10 @@ public function testView(): void
     public function testJson(): void
     {
         $this->get('/incidents/json/1');
+        $this->assertSame(200, $this->_response->getStatusCode(), 'The reponse code should be 200 !');
         $incident = json_decode($this->_response->getBody(), true);
+        $this->assertNotNull($incident, 'The incident should be an array !');
+
         $expected = [
             'id' => 1,
             'error_name' => 'Lorem ipsum dolor sit amet',
@@ -102,8 +105,10 @@ public function testCreate(): void
 
         $report = $this->Reports->find(
             'all',
-            ['order' => 'Reports.created desc']
-        )->all()->first();
+            order: ['Reports.created desc']
+        )->first();
+        $this->assertNotNull($report, 'The report should be created !');
+
         $subject = 'A new report has been submitted '
             . 'on the Error Reporting Server: '
             . $report['id'];
@@ -123,7 +128,7 @@ public function testCreate(): void
 
         $report = $this->Reports->find(
             'all',
-            ['order' => 'Reports.created desc']
+            order: ['Reports.created desc']
         )->all()->first();
         $this->Reports->id = $report['id'];
         $incidents = $this->Reports->getIncidents();
@@ -158,7 +163,7 @@ public function testCreate(): void
 
         $report = $this->Reports->find(
             'all',
-            ['order' => 'Reports.created desc']
+            order: ['Reports.created desc']
         )->all()->first();
         $subject = 'A new report has been submitted '
             . 'on the Error Reporting Server: '

tests/TestCase/Controller/NotificationsControllerTest.php

@@ -57,7 +57,7 @@ public function testMassAction(): void
             ]
         );
 
-        $notifications = $this->Notifications->find('all', ['fields' => ['Notifications.id']]);
+        $notifications = $this->Notifications->find('all', fields: ['Notifications.id']);
         $this->assertInstanceOf('Cake\ORM\Query', $notifications);
         $actual = $notifications->enableHydration(false)->toArray();
         $expected = [
@@ -71,7 +71,7 @@ public function testMassAction(): void
             ['mark_all' => 1]
         );
 
-        $notifications = $this->Notifications->find('all', ['fields' => ['Notifications.id']]);
+        $notifications = $this->Notifications->find('all', fields: ['Notifications.id']);
         $this->assertInstanceOf('Cake\ORM\Query', $notifications);
         $actual = $notifications->enableHydration(false)->toArray();
         $expected = [];

tests/TestCase/Model/Table/IncidentsTableTest.php

@@ -406,7 +406,7 @@ public function testCreateIncidentFromBugReport(): void
 
         $incident = $this->Incidents->get($result['incidents'][0]);
         // check the incident has been reported under the same 'Report'
-        $result = TableRegistry::getTableLocator()->get('Incidents')->find('all', ['conditions' => ['report_id = ' . $incident->report_id]]);
+        $result = TableRegistry::getTableLocator()->get('Incidents')->find('all', conditions: ['report_id = ' . $incident->report_id]);
         $result = $result->enableHydration(false)->toArray();
         $this->assertEquals(2, count($result));
 
@@ -430,7 +430,7 @@ public function testCreateIncidentFromBugReport(): void
 
         // check the incidents have been reported under the same 'Report's
         $incident = $this->Incidents->get($result['incidents'][0]);
-        $result = TableRegistry::getTableLocator()->get('Incidents')->find('all', ['conditions' => ['report_id = ' . $incident->report_id]]);
+        $result = TableRegistry::getTableLocator()->get('Incidents')->find('all', conditions: ['report_id = ' . $incident->report_id]);
         $result = $result->enableHydration(false)->toArray();
         $this->assertEquals(2, count($result));
 

tests/TestCase/Model/Table/NotificationsTableTest.php

@@ -41,7 +41,7 @@ public function testAddNotifications(): void
         $devs = $developer->find('all');
         $devs = $devs->enableHydration(false)->toArray();
         $this->Notifications->addNotifications($report_id);
-        $notifs = $this->Notifications->find('all', ['conditions' => ['report_id' => $report_id]]);
+        $notifs = $this->Notifications->find('all', conditions: ['report_id' => $report_id]);
         $notifs = $notifs->enableHydration(false)->toArray();
         $this->assertEquals(count($notifs), count($devs));
     }

tests/TestCase/Shell/SyncGithubIssueStatesShellTest.php

@@ -62,12 +62,10 @@ public function testExecute(): void
         // Fetch all linked reports
         $reports = $Reports->find(
             'all',
-            [
-                'conditions' => [
-                    'sourceforge_bug_id IS NOT NULL',
-                    'NOT' => ['status' => 'resolved'],
-                ],
-            ]
+            conditions: [
+                'sourceforge_bug_id IS NOT NULL',
+                'NOT' => ['status' => 'resolved'],
+            ],
         );
         $this->assertEquals(3, $reports->count());
 
@@ -78,24 +76,20 @@ public function testExecute(): void
         // Fetch all linked reports
         $reports = $Reports->find(
             'all',
-            [
-                'conditions' => [
-                    'sourceforge_bug_id IS NOT NULL',
-                    'NOT' => ['status' => 'resolved'],
-                ],
-            ]
+            conditions: [
+                'sourceforge_bug_id IS NOT NULL',
+                'NOT' => ['status' => 'resolved'],
+            ],
         );
         $this->assertEquals(2, $reports->count());
 
         // Fetch all closed reports
         $reports = $Reports->find(
             'all',
-            [
-                'conditions' => [
-                    'sourceforge_bug_id IS NOT NULL',
-                    'status' => 'resolved',
-                ],
-            ]
+            conditions: [
+                'sourceforge_bug_id IS NOT NULL',
+                'status' => 'resolved',
+            ],
         );
         $this->assertEquals(1, $reports->count());
         $report5 = $Reports->get(4);