fixes

amethyst-php · Apr 5, 2024 · 6c7fa02 · 6c7fa02
1 parent 2ff38a5
commit 6c7fa02
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/src/Providers/RelationSchemaServiceProvider.php b/src/Providers/RelationSchemaServiceProvider.php
@@ -39,6 +39,8 @@ public function boot()
     {
         parent::boot();
 
+        app('eloquent.mapper')->boot();
+
         RelationSchema::observe(RelationSchemaObserver::class);
 
         app('amethyst.relation-schema')->boot();

diff --git a/src/Relations/BelongsTo.php b/src/Relations/BelongsTo.php
@@ -19,6 +19,7 @@ public function define(RelationSchema $relationSchema)
             $foreignKey = $payload->get('foreignKey', $relationSchema->name."_id");
             $method = $this->getName();
 
+            //print_r("Defining... {$relationSchema->data}{$relationSchema->name}:$method:{$payload->require('target')}\n");
             return $model->$method(
                 $target,
                 $foreignKey

diff --git a/src/Relations/MorphToMany.php b/src/Relations/MorphToMany.php
@@ -47,7 +47,7 @@ public function define(RelationSchema $relationSchema)
 
             if ($payload->get('inversedBy')) {
                 app('eloquent.mapper')->addInversedRelation(
-                    $data,
+                    $this->getInstanceModelByName($relationSchema->data),
                     $target,
                     $relationSchema->name,
                     $payload->get('inversedBy')