Cake5 (#4)

* Init Cake5 upgrade

.github/workflows/ci.yml

@@ -11,11 +11,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.2']
+        php-version: ['8.1', '8.3']
         db-type: ['sqlite', 'mysql', 'pgsql']
         prefer-lowest: ['']
         include:
-          - php-version: '7.4'
+          - php-version: '8.1'
             db-type: 'sqlite'
             prefer-lowest: 'prefer-lowest'
 
@@ -77,7 +77,7 @@ jobs:
           if [[ ${{ matrix.db-type }} == 'sqlite' ]]; then export DB_URL='sqlite:///:memory:'; fi
           if [[ ${{ matrix.db-type }} == 'mysql' ]]; then export DB_URL='mysql://root:root@127.0.0.1/cakephp?encoding=utf8'; fi
           if [[ ${{ matrix.db-type }} == 'pgsql' ]]; then export DB_URL='postgres://postgres:postgres@127.0.0.1/postgres'; fi
-          if [[ ${{ matrix.php-version }} == '7.4' ]]; then
+          if [[ ${{ matrix.php-version }} == '8.1' ]]; then
             vendor/bin/phpunit --coverage-clover=coverage.xml
           else
             vendor/bin/phpunit
@@ -87,7 +87,7 @@ jobs:
         run: if ${{ matrix.prefer-lowest == 'prefer-lowest' }}; then vendor/bin/validate-prefer-lowest -m; fi
 
       - name: Code Coverage Report
-        if: success() && matrix.php-version == '7.4'
+        if: success() && matrix.php-version == '8.1'
         uses: codecov/codecov-action@v3
 
   validation:
@@ -100,7 +100,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: '8.1'
           extensions: mbstring, intl
           coverage: none
 

composer.json

@@ -4,16 +4,16 @@
 	"type": "cakephp-plugin",
 	"license": "MIT",
 	"require": {
-		"php": ">=7.4",
-		"cakephp/cakephp": "^4.4.17",
+		"php": ">=8.1",
+		"cakephp/cakephp": "^5.0.1",
 		"dragonmantank/cron-expression": "^3.3",
-		"dereuromark/cakephp-tools": "^2.5.0",
-		"dereuromark/cakephp-queue": "^6.7.2"
+		"dereuromark/cakephp-tools": "^3.0.0",
+		"dereuromark/cakephp-queue": "^7.0.0"
 	},
 	"require-dev": {
-		"cakephp/migrations": "^3.9.0",
-		"phpunit/phpunit": "^9.5",
-		"fig-r/psr2r-sniffer": "^1.5.1"
+		"cakephp/migrations": "^4.1.0",
+		"phpunit/phpunit": "^10.3",
+		"fig-r/psr2r-sniffer": "dev-next"
 	},
 	"autoload": {
 		"psr-4": {

phpcs.xml

@@ -21,7 +21,7 @@
 		<exclude-pattern>*/config/Migrations/*</exclude-pattern>
 		<exclude-pattern>*/config/Seeds/*</exclude-pattern>
 	</rule>
-	<rule ref="Spryker.Classes.ClassFileName.NoMatch">
+	<rule ref="PhpCollective.Classes.ClassFileName.NoMatch">
 		<exclude-pattern>*/config/Migrations/*</exclude-pattern>
 	</rule>
 

phpunit.xml.dist

@@ -22,12 +22,12 @@
     </testsuites>
 
     <extensions>
-        <extension class="Cake\TestSuite\Fixture\PHPUnitExtension"/>
+		<bootstrap class="Cake\TestSuite\Fixture\Extension\PHPUnitExtension"/>
     </extensions>
 
-    <coverage>
+    <source>
         <include>
             <directory suffix=".php">src/</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>

src/Model/Entity/SchedulerRow.php

@@ -3,7 +3,7 @@
 
 namespace QueueScheduler\Model\Entity;
 
-use Cake\I18n\FrozenTime;
+use Cake\I18n\DateTime;
 use Cron\CronExpression;
 use DateInterval;
 use Queue\Queue\Config;
@@ -18,11 +18,11 @@
  * @property int $type
  * @property string $content
  * @property string $frequency
- * @property \Cake\I18n\FrozenTime|null $last_run
- * @property \Cake\I18n\FrozenTime|null $next_run
+ * @property \Cake\I18n\DateTime|null $last_run
+ * @property \Cake\I18n\DateTime|null $next_run
  * @property bool $allow_concurrent
- * @property \Cake\I18n\FrozenTime|null $created
- * @property \Cake\I18n\FrozenTime|null $modified
+ * @property \Cake\I18n\DateTime|null $created
+ * @property \Cake\I18n\DateTime|null $modified
  * @property bool $enabled
  * @property-read string|null $job_task
  * @property-read array $job_data
@@ -40,7 +40,7 @@ class SchedulerRow extends Entity {
 	 *
 	 * @var array<string, bool>
 	 */
-	protected $_accessible = [
+	protected array $_accessible = [
 		'*' => true,
 		'id' => false,
 	];
@@ -82,7 +82,7 @@ public static function types($value = null) {
 	public function isDue(): bool {
 		$nextRun = $this->next_run;
 
-		$dateTime = new FrozenTime();
+		$dateTime = new DateTime();
 		if ($nextRun) {
 			return $nextRun->timestamp < $dateTime->timestamp;
 		}
@@ -119,12 +119,12 @@ public function calculateNextInterval(): ?DateInterval {
 
 	/**
 	 * @throws \Exception
-	 * @return \Cake\I18n\FrozenTime|null
+	 * @return \Cake\I18n\DateTime|null
 	 */
 	public function calculateNextRun() {
 		$dateTime = $this->last_run;
 		if ($dateTime === null) {
-			return new FrozenTime();
+			return new DateTime();
 		}
 
 		$i = $this->calculateNextInterval();

src/Model/Table/SchedulerRowsTable.php

@@ -7,8 +7,8 @@
 use Cake\Core\Configure;
 use Cake\Datasource\EntityInterface;
 use Cake\Event\EventInterface;
-use Cake\I18n\FrozenTime;
-use Cake\ORM\Query;
+use Cake\I18n\DateTime;
+use Cake\ORM\Query\SelectQuery;
 use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
 use Cake\Validation\Validator;
@@ -172,11 +172,11 @@ public function beforeSave(EventInterface $event, EntityInterface $entity, Array
 	}
 
 	/**
-	 * @param \Cake\ORM\Query $query
+	 * @param \Cake\ORM\Query\SelectQuery $query
 	 *
-	 * @return \Cake\ORM\Query
+	 * @return \Cake\ORM\Query\SelectQuery
 	 */
-	public function findActive(Query $query) {
+	public function findActive(SelectQuery $query): SelectQuery {
 		$conditions = ['enabled' => true];
 		$debug = Configure::read('debug');
 		if (!$debug && !Configure::read('QueueScheduler.allowRaw')) {
@@ -187,12 +187,12 @@ public function findActive(Query $query) {
 	}
 
 	/**
-	 * @param \Cake\ORM\Query $query
+	 * @param \Cake\ORM\Query\SelectQuery $query
 	 *
-	 * @return \Cake\ORM\Query
+	 * @return \Cake\ORM\Query\SelectQuery
 	 */
-	public function findScheduled(Query $query) {
-		return $query->where(['OR' => ['next_run IS' => null, 'next_run <=' => new FrozenTime()]]);
+	public function findScheduled(SelectQuery $query): SelectQuery {
+		return $query->where(['OR' => ['next_run IS' => null, 'next_run <=' => new DateTime()]]);
 	}
 
 	/**
@@ -215,7 +215,7 @@ public function run(SchedulerRow $row): bool {
 		}
 
 		$queuedJobsTable->createJob($row->job_task, $row->job_data, $config);
-		$row->last_run = new FrozenTime();
+		$row->last_run = new DateTime();
 		$this->saveOrFail($row);
 
 		return true;

src/QueueSchedulerPlugin.php

@@ -17,12 +17,12 @@ class QueueSchedulerPlugin extends BasePlugin {
 	/**
 	 * @var bool
 	 */
-	protected $bootstrapEnabled = false;
+	protected bool $bootstrapEnabled = false;
 
 	/**
 	 * @var bool
 	 */
-	protected $middlewareEnabled = false;
+	protected bool $middlewareEnabled = false;
 
 	/**
 	 * Add routes for the plugin.

tests/Fixture/SchedulerRowsFixture.php

@@ -10,12 +10,12 @@ class SchedulerRowsFixture extends TestFixture {
 	/**
 	 * @var string
 	 */
-	public $table = 'queue_scheduler_rows';
+	public string $table = 'queue_scheduler_rows';
 
 	/**
 	 * @var array
 	 */
-	public $fields = [
+	public array $fields = [
 		'id' => ['type' => 'integer', 'length' => null, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
 		'name' => ['type' => 'string', 'length' => 140, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null],
 		'type' => ['type' => 'tinyinteger', 'length' => null, 'unsigned' => false, 'null' => false, 'default' => '0', 'comment' => '', 'precision' => null],

tests/TestCase/Command/RunCommandTest.php

@@ -18,20 +18,10 @@ class RunCommandTest extends TestCase {
 	/**
 	 * @var string[]
 	 */
-	protected $fixtures = [
+	protected array $fixtures = [
 		'plugin.QueueScheduler.SchedulerRows',
 	];
 
-	/**
-	 * setUp method
-	 *
-	 * @return void
-	 */
-	protected function setUp(): void {
-		parent::setUp();
-		$this->useCommandRunner();
-	}
-
 	/**
 	 * @return void
 	 */

tests/TestCase/Controller/Admin/SchedulerRowsControllerTest.php

@@ -17,7 +17,7 @@ class SchedulerRowsControllerTest extends TestCase {
 	/**
 	 * @var string[]
 	 */
-	protected $fixtures = [
+	protected array $fixtures = [
 		'plugin.QueueScheduler.SchedulerRows',
 	];
 

tests/TestCase/Model/Table/SchedulerRowsTableTest.php

@@ -4,7 +4,7 @@
 namespace QueueScheduler\Test\TestCase\Model\Table;
 
 use Cake\Command\CacheClearCommand;
-use Cake\I18n\FrozenTime;
+use Cake\I18n\DateTime;
 use Cake\TestSuite\TestCase;
 use Queue\Queue\Task\ExampleTask;
 use QueueScheduler\Model\Entity\SchedulerRow;
@@ -27,7 +27,7 @@ class SchedulerRowsTableTest extends TestCase {
 	 *
 	 * @var array<string>
 	 */
-	protected $fixtures = [
+	protected array $fixtures = [
 		'plugin.QueueScheduler.SchedulerRows',
 	];
 
@@ -73,13 +73,13 @@ public function testInsert(): void {
 		$this->assertNotEmpty($row->next_run);
 		$this->assertSame($row->next_run->getTestNow()->toDateTimeString(), $row->next_run->toDateTimeString());
 
-		$row->last_run = (new FrozenTime())->addDays(1);
+		$row->last_run = (new DateTime())->addDays(1);
 		$row->frequency = '+50seconds';
 		$row = $this->SchedulerRows->saveOrFail($row);
 
 		$this->assertSame($row->next_run->getTestNow()->addDays(1)->addSeconds(50)->toDateTimeString(), $row->next_run->toDateTimeString());
 
-		$row->last_run = (new FrozenTime())->addDays(2);
+		$row->last_run = (new DateTime())->addDays(2);
 		$row = $this->SchedulerRows->saveOrFail($row);
 
 		$this->assertSame($row->next_run->getTestNow()->addDays(2)->addSeconds(50)->toDateTimeString(), $row->next_run->toDateTimeString());

tests/TestCase/Utility/CommandFinderTest.php

@@ -4,7 +4,7 @@
 
 use Cake\Core\Plugin as CakePlugin;
 use Cake\TestSuite\TestCase;
-use Queue\Plugin;
+use Queue\QueuePlugin;
 use QueueScheduler\Utility\CommandFinder;
 
 class CommandFinderTest extends TestCase {
@@ -13,7 +13,7 @@ class CommandFinderTest extends TestCase {
 	 * @return void
 	 */
 	public function testAll() {
-		CakePlugin::getCollection()->add(new Plugin());
+		CakePlugin::getCollection()->add(new QueuePlugin());
 
 		$result = (new CommandFinder())->all();
 		$expected = [

tests/bootstrap.php

@@ -41,6 +41,7 @@
 
 require PLUGIN_ROOT . '/vendor/autoload.php';
 require CORE_PATH . 'config/bootstrap.php';
+require CAKE . 'functions.php';
 
 Configure::write('App', [
 	'namespace' => 'TestApp',
@@ -99,8 +100,8 @@ class_alias(AppController::class, 'App\Controller\AppController');
 ]);
 
 Plugin::getCollection()->add(new QueueScheduler\QueueSchedulerPlugin());
-Plugin::getCollection()->add(new Queue\Plugin());
-Plugin::getCollection()->add(new Tools\Plugin());
+Plugin::getCollection()->add(new Queue\QueuePlugin());
+Plugin::getCollection()->add(new Tools\ToolsPlugin());
 
 if (!getenv('DB_URL')) {
 	putenv('DB_URL=sqlite:///:memory:');

tests/schema.php

@@ -29,10 +29,19 @@ function addTablesFromSchemaFile(string $file, string $pluginName, array $tables
 
 	$name = $matches[1];
 	$class = $pluginName . '\\Test\\Fixture\\' . $name . 'Fixture';
+	try {
+		$fieldsObject = (new ReflectionClass($class))->getProperty('fields');
+		$tableObject = (new ReflectionClass($class))->getProperty('table');
+		$tableName = $tableObject->getDefaultValue();
+	} catch (ReflectionException $e) {
+		return $tables;
+	}
+
+	if (!$tableName) {
+		$tableName = Inflector::underscore($name);
+	}
 
-	$object = new $class();
-	$array = $object->fields;
-	$tableName = $object->table ?: Inflector::underscore($name);
+	$array = $fieldsObject->getDefaultValue();
 	$constraints = $array['_constraints'] ?? [];
 	$indexes = $array['_indexes'] ?? [];
 	unset($array['_constraints'], $array['_indexes'], $array['_options']);