Fixed

Author: msarca

src/EntityManager.php

@@ -302,6 +302,9 @@ protected function markAsSaved(DataMapper $data, $id): bool
                 $this->dehidrated = true;
                 $this->isNew = false;
                 $this->modified = [];
+                if(!empty($this->pendingLinks)){
+                    $this->executePendingLinkage();
+                }
                 return true;
             };
         }

src/ORM/DataMapper.php

@@ -64,6 +64,9 @@ class DataMapper
     /** @var bool  */
     protected $deleted = false;
 
+    /** @var array */
+    protected $pendingLinks = [];
+
     /**
      * DataMapper constructor.
      * @param EntityManager $entityManager
@@ -312,6 +315,15 @@ public function link(string $relation, $items)
             throw new RuntimeException("Unsupported relation type");
         }
 
+        if($this->isNew){
+            $this->pendingLinks[] = [
+                'relation' => $rel,
+                'items' => $items,
+                'link' => true,
+            ];
+            return;
+        }
+
         $rel->link($this, $items);
     }
 
@@ -331,6 +343,15 @@ public function unlink(string $relation, $items)
             throw new RuntimeException("Unsupported relation type");
         }
 
+        if($this->isNew){
+            $this->pendingLinks[] = [
+                'relation' => $rel,
+                'items' => $items,
+                'link' => false,
+            ];
+            return;
+        }
+
         $rel->unlink($this, $items);
     }
 
@@ -464,4 +485,19 @@ protected function getRelationResult(Relation $relation, callable $callback = nu
 
         return $closure->call($relation, $this, $callback);
     }
+
+    protected function executePendingLinkage()
+    {
+        foreach ($this->pendingLinks as $item){
+            /** @var HasOneOrManyThrough $rel */
+            $rel = $item['relation'];
+            if($item['link']){
+                $rel->link($this, $item['items']);
+            } else {
+                $rel->unlink($this, $item['items']);
+            }
+        }
+
+        $this->pendingLinks = [];
+    }
 }

src/ORM/Relation/HasOneOrManyThrough.php

@@ -99,7 +99,7 @@ public function link(DataMapper $data, $items)
         };
 
         foreach ($items as $item){
-            $val2 = is_subclass_of($item, $this->entityClass, false) ? $extractor->call($item) : $item;
+            $val2 = is_a($item, $this->entityClass, false) ? $extractor->call($item) : $item;
             try{
 
                 (new Insert($connection))->insert([
@@ -109,6 +109,7 @@ public function link(DataMapper $data, $items)
 
             }catch (\Exception $e){
                 // Ignore
+                die('uuu');
             }
         }
     }
@@ -154,7 +155,7 @@ public function unlink(DataMapper $data, $items)
         };
 
         foreach ($items as $item){
-            $val2[] = is_subclass_of($item, $this->entityClass, false) ? $extractor->call($item) : $item;
+            $val2[] = is_a($item, $this->entityClass, false) ? $extractor->call($item) : $item;
         }
 
         try{