Merge branch 'main' of https://github.com/square-bit/laravel-volition

square-bit · Mar 15, 2024 · 585c270 · 585c270
2 parents 258ddff + b26523c
commit 585c270
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/Models/Action.php b/src/Models/Action.php
@@ -12,11 +12,11 @@
  */
 class Action extends Element
 {
-    use HasFactory;
-
     /** @use BelongToRule<Action> */
     use BelongToRule;
 
+    use HasFactory;
+
     protected $table = 'volition_actions';
 
     public function action(IsAction $action): static

diff --git a/src/Models/Condition.php b/src/Models/Condition.php
@@ -9,11 +9,11 @@
 
 class Condition extends Element
 {
-    use HasFactory;
-
     /** @use BelongToRule<Condition> */
     use BelongToRule;
 
+    use HasFactory;
+
     protected $table = 'volition_conditions';
 
     public function condition(IsCondition $condition): static

diff --git a/src/Traits/HasVolition.php b/src/Traits/HasVolition.php
@@ -42,7 +42,7 @@ public function rule(string|Rule $rule): ?Rule
      *
      * @return Collection<\Squarebit\Volition\Contracts\IsAction>
      */
-    public function actions(string|Rule $forRule = null): Collection
+    public function actions(string|Rule|null $forRule = null): Collection
     {
         $actions = $forRule
             ? $this->rule($forRule)?->actions
@@ -60,7 +60,7 @@ public function actions(string|Rule $forRule = null): Collection
      * @param  class-string<TActionClass>  $ofClass
      * @return TActionClass|null
      */
-    public function action(string $ofClass, string $forRule = null, bool $throw = false): ?IsAction
+    public function action(string $ofClass, ?string $forRule = null, bool $throw = false): ?IsAction
     {
         $action = $this->actions($forRule)->firstWhere(fn (IsAction $action) => $action instanceof $ofClass);
 
@@ -76,7 +76,7 @@ public function action(string $ofClass, string $forRule = null, bool $throw = fa
     /**
      * @param  class-string<\Squarebit\Volition\Contracts\IsAction>  $actionClass
      */
-    public function executeAction(string $actionClass, string $forRule = null, bool $throw = false): mixed
+    public function executeAction(string $actionClass, ?string $forRule = null, bool $throw = false): mixed
     {
         return $this->action($actionClass, $forRule, $throw)?->execute($this);
     }