direct use of instance instead of class name of model

mll-lab · Nov 26, 2024 · 795288a · 795288a
1 parent 1bb3600
commit 795288a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/app/ModelStates/ModelStates/ModelState.php b/app/ModelStates/ModelStates/ModelState.php
@@ -22,9 +22,8 @@ public static function defaultState(): ModelState
         return new StateA();
     }
 
-    /** @return class-string<Model> */
-    public static function stateManagerClass(): string
+    public static function stateManagerClass(): Model
     {
-        return StateManager::class;
+        return new StateManager();
     }
 }
diff --git a/app/ModelStates/OtherModelStates/OtherModelState.php b/app/ModelStates/OtherModelStates/OtherModelState.php
@@ -23,9 +23,8 @@ public static function defaultState(): OtherModelState
         return new StateX();
     }
 
-    /** @return class-string<Model> */
-    public static function stateManagerClass(): string
+    public static function stateManagerClass(): Model
     {
-        return StateManager::class;
+        return new StateManager();
     }
 }
diff --git a/src/ModelStates/HasStateManager.php b/src/ModelStates/HasStateManager.php
@@ -17,8 +17,7 @@ public static function bootHasStateManager(): void
                 return;
             }
 
-            $stateManagerClass = $self->stateClass()::stateManagerClass();
-            $stateManager = new $stateManagerClass();
+            $stateManager = $self->stateClass()::stateManagerClass();
             assert(in_array(IsStateManager::class, class_uses($stateManager)));
             $stateManager->setAttribute($stateManager::stateColumnName(), $self->stateClass()::defaultState()::name());
 
@@ -29,9 +28,9 @@ public static function bootHasStateManager(): void
 
     public function getStateAttribute(): State
     {
-        $stateManagerClass = $this->stateClass()::stateManagerClass();
-        $stateManager = new $stateManagerClass();
+        $stateManager = self::stateClass()::stateManagerClass();
         assert(in_array(IsStateManager::class, class_uses($stateManager)));
+
         $stateName = $this->stateManager->getAttribute($stateManager::stateColumnName());
         assert(is_string($stateName));
 

diff --git a/src/ModelStates/State.php b/src/ModelStates/State.php
@@ -11,8 +11,7 @@ abstract public static function config(): StateConfig;
 
     abstract public static function defaultState(): self;
 
-    /** @return class-string<Model> */
-    abstract public static function stateManagerClass(): string;
+    abstract public static function stateManagerClass(): Model;
 
     public static function name(): string
     {