Merge pull request #21 from kenjis/add-strict_types

michalsn · web-flow · commit 69ed7f598584 · 2023-12-18T17:07:06.000+01:00
refactor: add strict_types
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use CodeIgniter\CodingStandard\CodeIgniter4;
 use Nexus\CsConfig\Factory;
 use PhpCsFixer\Finder;
@@ -13,7 +15,10 @@
     ->exclude('build')
     ->append([__FILE__]);
 
-$overrides = [];
+$overrides = [
+    'declare_strict_types' => true,
+    'void_return'          => true,
+];
 
 $options = [
     'finder'    => $finder,
diff --git a/src/BaseJob.php b/src/BaseJob.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue;
 
 abstract class BaseJob
diff --git a/src/Commands/Generators/JobGenerator.php b/src/Commands/Generators/JobGenerator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue\Commands\Generators;
 
 use CodeIgniter\CLI\BaseCommand;
diff --git a/src/Commands/QueueClear.php b/src/Commands/QueueClear.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue\Commands;
 
 use CodeIgniter\CLI\BaseCommand;
diff --git a/src/Commands/QueueFailed.php b/src/Commands/QueueFailed.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue\Commands;
 
 use CodeIgniter\CLI\BaseCommand;
diff --git a/src/Commands/QueueFlush.php b/src/Commands/QueueFlush.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue\Commands;
 
 use CodeIgniter\CLI\BaseCommand;
diff --git a/src/Commands/QueueForget.php b/src/Commands/QueueForget.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue\Commands;
 
 use CodeIgniter\CLI\BaseCommand;
diff --git a/src/Commands/QueuePublish.php b/src/Commands/QueuePublish.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue\Commands;
 
 use CodeIgniter\CLI\BaseCommand;
@@ -13,10 +15,7 @@ class QueuePublish extends BaseCommand
     protected $name        = 'queue:publish';
     protected $description = 'Publish QueueJob config file into the current application.';
 
-    /**
-     * @return void
-     */
-    public function run(array $params)
+    public function run(array $params): void
     {
         $source = service('autoloader')->getNamespace('CodeIgniter\\Queue')[0];
 
diff --git a/src/Commands/QueueRetry.php b/src/Commands/QueueRetry.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue\Commands;
 
 use CodeIgniter\CLI\BaseCommand;
diff --git a/src/Commands/QueueStop.php b/src/Commands/QueueStop.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue\Commands;
 
 use CodeIgniter\CLI\BaseCommand;
diff --git a/src/Commands/QueueWork.php b/src/Commands/QueueWork.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue\Commands;
 
 use CodeIgniter\CLI\BaseCommand;
diff --git a/src/Config/Queue.php b/src/Config/Queue.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue\Config;
 
 use CodeIgniter\Config\BaseConfig;
diff --git a/src/Config/Registrar.php b/src/Config/Registrar.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue\Config;
 
 class Registrar
diff --git a/src/Config/Services.php b/src/Config/Services.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue\Config;
 
 use CodeIgniter\Config\BaseService;
diff --git a/src/Database/Migrations/2023-10-12-112040_AddQueueTables.php b/src/Database/Migrations/2023-10-12-112040_AddQueueTables.php
@@ -1,12 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue\Database\Migrations;
 
 use CodeIgniter\Database\Migration;
 
 class AddQueueTables extends Migration
 {
-    public function up()
+    public function up(): void
     {
         $this->forge->addField([
             'id'           => ['type' => 'bigint', 'constraint' => 11, 'unsigned' => true, 'auto_increment' => true],
@@ -34,7 +36,7 @@ public function up()
         $this->forge->createTable('queue_jobs_failed', true);
     }
 
-    public function down()
+    public function down(): void
     {
         $this->forge->dropTable('queue_jobs', true);
         $this->forge->dropTable('queue_jobs_failed', true);
diff --git a/src/Database/Migrations/2023-11-05-064053_AddPriorityField.php b/src/Database/Migrations/2023-11-05-064053_AddPriorityField.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue\Database\Migrations;
 
 use CodeIgniter\Database\BaseConnection;
@@ -10,7 +12,7 @@
  */
 class AddPriorityField extends Migration
 {
-    public function up()
+    public function up(): void
     {
         $fields = [
             'priority' => [
@@ -40,7 +42,7 @@ public function up()
         $this->forge->processIndexes('queue_jobs');
     }
 
-    public function down()
+    public function down(): void
     {
         // Ugly fix for dropping the correct index
         $keys = $this->db->getIndexData('queue_jobs');
diff --git a/src/Entities/QueueJob.php b/src/Entities/QueueJob.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue\Entities;
 
 use CodeIgniter\Entity\Entity;
diff --git a/src/Entities/QueueJobFailed.php b/src/Entities/QueueJobFailed.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue\Entities;
 
 use CodeIgniter\Entity\Entity;
diff --git a/src/Enums/Status.php b/src/Enums/Status.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue\Enums;
 
 enum Status: int
diff --git a/src/Exceptions/QueueException.php b/src/Exceptions/QueueException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue\Exceptions;
 
 use RuntimeException;
diff --git a/src/Handlers/BaseHandler.php b/src/Handlers/BaseHandler.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue\Handlers;
 
 use CodeIgniter\I18n\Time;
diff --git a/src/Handlers/DatabaseHandler.php b/src/Handlers/DatabaseHandler.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue\Handlers;
 
 use CodeIgniter\I18n\Time;
diff --git a/src/Handlers/PredisHandler.php b/src/Handlers/PredisHandler.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue\Handlers;
 
 use CodeIgniter\Exceptions\CriticalError;
diff --git a/src/Handlers/RedisHandler.php b/src/Handlers/RedisHandler.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue\Handlers;
 
 use CodeIgniter\Exceptions\CriticalError;
diff --git a/src/Interfaces/JobInterface.php b/src/Interfaces/JobInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue\Interfaces;
 
 interface JobInterface
diff --git a/src/Interfaces/QueueInterface.php b/src/Interfaces/QueueInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue\Interfaces;
 
 use CodeIgniter\Queue\Entities\QueueJob;
diff --git a/src/Language/en/Queue.php b/src/Language/en/Queue.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 return [
     'generator' => [
         'className' => [
diff --git a/src/Models/QueueJobFailedModel.php b/src/Models/QueueJobFailedModel.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue\Models;
 
 use CodeIgniter\Model;
diff --git a/src/Payload.php b/src/Payload.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue;
 
 use JsonSerializable;
diff --git a/src/Queue.php b/src/Queue.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CodeIgniter\Queue;
 
 use CodeIgniter\Queue\Config\Queue as QueueConfig;
diff --git a/tests/DatabaseHandlerTest.php b/tests/DatabaseHandlerTest.php
diff --git a/tests/PredisHandlerTest.php b/tests/PredisHandlerTest.php
diff --git a/tests/QueueTest.php b/tests/QueueTest.php
diff --git a/tests/RedisHandlerTest.php b/tests/RedisHandlerTest.php
diff --git a/tests/_support/Config/Queue.php b/tests/_support/Config/Queue.php
diff --git a/tests/_support/Database/Seeds/TestDatabaseQueueSeeder.php b/tests/_support/Database/Seeds/TestDatabaseQueueSeeder.php
diff --git a/tests/_support/Database/Seeds/TestRedisQueueSeeder.php b/tests/_support/Database/Seeds/TestRedisQueueSeeder.php
diff --git a/tests/_support/Jobs/Failure.php b/tests/_support/Jobs/Failure.php
diff --git a/tests/_support/Jobs/Success.php b/tests/_support/Jobs/Success.php
diff --git a/tests/_support/TestCase.php b/tests/_support/TestCase.php
