removed factory, made container binding work

Author: Sairahcaz

README.md

@@ -67,24 +67,24 @@ If you do not like this, check the section below and create your own dynamic mod
 ``` php
 use LaracraftTech\LaravelDynamicModel\DynamicModel;
 
-$foo = App::make(DynamicModel::class, ['table_name' => 'foo']);
+$foo = App::make(DynamicModel::class, ['foo']);
 
 $foo->create([
     'col1' => 'asdf',
     'col2' => 123
 ]);
 
-$faz = App::make(DynamicModel::class, ['table_name' => 'faz']);
+$faz = App::make(DynamicModel::class, ['faz']);
 $faz->create([...]);
 
-$bar = App::make(DynamicModel::class, ['table_name' => 'bar']);
+$bar = App::make(DynamicModel::class, ['bar']);
 $bar->create([...]);
 
-$baz = App::make(DynamicModel::class, ['table_name' => 'baz']);
+$baz = App::make(DynamicModel::class, ['baz']);
 $baz->create([...]);
 
 // use another db connection (this one must be defined in your config/database.php file)
-$fooOtherDB = App::make(DynamicModel::class, ['table_name' => 'baz', 'db_connection' => 'your-db-connection-name-here']);
+$fooOtherDB = App::make(DynamicModel::class, ['baz', 'your-optional-db-connection-name-here']);
 $fooOtherDB->create([...]);
 
 dd($foo->first());
@@ -113,15 +113,13 @@ you can just create your own Eloquent model and **extend** it by the **DynamicMo
 or if the model is already extended by another model, you can just use the **DynamicModelBinding** trait.
 
 If you use the trait, make sure your model implements the **DynamicModelInterface**.
-Also make sure to resolve these models through the **DynamicModelFactory** and
-call the `bindDynamically` function in the `__constructor`!
+Also make sure to always resolve these models through the container!
 
 ``` php
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use LaracraftTech\LaravelDynamicModel\DynamicModel;
-use LaracraftTech\LaravelDynamicModel\DynamicModelFactory;
 use LaracraftTech\LaravelDynamicModel\DynamicModelBinding;
 use LaracraftTech\LaravelDynamicModel\DynamicModelInterface;
 
@@ -141,22 +139,13 @@ class MyDynamicModel extends SomeBaseModel implements DynamicModelInterface
 
     protected $guarded = [];
 
-    // !!important!! call the parent constructor and bindDynamically function in the constructor!
-    public function __construct(array $attributes = [])
-    {
-        parent::__construct($attributes);
-
-        $this->bindDynamically();
-    }
-
     public function doSomething()
     {
         // do something
     }
 }
 
-$foo = app(DynamicModelFactory::class)
-        ->create(MyDynamicModel::class, 'foo', 'optional-other-db-connection-name')
+$foo = app(MyDynamicModel::class, 'foo');
 
 $foo->create([
     'col1' => 'asdf',

src/DynamicModel.php

@@ -14,11 +14,4 @@ class DynamicModel extends Model implements DynamicModelInterface
      * and implementing the DynamicModelInterface!
      */
     protected $guarded = [];
-
-    public function __construct(array $attributes = [])
-    {
-        parent::__construct($attributes);
-
-        $this->bindDynamically();
-    }
 }

src/DynamicModelBinding.php

@@ -6,29 +6,15 @@
 
 trait DynamicModelBinding
 {
-    private static string $dynamicTableName;
-
-    private static ?string $dynamicDBConnection = null;
-
-    public static function setDynamicTableName(string $tableName): void
-    {
-        self::$dynamicTableName = $tableName;
-    }
-
-    public static function setDynamicDBConnection(string $dbConnection): void
-    {
-        self::$dynamicDBConnection = $dbConnection;
-    }
-
-    public function bindDynamically(): void
+    public function bindDynamically(string $tableName, string $dbConnection = null): void
     {
-        // change connection, if desired
-        if (self::$dynamicDBConnection) {
-            $this->setConnection(self::$dynamicDBConnection);
+        // first change connection, if desired
+        if ($dbConnection) {
+            $this->setConnection($dbConnection);
         }
 
         // set the table for the dynamic model
-        $this->setTable(self::$dynamicTableName);
+        $this->setTable($tableName);
 
         if (! Schema::hasTable($this->table)) {
             throw DynamicModelException::tableDoesNotExist($this->table);

src/DynamicModelFactory.php

@@ -4,12 +4,8 @@
 
 interface DynamicModelInterface
 {
-    public static function setDynamicTableName(string $tableName): void;
-
-    public static function setDynamicDBConnection(string $dbConnection): void;
-
     /**
      * Make sure the DynamicModel has a bindDynamic function.
      */
-    public function bindDynamically(): void;
+    public function bindDynamically(string $tableName, string $dbConnection = null): void;
 }

src/DynamicModelInterface.php

@@ -8,6 +8,8 @@
 
 class LaravelDynamicModelServiceProvider extends PackageServiceProvider
 {
+    protected array $boundClassesWithParams = [];
+
     public function configurePackage(Package $package): void
     {
         /*
@@ -21,21 +23,30 @@ public function configurePackage(Package $package): void
     /**
      * @throws InvalidPackage
      */
-    public function register()
+    public function packageRegistered(): void
     {
-        parent::register();
+        $this->app->beforeResolving(DynamicModelInterface::class, function ($class, $parameters, $app) {
+            // if empty param do nothing before resolving,
+            // just try to resolve already bound class...
+            if (empty($parameters)) {
+                return;
+            }
 
-        $this->app->bind(DynamicModel::class, function ($app, $parameters = []) {
-            if (! isset($parameters['table_name'])) {
-                throw new \Exception('please provide table_name parameter');
+            $paramHash = hash('sha256', json_encode($parameters));
+
+            // if the class is already bound with the same parameters
+            // just try to resolve already bound class...
+            if ($app->has($class) && $this->boundClassesWithParams[$class] === $paramHash) {
+                return;
             }
 
-            return app(DynamicModelFactory::class)
-                ->create(
-                    DynamicModel::class,
-                    $parameters['table_name'],
-                    $parameters['db_connection'] ?? null
-                );
+            $app->bind($class, function ($container) use ($class, $parameters, $paramHash) {
+                $instance = new $class;
+                $instance->bindDynamically(...$parameters);
+                $this->boundClassesWithParams[$class] = $paramHash;
+
+                return $instance;
+            });
         });
     }
 }

src/LaravelDynamicModelServiceProvider.php

@@ -3,7 +3,6 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 use LaracraftTech\LaravelDynamicModel\DynamicModel;
-use LaracraftTech\LaravelDynamicModel\DynamicModelFactory;
 use LaracraftTech\LaravelDynamicModel\Tests\MyExtendedDynamicModel;
 use LaracraftTech\LaravelDynamicModel\Tests\MyTraitedDynamicModel;
 
@@ -25,7 +24,7 @@
 
 it('can use different tables', function () {
     // foo
-    $foo = App::make(DynamicModel::class, ['table_name' => 'foo']);
+    $foo = App::make(DynamicModel::class, ['foo']);
 
     $foo->create([
         'col1' => 'asdf',
@@ -37,7 +36,7 @@
         ->col2->toBe(123);
 
     // bar
-    $bar = App::make(DynamicModel::class, ['table_name' => 'bar']);
+    $bar = App::make(DynamicModel::class, ['bar']);
 
     $bar->create([
         'col1' => 'fdsa',
@@ -49,8 +48,39 @@
         ->col2->toBe(321);
 });
 
+it('can reuse already bound variables', function () {
+    // foo
+    $foo = App::make(DynamicModel::class, ['foo']);
+
+    $foo->create([
+        'col1' => 'asdf',
+        'col2' => 123,
+    ]);
+
+    expect($foo->find(1))
+        ->col1->toBe('asdf')
+        ->col2->toBe(123);
+
+    // bar
+    $bar = App::make(DynamicModel::class, ['bar']);
+
+    $bar->create([
+        'col1' => 'fdsa',
+        'col2' => 321,
+    ]);
+
+    expect($bar->find(1))
+        ->col1->toBe('fdsa')
+        ->col2->toBe(321);
+
+    //retry foo
+    expect($foo->find(1))
+        ->col1->toBe('asdf')
+        ->col2->toBe(123);
+});
+
 it('can use extended dynamic model', function () {
-    $myDynamicModel = App::make(DynamicModelFactory::class)->create(MyExtendedDynamicModel::class, 'foo');
+    $myDynamicModel = App::make(MyExtendedDynamicModel::class, ['foo']);
 
     $myDynamicModel->create([
         'col1' => 'asdf',
@@ -64,7 +94,7 @@
 });
 
 it('can use traited dynamic model', function () {
-    $myDynamicModel = App::make(DynamicModelFactory::class)->create(MyTraitedDynamicModel::class, 'foo');
+    $myDynamicModel = App::make(MyTraitedDynamicModel::class, ['foo']);
 
     $myDynamicModel->create([
         'col1' => 'asdf',

tests/DynamicModelTest.php

@@ -10,11 +10,4 @@ class MyTraitedDynamicModel extends MyBaseModel implements DynamicModelInterface
     use DynamicModelBinding;
 
     protected $guarded = [];
-
-    public function __construct(array $attributes = [])
-    {
-        parent::__construct($attributes);
-
-        $this->bindDynamically();
-    }
 }