Fix remaining deprecations

markstory · Jul 26, 2023 · 3d684a8 · 3d684a8
1 parent 6a8570e
commit 3d684a8
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 13 deletions.
diff --git a/src/Command/CleanupCommand.php b/src/Command/CleanupCommand.php
@@ -51,8 +51,7 @@ public function execute(Arguments $args, ConsoleIo $io)
         $io->verbose("Going to remove tasks older than {$expires->toDateTimeString()}");
 
         $tasks = $this->fetchTable('Tasks');
-        $query = $tasks->query()
-            ->delete()
+        $query = $tasks->deleteQuery()
             ->where([
                 'Tasks.deleted_at IS NOT' => null,
                 'Tasks.deleted_at <' => $expires,

diff --git a/src/Controller/AppController.php b/src/Controller/AppController.php
@@ -3,6 +3,7 @@
 
 namespace App\Controller;
 
+use App\Model\Table\ProjectsTable;
 use Authentication\Authenticator\SessionAuthenticator;
 use Cake\Controller\Controller;
 use Cake\Event\EventInterface;
@@ -26,6 +27,8 @@ class AppController extends Controller
         beforeRender as protected inertiaBeforeRender;
     }
 
+    public ProjectsTable $Projects;
+
     /**
      * Initialization hook method.
      *

diff --git a/src/Controller/ProjectsController.php b/src/Controller/ProjectsController.php
@@ -4,21 +4,24 @@
 namespace App\Controller;
 
 use App\Model\Entity\Project;
+use App\Model\Table\ProjectsTable;
+use App\Model\Table\TasksTable;
 use Cake\View\JsonView;
 use InvalidArgumentException;
 
 /**
  * Projects Controller
- *
- * @property \App\Model\Table\TasksTable $Tasks
- * @property \App\Model\Table\ProjectsTable $Projects
  */
 class ProjectsController extends AppController
 {
+    public TasksTable $Tasks;
+    public ProjectsTable $Projects;
+
     public function initialize(): void
     {
         parent::initialize();
         $this->loadModel('Tasks');
+        $this->loadModel('Projects');
     }
 
     public function viewClasses(): array

diff --git a/src/Model/Table/SimpleSortable.php b/src/Model/Table/SimpleSortable.php
@@ -53,9 +53,7 @@ public function move(EntityInterface $record, $newIndex, array $scopeConditions)
             $targetOffset = $currentTask->get($field);
         }
 
-        $query = $this->table->query()
-            ->update()
-            ->where($scopeConditions);
+        $query = $this->table->updateQuery()->where($scopeConditions);
 
         $current = $record->get($field);
         $record->set($field, $targetOffset);

diff --git a/src/Model/Table/TasksTable.php b/src/Model/Table/TasksTable.php
@@ -158,7 +158,7 @@ public function find(string $type = 'all', array $options = []): Query
     {
         // Add the default deleted condition unless the `deleted` option is set.
         $operator = empty($options['deleted']) ? 'IS' : 'IS NOT';
-        $query = $this->query()->select();
+        $query = $this->selectQuery();
         $query->where(["Tasks.deleted_at {$operator}" => null]);
 
         return $this->callFinder($type, $query, $options);
@@ -353,8 +353,7 @@ public function move(Task $item, array $operation)
             $targetOffset = $result->max + 1;
         }
 
-        $query = $this->query()
-            ->update()
+        $query = $this->updateQuery()
             ->innerJoinWith('Projects')
             ->where($conditions);
 

diff --git a/tests/TestCase/Command/CalendarSubscriptionRenewCommandTest.php b/tests/TestCase/Command/CalendarSubscriptionRenewCommandTest.php
@@ -4,8 +4,8 @@
 namespace App\Test\TestCase\Command;
 
 use App\Test\TestCase\FactoryTrait;
+use Cake\Console\TestSuite\ConsoleIntegrationTestTrait;
 use Cake\ORM\TableRegistry;
-use Cake\TestSuite\ConsoleIntegrationTestTrait;
 use Cake\TestSuite\TestCase;
 
 /**

diff --git a/tests/TestCase/Command/CleanupCommandTest.php b/tests/TestCase/Command/CleanupCommandTest.php
@@ -4,8 +4,8 @@
 namespace App\Test\TestCase\Command;
 
 use App\Test\TestCase\FactoryTrait;
+use Cake\Console\TestSuite\ConsoleIntegrationTestTrait;
 use Cake\I18n\FrozenTime;
-use Cake\TestSuite\ConsoleIntegrationTestTrait;
 use Cake\TestSuite\TestCase;
 
 /**