Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yekhlakov merged 1 commit into from
Jul 22, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Core/BaseJob.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/Conditions/AllJobsInStatesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
2 changes: 1 addition & 1 deletion tests/Conditions/AndConditionsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion tests/Conditions/EmptyJobsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function setUp(): void
->create(['id' => 2]);
}

public function conditionProvider(): array
public static function conditionProvider(): array
{
return [
'False' => [1, false],
Expand Down
2 changes: 1 addition & 1 deletion tests/Conditions/JobInStateTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
2 changes: 1 addition & 1 deletion tests/Conditions/OneJobInStateTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
2 changes: 1 addition & 1 deletion tests/Conditions/OrConditionsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion tests/Conditions/PromiseInStateTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
20 changes: 7 additions & 13 deletions tests/Conditions/TimeoutTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' => [
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions tests/Core/Support/ConditionTransitionHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
class ConditionTransitionHandlerTest extends TestCase
{
public function getTransitionForConditionsProvider(): array
public static function getTransitionForConditionsProvider(): array
{
$trueMock = \Mockery::mock(ConditionContract::class);
$trueMock->shouldReceive('condition')
Expand Down Expand Up @@ -59,7 +59,7 @@ public function testGetTransitionForConditions(array $conditions, ?ConditionTran
self::assertEquals($expected, $result);
}

public function getConditionsForStateProvider(): array
public static function getConditionsForStateProvider(): array
{
$trueMock = \Mockery::mock(ConditionContract::class);
$trueMock->shouldReceive('condition')
Expand Down
2 changes: 1 addition & 1 deletion tests/Models/Casts/ConditionsCastTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
class ConditionsCastTest extends TestCase
{
public function getSetProvider(): array
public static function getSetProvider(): array
{
return [
'Full' => [
Expand Down
2 changes: 1 addition & 1 deletion tests/Models/PromiseJobTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class PromiseJobTest extends TestCase
{
use RefreshDatabase;

public function saveProvider(): array
public static function saveProvider(): array
{
$conditions = [
new ConditionTransition(
Expand Down
Loading