Merge pull request #19 from arzarian/issue-laravel-12

feat: added laravel 12, fixed warning that nullable parameter is deprecated

Author: yekhlakov

composer.json

@@ -20,14 +20,14 @@
         "ext-json": "*",
         "ext-pcntl": "*",
         "bensampo/laravel-enum": "^3.0|^4.0|^5.0|^6.0",
-        "laravel/framework": "^9.0|^10.0|^11.0",
+        "laravel/framework": "^9.0|^10.0|^11.0|^12.0",
         "nesbot/carbon": "^2.0|^3.0"
     },
     "require-dev": {
         "laravel/pint": "^1.16",
         "mockery/mockery": "^1.6",
-        "orchestra/testbench": "^6.13|^7.1|^8.0",
-        "phpunit/phpunit": "^9.5",
+        "orchestra/testbench": "^6.13|^7.1|^8.0|^9.0|^10.0",
+        "phpunit/phpunit": "^9.5|^10.5|^11.5",
         "roave/security-advisories": "dev-latest",
         "vimeo/psalm": "^6.0"
     },

src/Core/BaseJob.php

@@ -30,7 +30,7 @@ class BaseJob implements StatesContract, ConditionTransitionsContract
     private ?\Throwable $exception = null;
     private PromiseJob $model;
 
-    public function __construct(int $promise_id, MayPromised $initial_job, MayPromised $result_job = null)
+    public function __construct(int $promise_id, MayPromised $initial_job, ?MayPromised $result_job = null)
     {
         $this->promise_id = $promise_id;
         $this->initial_job = $initial_job;

tests/Conditions/AllJobsInStatesTest.php

@@ -39,7 +39,7 @@ public function setUp(): void
             ->create(['id' => 2]);
     }
 
-    public function conditionProvider(): array
+    public static function conditionProvider(): array
     {
         return [
             'OneOf False' => [[StateEnum::TIMEOUT(), StateEnum::SUCCESS()], 1, false],

tests/Conditions/AndConditionsTest.php

@@ -13,7 +13,7 @@
  */
 class AndConditionsTest extends TestCase
 {
-    public function conditionProvider(): array
+    public static function conditionProvider(): array
     {
         $trueMock = \Mockery::mock(ConditionContract::class);
         $trueMock->shouldReceive('condition')

tests/Conditions/EmptyJobsTest.php

@@ -32,7 +32,7 @@ public function setUp(): void
             ->create(['id' => 2]);
     }
 
-    public function conditionProvider(): array
+    public static function conditionProvider(): array
     {
         return [
             'False' => [1, false],

tests/Conditions/JobInStateTest.php

@@ -40,7 +40,7 @@ public function setUp(): void
         $this->baseJob = $job->getBaseJob();
     }
 
-    public function conditionProvider(): array
+    public static function conditionProvider(): array
     {
         return [
             'OneOf True'  => [[StateEnum::SUCCESS(), StateEnum::FAILED()], true],

tests/Conditions/OneJobInStateTest.php

@@ -36,7 +36,7 @@ public function setUp(): void
             ->create(['id' => 2]);
     }
 
-    public function conditionProvider(): array
+    public static function conditionProvider(): array
     {
         return [
             'OneOf True'  => [[StateEnum::TIMEOUT(), StateEnum::FAILED()], 1, true],

tests/Conditions/OrConditionsTest.php

@@ -13,7 +13,7 @@
  */
 class OrConditionsTest extends TestCase
 {
-    public function conditionProvider(): array
+    public static function conditionProvider(): array
     {
         $trueMock = \Mockery::mock(ConditionContract::class);
         $trueMock->shouldReceive('condition')

tests/Conditions/PromiseInStateTest.php

@@ -32,7 +32,7 @@ public function setUp(): void
         $this->basePromise = $promise->getBasePromise();
     }
 
-    public function conditionProvider(): array
+    public static function conditionProvider(): array
     {
         return [
             'OneOf True'  => [[StateEnum::TIMEOUT(), StateEnum::FAILED()], true],

tests/Conditions/TimeoutTest.php

@@ -14,19 +14,12 @@
  */
 class TimeoutTest extends TestCase
 {
-    private Carbon $nowTime;
+    private const NOW_TIME = '2021-02-20T00:00:00+0000';
 
-    public function setUp(): void
+    public static function conditionProvider(): array
     {
-        parent::setUp();
-
-        $this->nowTime = Carbon::parse('2021-02-20T00:00:00');
-    }
-
-    public function conditionProvider(): array
-    {
-        $this->nowTime = Carbon::parse('2021-02-20T00:00:00');
-        Carbon::setTestNow($this->nowTime);
+        $nowTime = Carbon::parse(self::NOW_TIME);
+        Carbon::setTestNow($nowTime);
 
         return [
             'Carbon true'        => [
@@ -83,13 +76,14 @@ public function conditionProvider(): array
      */
     public function testCondition($timeout, Carbon $expiredAt, bool $expected): void
     {
-        Carbon::setTestNow($this->nowTime);
+        $nowTime = Carbon::parse(self::NOW_TIME);
+        Carbon::setTestNow($nowTime);
         $basePromise = new BasePromise(new TestPromise());
         $condition = new Timeout($timeout);
         $expiredAtResult = $condition->getExpiredAt();
         self::assertEquals($expiredAt, $expiredAtResult);
 
-        Carbon::setTestNow($this->nowTime->addMinutes(2));
+        Carbon::setTestNow($nowTime->addMinutes(2));
         $result = $condition->condition($basePromise);
 
         self::assertEquals($expected, $result);