instantiate trigger fix

Author: nekufa

src/Repository.php

@@ -48,27 +48,17 @@ public function create($data): Entity
             }
         }
 
-        $instance = $this->createInstance();
-        foreach ($data as $key => $value) {
-            if ($value instanceof Entity) {
-                $value  = $value->getRepository()->getSpace()->getIndex(0)->getValue($value->toArray()) ?: null;
-            }
-            $instance->$key = $value;
-        }
-
-        foreach ($this->getMapper()->getPlugins() as $plugin) {
-            $plugin->afterInstantiate($instance, $this->space);
-        }
+        $instance = $this->createInstance([], $data);
 
         return $instance;
     }
 
-    public function createInstance(array $tuple = []): Entity
+    public function createInstance(array $tuple = [], array $data = []): Entity
     {
         $class = Entity::class;
-        $data = $this->getSpace()->getMap($tuple);
+        $map = $this->getSpace()->getMap($tuple);
         foreach ($this->getMapper()->getPlugins() as $plugin) {
-            $entityClass = $plugin->getEntityClass($this->space, $data);
+            $entityClass = $plugin->getEntityClass($this->space, $map);
             if (!$entityClass) {
                 continue;
             }
@@ -80,6 +70,17 @@ public function createInstance(array $tuple = []): Entity
 
         $instance = new $class($this, $tuple);
 
+        foreach ($data as $key => $value) {
+            if ($value instanceof Entity) {
+                $value  = $value->getRepository()->getSpace()->getIndex(0)->getValue($value->toArray()) ?: null;
+            }
+            $instance->$key = $value;
+        }
+
+        foreach ($this->getMapper()->getPlugins() as $plugin) {
+            $plugin->afterInstantiate($instance, $this->space);
+        }
+
         return $instance;
     }
 

tests/MapperTest.php

@@ -9,14 +9,31 @@
 use Tarantool\Client\Middleware\LoggingMiddleware;
 use Tarantool\Client\Request\InsertRequest;
 use Tarantool\Client\Schema\Operations;
+use Tarantool\Mapper\Entity;
 use Tarantool\Mapper\Mapper;
+use Tarantool\Mapper\Plugin;
 use Tarantool\Mapper\Plugin\Procedure;
 use Tarantool\Mapper\Plugin\Sequence;
 use Tarantool\Mapper\Procedure\FindOrCreate;
 use Tarantool\Mapper\Schema;
 
 class MapperTest extends TestCase
 {
+    public function testAfterInstantiateTrigger()
+    {
+        $mapper = $this->createMapper();
+        $mapper->getPlugin(new class ($mapper) extends Plugin {
+            public function afterInstantiate(Entity $instance): Entity
+            {
+                $instance->mySecretProperty = 'tester';
+                return $instance;
+            }
+        });
+
+        $this->assertSame($mapper->findOrFail('_vspace')->mySecretProperty, 'tester');
+        $this->assertSame($mapper->getRepository('_vspace')->create([])->mySecretProperty, 'tester');
+    }
+
     public function testEmptyStringPersistence()
     {
         $mapper = $this->createMapper();