Skip to content

Commit

Permalink
pint
Browse files Browse the repository at this point in the history
  • Loading branch information
tiagof committed Aug 18, 2023
1 parent c10a07a commit 8d31a8c
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 17 deletions.
6 changes: 3 additions & 3 deletions database/factories/ActionFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@ class ActionFactory extends Factory
public function definition(): array
{
return [
'rule_id' => fn() => RuleFactory::new()->create()->id,
'rule_id' => fn () => RuleFactory::new()->create()->id,
'active' => true,
];
}

public function inactive(): ActionFactory
{
return $this->state(fn(array $attributes) => [
return $this->state(fn (array $attributes) => [
'active' => false,
]);
}

public function using(IsAction $action): ActionFactory
{
return $this->state(fn(array $attributes) => [
return $this->state(fn (array $attributes) => [
'payload' => $action,
]);
}
Expand Down
6 changes: 3 additions & 3 deletions database/factories/ConditionFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@ class ConditionFactory extends Factory
public function definition(): array
{
return [
'rule_id' => fn() => RuleFactory::new()->create()->id,
'rule_id' => fn () => RuleFactory::new()->create()->id,
'active' => true,
];
}

public function inactive(): ConditionFactory
{
return $this->state(fn(array $attributes) => [
return $this->state(fn (array $attributes) => [
'active' => false,
]);
}

public function using(IsCondition $condition): ConditionFactory
{
return $this->state(fn(array $attributes) => [
return $this->state(fn (array $attributes) => [
'payload' => $condition,
]);
}
Expand Down
1 change: 0 additions & 1 deletion src/Casts/Serialize.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
use Illuminate\Database\Eloquent\Model;
use Squarebit\Volition\Contracts\IsAction;
use Squarebit\Volition\Contracts\IsCondition;
use Squarebit\Volition\Models\Element;

/**
* @implements CastsAttributes<IsCondition|IsAction, IsCondition|IsAction>
Expand Down
2 changes: 1 addition & 1 deletion src/Models/Action.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Squarebit\Volition\Contracts\IsAction;
use Squarebit\Volition\Contracts\Volitional;
use Squarebit\Volition\Traits\BelongToRule;

/**
Expand All @@ -17,6 +16,7 @@
class Action extends Element
{
use HasFactory;

/** @use BelongToRule<Action> */
use BelongToRule;

Expand Down
1 change: 1 addition & 0 deletions src/Models/Condition.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
class Condition extends Element
{
use HasFactory;

/** @use BelongToRule<Condition> */
use BelongToRule;

Expand Down
1 change: 0 additions & 1 deletion src/Models/Element.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use classObj;
use Illuminate\Database\Eloquent\Model;
use Squarebit\Volition\Casts\Serialize;
use Squarebit\Volition\Traits\BelongToRule;

/**
* @property int $id
Expand Down
8 changes: 4 additions & 4 deletions src/Models/Rule.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public function actions(): HasMany
}

/**
* @param Builder<static> $query
* @param Builder<static> $query
* @return Builder<static>
*/
public function scopeWithName(Builder $query, string $name): Builder
Expand All @@ -59,8 +59,8 @@ public function scopeWithName(Builder $query, string $name): Builder
}

/**
* @param Builder<static> $query
* @param class-string $className
* @param Builder<static> $query
* @param class-string $className
* @return Builder<static>
*/
public function scopeForClass(Builder $query, string $className): Builder
Expand All @@ -71,7 +71,7 @@ public function scopeForClass(Builder $query, string $className): Builder
public function passes(Volitional $object): bool
{
return $this->conditions
->reduce(fn(bool $carry, Condition $condition): bool => $carry && $condition->passes($object), true);
->reduce(fn (bool $carry, Condition $condition): bool => $carry && $condition->passes($object), true);
}

public function addCondition(IsCondition $condition): static
Expand Down
1 change: 0 additions & 1 deletion src/Traits/BelongToRule.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace Squarebit\Volition\Traits;

use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Squarebit\Volition\Models\Element;
use Squarebit\Volition\Models\Rule;

/**
Expand Down
6 changes: 3 additions & 3 deletions tests/Feature/RuleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@

expect($testObj->action(SuffixAction::class))
->toBeNull()
->and(fn() => $testObj->action(SuffixAction::class, throw: true))
->and(fn () => $testObj->action(SuffixAction::class, throw: true))
->toThrow(ActionMissingException::class);
});

Expand All @@ -105,6 +105,6 @@

expect($testObj->executeAction(SuffixAction::class))->toBe('prop_valueSquarebit')
->and($testObj2->executeAction(SuffixAction::class))->toBeNull()
->and(fn() => $testObj2->executeAction(SuffixAction::class, throw: true))->toThrow(ActionMissingException::class)
->and(fn() => $testObj3->executeAction(PrefixAction::class))->toThrow(ActionExecutionException::class);
->and(fn () => $testObj2->executeAction(SuffixAction::class, throw: true))->toThrow(ActionMissingException::class)
->and(fn () => $testObj3->executeAction(PrefixAction::class))->toThrow(ActionExecutionException::class);
});

0 comments on commit 8d31a8c

Please sign in to comment.