Remove deprecations (#389)

dereuromark · web-flow · commit 50ab21d8c9cd · 2023-10-25T19:33:05.000+02:00
* Remove deprecations

* Remove deprecations

* Remove deprecations

* Remove deprecations
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 [![Total Downloads](https://poser.pugx.org/dereuromark/cakephp-queue/d/total)](https://packagist.org/packages/dereuromark/cakephp-queue)
 [![Coding Standards](https://img.shields.io/badge/cs-PSR--2--R-yellow.svg)](https://github.com/php-fig-rectified/fig-rectified-standards)
 
-This branch is for use with **CakePHP 4.3+**. For details see [version map](https://github.com/dereuromark/cakephp-queue/wiki#cakephp-version-map).
+This branch is for use with **CakePHP 4.4+**. For details see [version map](https://github.com/dereuromark/cakephp-queue/wiki#cakephp-version-map).
 
 
 ## Background
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
 	"require": {
 		"php": ">=7.4",
 		"brick/varexporter": "^0.3.5 || ^0.4.0",
-		"cakephp/cakephp": "^4.3.0"
+		"cakephp/cakephp": "^4.4.0"
 	},
 	"require-dev": {
 		"cakedc/cakephp-phpstan": "^2.0",
diff --git a/src/Command/InfoCommand.php b/src/Command/InfoCommand.php
@@ -14,6 +14,7 @@
  * @property \Queue\Model\Table\QueuedJobsTable $QueuedJobs
  * @property \Queue\Model\Table\QueueProcessesTable $QueueProcesses
  */
+#[\AllowDynamicProperties]
 class InfoCommand extends Command {
 
 	/**
diff --git a/src/Command/JobCommand.php b/src/Command/JobCommand.php
@@ -15,6 +15,7 @@
 /**
  * @property \Queue\Model\Table\QueuedJobsTable $QueuedJobs
  */
+#[\AllowDynamicProperties]
 class JobCommand extends Command {
 
 	/**
diff --git a/src/Command/WorkerCommand.php b/src/Command/WorkerCommand.php
@@ -13,6 +13,7 @@
 /**
  * @property \Queue\Model\Table\QueueProcessesTable $QueueProcesses
  */
+#[\AllowDynamicProperties]
 class WorkerCommand extends Command {
 
 	/**
diff --git a/src/Controller/Admin/QueueController.php b/src/Controller/Admin/QueueController.php
@@ -13,6 +13,7 @@
  * @property \Queue\Model\Table\QueuedJobsTable $QueuedJobs
  * @property \Queue\Model\Table\QueueProcessesTable $QueueProcesses
  */
+#[\AllowDynamicProperties]
 class QueueController extends AppController {
 
 	use LoadHelperTrait;
diff --git a/src/Controller/Admin/QueueProcessesController.php b/src/Controller/Admin/QueueProcessesController.php
@@ -12,6 +12,7 @@
  * @method \Cake\Datasource\ResultSetInterface<\Queue\Model\Entity\QueueProcess> paginate($object = null, array $settings = [])
  * @property \Queue\Model\Table\QueuedJobsTable $QueuedJobs
  */
+#[\AllowDynamicProperties]
 class QueueProcessesController extends AppController {
 
 	use LoadHelperTrait;
diff --git a/src/Controller/Admin/QueuedJobsController.php b/src/Controller/Admin/QueuedJobsController.php
@@ -19,6 +19,7 @@
  * @method \Cake\Datasource\ResultSetInterface<\Queue\Model\Entity\QueuedJob> paginate($object = null, array $settings = [])
  * @property \Search\Controller\Component\SearchComponent $Search
  */
+#[\AllowDynamicProperties]
 class QueuedJobsController extends AppController {
 
 	use LoadHelperTrait;
diff --git a/tests/TestCase/Command/AddCommandTest.php b/tests/TestCase/Command/AddCommandTest.php
@@ -3,7 +3,7 @@
 
 namespace Queue\Test\TestCase\Command;
 
-use Cake\TestSuite\ConsoleIntegrationTestTrait;
+use Cake\Console\TestSuite\ConsoleIntegrationTestTrait;
 use Cake\TestSuite\TestCase;
 
 /**
diff --git a/tests/TestCase/Command/BakeQueueTaskCommandTest.php b/tests/TestCase/Command/BakeQueueTaskCommandTest.php
@@ -3,7 +3,7 @@
 
 namespace Queue\Test\TestCase\Command;
 
-use Cake\TestSuite\ConsoleIntegrationTestTrait;
+use Cake\Console\TestSuite\ConsoleIntegrationTestTrait;
 use Cake\TestSuite\TestCase;
 use Shim\TestSuite\TestTrait;
 
diff --git a/tests/TestCase/Command/InfoCommandTest.php b/tests/TestCase/Command/InfoCommandTest.php
@@ -3,7 +3,7 @@
 
 namespace Queue\Test\TestCase\Command;
 
-use Cake\TestSuite\ConsoleIntegrationTestTrait;
+use Cake\Console\TestSuite\ConsoleIntegrationTestTrait;
 use Cake\TestSuite\TestCase;
 
 /**
diff --git a/tests/TestCase/Command/JobCommandTest.php b/tests/TestCase/Command/JobCommandTest.php
@@ -3,9 +3,9 @@
 
 namespace Queue\Test\TestCase\Command;
 
+use Cake\Console\TestSuite\ConsoleIntegrationTestTrait;
 use Cake\Core\Configure;
 use Cake\I18n\FrozenTime;
-use Cake\TestSuite\ConsoleIntegrationTestTrait;
 use Cake\TestSuite\TestCase;
 use Queue\Model\Entity\QueuedJob;
 
diff --git a/tests/TestCase/Command/MigrateTasksCommandTest.php b/tests/TestCase/Command/MigrateTasksCommandTest.php
@@ -3,7 +3,7 @@
 
 namespace Queue\Test\TestCase\Command;
 
-use Cake\TestSuite\ConsoleIntegrationTestTrait;
+use Cake\Console\TestSuite\ConsoleIntegrationTestTrait;
 use Cake\TestSuite\TestCase;
 use Queue\Command\MigrateTasksCommand;
 use Shim\TestSuite\TestTrait;
diff --git a/tests/TestCase/Command/RunCommandTest.php b/tests/TestCase/Command/RunCommandTest.php
@@ -3,9 +3,9 @@
 
 namespace Queue\Test\TestCase\Command;
 
+use Cake\Console\TestSuite\ConsoleIntegrationTestTrait;
 use Cake\Core\Configure;
 use Cake\Datasource\ConnectionManager;
-use Cake\TestSuite\ConsoleIntegrationTestTrait;
 use Cake\TestSuite\TestCase;
 
 /**
diff --git a/tests/TestCase/Command/WorkerCommandTest.php b/tests/TestCase/Command/WorkerCommandTest.php
@@ -3,7 +3,7 @@
 
 namespace Queue\Test\TestCase\Command;
 
-use Cake\TestSuite\ConsoleIntegrationTestTrait;
+use Cake\Console\TestSuite\ConsoleIntegrationTestTrait;
 use Cake\TestSuite\TestCase;
 
 /**
diff --git a/tests/TestCase/Controller/Admin/QueueControllerTest.php b/tests/TestCase/Controller/Admin/QueueControllerTest.php
@@ -242,7 +242,7 @@ public function testFlush() {
 		$job = $jobsTable->newEntity([
 			'job_task' => 'foo',
 			'failed' => 1,
-			'fetched' => (new FrozenTime())->subHour(),
+			'fetched' => (new FrozenTime())->subHours(1),
 		]);
 		$jobsTable->saveOrFail($job);
 
diff --git a/tests/TestCase/Model/Table/QueuedJobsTableTest.php b/tests/TestCase/Model/Table/QueuedJobsTableTest.php
@@ -689,9 +689,9 @@ public function testIsQueued() {
 	public function testGetStats() {
 		$queuedJob = $this->QueuedJobs->newEntity([
 			'job_task' => 'Foo',
-			'completed' => (new FrozenTime())->subHour(2),
-			'fetched' => (new FrozenTime())->subHour(3),
-			'created' => (new FrozenTime())->subHour(5),
+			'completed' => (new FrozenTime())->subHours(2),
+			'fetched' => (new FrozenTime())->subHours(3),
+			'created' => (new FrozenTime())->subHours(5),
 		]);
 		$this->QueuedJobs->saveOrFail($queuedJob);
 
diff --git a/tests/TestCase/View/Helper/QueueProgressHelperTest.php b/tests/TestCase/View/Helper/QueueProgressHelperTest.php
@@ -86,7 +86,7 @@ public function testProgress() {
 	public function testProgressCalculatedEmpty() {
 		$queuedJob = new QueuedJob([
 			'job_task' => 'Queue.Example',
-			'fetched' => (new FrozenTime())->subMinute(),
+			'fetched' => (new FrozenTime())->subMinutes(1),
 		]);
 		$result = $this->QueueProgressHelper->progress($queuedJob);
 		$this->assertNull($result);
@@ -99,14 +99,14 @@ public function testProgressCalculated() {
 		$queuedJob = new QueuedJob([
 			'job_task' => 'Queue.Example',
 			'created' => (new FrozenTime())->subMinutes(2),
-			'fetched' => (new FrozenTime())->subMinute(),
+			'fetched' => (new FrozenTime())->subMinutes(1),
 			'completed' => (new FrozenTime())->subSeconds(2),
 		]);
 		$this->getTableLocator()->get('Queue.QueuedJobs')->saveOrFail($queuedJob);
 
 		$queuedJob = new QueuedJob([
 			'job_task' => 'Queue.Example',
-			'fetched' => (new FrozenTime())->subMinute(),
+			'fetched' => (new FrozenTime())->subMinutes(1),
 		]);
 
 		$result = $this->QueueProgressHelper->progress($queuedJob);
@@ -160,14 +160,14 @@ public function testProgressBarByStatistics() {
 		/** @var \Queue\Model\Entity\QueuedJob $queuedJob */
 		$queuedJob = $this->getTableLocator()->get('Queue.QueuedJobs')->newEntity([
 			'job_task' => 'Foo',
-			'created' => (new FrozenTime())->subHour(),
-			'fetched' => (new FrozenTime())->subHour(),
-			'completed' => (new FrozenTime())->subHour()->addMinutes(10),
+			'created' => (new FrozenTime())->subHours(1),
+			'fetched' => (new FrozenTime())->subHours(1),
+			'completed' => (new FrozenTime())->subHours(1)->addMinutes(10),
 		]);
 		$this->getTableLocator()->get('Queue.QueuedJobs')->saveOrFail($queuedJob);
 
 		$queuedJob->completed = null;
-		$queuedJob->fetched = (new FrozenTime())->subMinute();
+		$queuedJob->fetched = (new FrozenTime())->subMinutes(1);
 
 		$result = $this->QueueProgressHelper->progressBar($queuedJob, 5);
 		$this->assertTextContains('<span title="10%">', $result);
@@ -178,8 +178,8 @@ public function testProgressBarByStatistics() {
 	 */
 	public function testTimeoutProgressBar() {
 		$queuedJob = new QueuedJob([
-			'created' => (new FrozenTime())->subHour(),
-			'notbefore' => (new FrozenTime())->addHour(),
+			'created' => (new FrozenTime())->subHours(1),
+			'notbefore' => (new FrozenTime())->addHours(1),
 		]);
 
 		$result = $this->QueueProgressHelper->timeoutProgressBar($queuedJob, 5);
@@ -191,16 +191,16 @@ public function testTimeoutProgressBar() {
 	 */
 	public function testHtmlTimeoutProgressBar() {
 		$queuedJob = new QueuedJob([
-			'created' => (new FrozenTime())->subMinute(),
-			'notbefore' => (new FrozenTime())->addMinute(),
+			'created' => (new FrozenTime())->subMinutes(1),
+			'notbefore' => (new FrozenTime())->addMinutes(1),
 		]);
 		$result = $this->QueueProgressHelper->htmlTimeoutProgressBar($queuedJob);
 		$expected = '<progress value="50" max="100" title="50%"></progress>';
 		$this->assertSame($expected, $result);
 
 		$queuedJob = new QueuedJob([
 			'created' => (new FrozenTime()),
-			'notbefore' => (new FrozenTime())->addHour(),
+			'notbefore' => (new FrozenTime())->addHours(1),
 		]);
 		// For IE9 and below
 		$fallback = $this->QueueProgressHelper->timeoutProgressBar($queuedJob, 10);
@@ -209,8 +209,8 @@ public function testHtmlTimeoutProgressBar() {
 		$this->assertSame($expected, $result);
 
 		$queuedJob = new QueuedJob([
-			'created' => (new FrozenTime())->subMinute(),
-			'notbefore' => (new FrozenTime())->subSecond(),
+			'created' => (new FrozenTime())->subMinutes(1),
+			'notbefore' => (new FrozenTime())->subSeconds(1),
 		]);
 		// For IE9 and below
 		$fallback = $this->QueueProgressHelper->timeoutProgressBar($queuedJob, 10);
