wip

lunarphp · Dec 21, 2023 · dc462ce · dc462ce
1 parent 6651c2c
commit dc462ce
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/packages/core/src/Base/ModelManifest.php b/packages/core/src/Base/ModelManifest.php
@@ -50,9 +50,9 @@ public function replace(string $interfaceClass, string $modelClass): void
     /**
      * Gets the registered class for the interface.
      */
-    public function get(string $interfaceClass)
+    public function get(string $interfaceClass): ?string
     {
-        return $this->models[$interfaceClass];
+        return $this->models[$interfaceClass] ?? null;
     }
 
     /**
@@ -67,7 +67,7 @@ private function validateClassIsEloquentModel(string $class): void
         }
     }
 
-    protected function bindModel(string $interfaceClass, string $modelClass)
+    protected function bindModel(string $interfaceClass, string $modelClass): void
     {
         // Bind in container
         app()->bind($interfaceClass, $modelClass);

diff --git a/packages/core/src/Base/Traits/HasModelExtending.php b/packages/core/src/Base/Traits/HasModelExtending.php
@@ -2,7 +2,19 @@
 
 namespace Lunar\Base\Traits;
 
+use Lunar\Facades\ModelManifest;
+
 trait HasModelExtending
 {
-    //
+    /**
+     * Returns the model class registered in the model manifest.
+     */
+    public static function modelClass(): string
+    {
+        $shortName = (new \ReflectionClass(static::class))->getShortName();
+
+        $contractClass = 'Lunar\\Models\\Contracts\\' . $shortName;
+
+        return ModelManifest::get($contractClass) ?? static::class;
+    }
 }