register state machine to service container

src/Contracts/StateMachine.php

@@ -6,12 +6,9 @@
 
 interface StateMachine
 {
-    /**
-     * Return current state
-     *
-     * @return null|DefineStates&UnitEnum
-     */
-    public function currentState();
+    public function __construct(HasStateMachine $hasStateMachine, string $field);
+
+    public function currentState(): null|(DefineStates&UnitEnum);
 
     public function canBe(DefineStates&UnitEnum $status): bool;
 

src/EnumStateMachine.php

@@ -18,10 +18,7 @@ public function __construct(
     ) {
     }
 
-    /**
-     * @return null|DefineStates&UnitEnum
-     */
-    public function currentState()
+    public function currentState(): null|(DefineStates&UnitEnum)
     {
         return $this->hasStateMachine->{$this->field};
     }

src/Providers/EnumataServiceProvider.php

@@ -4,9 +4,16 @@
 
 use Illuminate\Support\ServiceProvider;
 use Norotaro\Enumata\Console\Commands\ModelStateMakeCommand;
+use Norotaro\Enumata\Contracts\StateMachine;
+use Norotaro\Enumata\EnumStateMachine;
 
 final class EnumataServiceProvider extends ServiceProvider
 {
+    public function register()
+    {
+        $this->app->bind(StateMachine::class, EnumStateMachine::class);
+    }
+
     public function boot(): void
     {
         if ($this->app->runningInConsole()) {

src/Traits/EloquentHasStateMachines.php

@@ -8,8 +8,8 @@
 use Javoscript\MacroableModels\Facades\MacroableModels;
 use Norotaro\Enumata\Contracts\DefineStates;
 use Norotaro\Enumata\Contracts\Nullable;
+use Norotaro\Enumata\Contracts\StateMachine;
 use Norotaro\Enumata\Exceptions\TransitionNotAllowedException;
-use Norotaro\Enumata\EnumStateMachine;
 use ReflectionEnum;
 
 trait EloquentHasStateMachines
@@ -85,7 +85,7 @@ protected static function guardStateMachine(Model $model): void
     {
         $model->initEnumata(setDefaultValues: false);
 
-        /** @var EnumStateMachine $stateMachine */
+        /** @var StateMachine $stateMachine */
         foreach ($model->getStateMachines() as $stateMachine) {
             $field = $stateMachine->getField();
 
@@ -100,15 +100,7 @@ protected static function guardStateMachine(Model $model): void
             $from = $model->getOriginal($field);
             $to = $model->{$field};
 
-            $transitions = $from?->transitions();
-
-            if (!$transitions && in_array(Nullable::class, class_implements($to))) {
-                $nullableState = $to;
-
-                $transitions = $nullableState->initialTransitions();
-            }
-
-            if (!in_array($to, $transitions ?? [])) {
+            if (!$stateMachine->canBe($to)) {
                 throw new TransitionNotAllowedException($from, $to, $stateMachine, self::class);
             }
         }
@@ -156,7 +148,10 @@ protected static function itDefineStates($castTo): bool
     protected function initStateMachineFor(string $field): void
     {
         if (!array_key_exists($field, $this->stateMachines)) {
-            $this->stateMachines[$field] = new EnumStateMachine($this, $field);
+            $this->stateMachines[$field] = app()->makeWith(StateMachine::class, [
+                'hasStateMachine' => $this,
+                'field' => $field,
+            ]);
         }
     }