ability to use contructors in entities

cycle · May 3, 2019 · feacab4 · feacab4
1 parent 41ed269
commit feacab4
Show file tree

Hide file tree

Showing 229 changed files with 1,094 additions and 867 deletions.
diff --git a/composer.json b/composer.json
@@ -10,6 +10,7 @@
     "spiral/database": "^2.1",
     "doctrine/inflector": "^1.3",
     "doctrine/collections": "^1.5",
+    "doctrine/instantiator": "^1.2",
     "zendframework/zend-hydrator": "^2.4"
   },
   "require-dev": {

diff --git a/src/Mapper/Mapper.php b/src/Mapper/Mapper.php
@@ -11,6 +11,7 @@
 
 use Cycle\ORM\ORMInterface;
 use Cycle\ORM\Schema;
+use Doctrine\Instantiator;
 use Zend\Hydrator;
 
 /**
@@ -31,6 +32,9 @@ class Mapper extends DatabaseMapper
     /** @var Hydrator\HydratorInterface */
     protected $hydrator;
 
+    /** @var Instantiator\InstantiatorInterface */
+    protected $instantiator;
+
     /**
      * @param ORMInterface $orm
      * @param string       $role
@@ -44,6 +48,7 @@ public function __construct(ORMInterface $orm, string $role)
 
         // mappers can request custom hydrator using constructor dependency
         $this->hydrator = new Hydrator\Reflection();
+        $this->instantiator = new Instantiator\Instantiator();
     }
 
     /**
@@ -53,7 +58,7 @@ public function init(array $data): array
     {
         $class = $this->resolveClass($data);
 
-        return [new $class, $data];
+        return [$this->instantiator->instantiate($class), $data];
     }
 
     /**

diff --git a/tests/ORM/BaseTest.php b/tests/ORM/BaseTest.php
@@ -17,6 +17,7 @@
 use Cycle\ORM\Promise\PromiseFactory;
 use Cycle\ORM\Promise\PromiseInterface;
 use Cycle\ORM\Relation\Pivoted\PivotedCollectionInterface;
+use Cycle\ORM\Relation\Pivoted\PivotedCollectionPromise;
 use Cycle\ORM\Relation\Pivoted\PivotedStorage;
 use Cycle\ORM\SchemaInterface;
 use Doctrine\Common\Collections\Collection;
@@ -312,7 +313,7 @@ protected function assertEntitySynced(string $eName, array $entity, array $state
                 continue;
             }
 
-            if ($eValue instanceof CollectionPromise || $eValue instanceof PivotedCollectionInterface) {
+            if ($eValue instanceof CollectionPromise || $eValue instanceof PivotedCollectionPromise) {
                 if (!$eValue->isInitialized()) {
                     $eValue = $eValue->getPromise();
                 } else {
@@ -325,6 +326,9 @@ protected function assertEntitySynced(string $eName, array $entity, array $state
 
             if ($eValue instanceof Collection) {
                 $eValue = $eValue->toArray();
+                if ($rValue === null) {
+                    $rValue = [];
+                }
             }
 
             $this->assertEquals(

diff --git a/tests/ORM/Classless/ClasslessHasManyPromiseTest.php b/tests/ORM/Classless/ClasslessHasManyPromiseTest.php
@@ -20,6 +20,7 @@
 use Cycle\ORM\Tests\Fixtures\SortByIDConstrain;
 use Cycle\ORM\Tests\Traits\TableTrait;
 use Cycle\ORM\Transaction;
+use Doctrine\Common\Collections\ArrayCollection;
 
 abstract class ClasslessHasManyPromiseTest extends BaseTest
 {
@@ -93,6 +94,12 @@ public function setUp()
         ]));
     }
 
+//    public function testInitRelation()
+//    {
+//        $u = $this->orm->make('user');
+//        $this->assertInstanceOf(ArrayCollection::class, $u->comments);
+//    }
+
     public function testFetchRelation()
     {
         $selector = new Select($this->orm, 'user');

diff --git a/tests/ORM/Driver/MySQL/AutoTimestampsTest.php b/tests/ORM/Driver/MySQL/AutoTimestampsTest.php
@@ -7,9 +7,9 @@
  */
 declare(strict_types=1);
 
-namespace Cycle\ORM\Tests\Driver\MySQL;
+namespace Cycle\ORM\Tests\Driver\MySQL; 
 
-class AutoTimestampsTest extends \Cycle\ORM\Tests\AutoTimestampsTest
-{
-    const DRIVER = "mysql";
+class AutoTimestampsTest extends \Cycle\ORM\Tests\AutoTimestampsTest 
+{ 
+    const DRIVER = "mysql"; 
 }
diff --git a/tests/ORM/Driver/MySQL/BelongsToMorphedRelationTest.php b/tests/ORM/Driver/MySQL/BelongsToMorphedRelationTest.php
@@ -7,9 +7,9 @@
  */
 declare(strict_types=1);
 
-namespace Cycle\ORM\Tests\Driver\MySQL;
+namespace Cycle\ORM\Tests\Driver\MySQL; 
 
-class BelongsToMorphedRelationTest extends \Cycle\ORM\Tests\Morphed\BelongsToMorphedRelationTest
-{
-    const DRIVER = "mysql";
+class BelongsToMorphedRelationTest extends \Cycle\ORM\Tests\Morphed\BelongsToMorphedRelationTest 
+{ 
+    const DRIVER = "mysql"; 
 }
diff --git a/tests/ORM/Driver/MySQL/BelongsToNativeReferenceTest.php b/tests/ORM/Driver/MySQL/BelongsToNativeReferenceTest.php
@@ -7,9 +7,9 @@
  */
 declare(strict_types=1);
 
-namespace Cycle\ORM\Tests\Driver\MySQL;
+namespace Cycle\ORM\Tests\Driver\MySQL; 
 
-class BelongsToNativeReferenceTest extends \Cycle\ORM\Tests\BelongsToNativeReferenceTest
-{
-    const DRIVER = "mysql";
+class BelongsToNativeReferenceTest extends \Cycle\ORM\Tests\BelongsToNativeReferenceTest 
+{ 
+    const DRIVER = "mysql"; 
 }
diff --git a/tests/ORM/Driver/MySQL/BelongsToPromiseTest.php b/tests/ORM/Driver/MySQL/BelongsToPromiseTest.php
@@ -7,9 +7,9 @@
  */
 declare(strict_types=1);
 
-namespace Cycle\ORM\Tests\Driver\MySQL;
+namespace Cycle\ORM\Tests\Driver\MySQL; 
 
-class BelongsToPromiseTest extends \Cycle\ORM\Tests\BelongsToPromiseTest
-{
-    const DRIVER = "mysql";
+class BelongsToPromiseTest extends \Cycle\ORM\Tests\BelongsToPromiseTest 
+{ 
+    const DRIVER = "mysql"; 
 }
diff --git a/tests/ORM/Driver/MySQL/BelongsToProxyTest.php b/tests/ORM/Driver/MySQL/BelongsToProxyTest.php
@@ -7,9 +7,9 @@
  */
 declare(strict_types=1);
 
-namespace Cycle\ORM\Tests\Driver\MySQL;
+namespace Cycle\ORM\Tests\Driver\MySQL; 
 
-class BelongsToProxyTest extends \Cycle\ORM\Tests\BelongsToProxyTest
-{
-    const DRIVER = "mysql";
+class BelongsToProxyTest extends \Cycle\ORM\Tests\BelongsToProxyTest 
+{ 
+    const DRIVER = "mysql"; 
 }
diff --git a/tests/ORM/Driver/MySQL/BelongsToReferenceTest.php b/tests/ORM/Driver/MySQL/BelongsToReferenceTest.php
@@ -7,9 +7,9 @@
  */
 declare(strict_types=1);
 
-namespace Cycle\ORM\Tests\Driver\MySQL;
+namespace Cycle\ORM\Tests\Driver\MySQL; 
 
-class BelongsToReferenceTest extends \Cycle\ORM\Tests\BelongsToReferenceTest
-{
-    const DRIVER = "mysql";
+class BelongsToReferenceTest extends \Cycle\ORM\Tests\BelongsToReferenceTest 
+{ 
+    const DRIVER = "mysql"; 
 }
diff --git a/tests/ORM/Driver/MySQL/BelongsToRelationTest.php b/tests/ORM/Driver/MySQL/BelongsToRelationTest.php
@@ -7,9 +7,9 @@
  */
 declare(strict_types=1);
 
-namespace Cycle\ORM\Tests\Driver\MySQL;
+namespace Cycle\ORM\Tests\Driver\MySQL; 
 
-class BelongsToRelationTest extends \Cycle\ORM\Tests\BelongsToRelationTest
-{
-    const DRIVER = "mysql";
+class BelongsToRelationTest extends \Cycle\ORM\Tests\BelongsToRelationTest 
+{ 
+    const DRIVER = "mysql"; 
 }
diff --git a/tests/ORM/Driver/MySQL/ClasslessCyclicReferencesTest.php b/tests/ORM/Driver/MySQL/ClasslessCyclicReferencesTest.php
@@ -7,9 +7,9 @@
  */
 declare(strict_types=1);
 
-namespace Cycle\ORM\Tests\Driver\MySQL;
+namespace Cycle\ORM\Tests\Driver\MySQL; 
 
-class ClasslessCyclicReferencesTest extends \Cycle\ORM\Tests\Classless\ClasslessCyclicReferencesTest
-{
-    const DRIVER = "mysql";
+class ClasslessCyclicReferencesTest extends \Cycle\ORM\Tests\Classless\ClasslessCyclicReferencesTest 
+{ 
+    const DRIVER = "mysql"; 
 }
diff --git a/tests/ORM/Driver/MySQL/ClasslessHasManyPromiseTest.php b/tests/ORM/Driver/MySQL/ClasslessHasManyPromiseTest.php
@@ -7,9 +7,9 @@
  */
 declare(strict_types=1);
 
-namespace Cycle\ORM\Tests\Driver\MySQL;
+namespace Cycle\ORM\Tests\Driver\MySQL; 
 
-class ClasslessHasManyPromiseTest extends \Cycle\ORM\Tests\Classless\ClasslessHasManyPromiseTest
-{
-    const DRIVER = "mysql";
+class ClasslessHasManyPromiseTest extends \Cycle\ORM\Tests\Classless\ClasslessHasManyPromiseTest 
+{ 
+    const DRIVER = "mysql"; 
 }
diff --git a/tests/ORM/Driver/MySQL/ClasslessHasOneCyclicTest.php b/tests/ORM/Driver/MySQL/ClasslessHasOneCyclicTest.php
@@ -7,9 +7,9 @@
  */
 declare(strict_types=1);
 
-namespace Cycle\ORM\Tests\Driver\MySQL;
+namespace Cycle\ORM\Tests\Driver\MySQL; 
 
-class ClasslessHasOneCyclicTest extends \Cycle\ORM\Tests\Classless\ClasslessHasOneCyclicTest
-{
-    const DRIVER = "mysql";
+class ClasslessHasOneCyclicTest extends \Cycle\ORM\Tests\Classless\ClasslessHasOneCyclicTest 
+{ 
+    const DRIVER = "mysql"; 
 }
diff --git a/tests/ORM/Driver/MySQL/ClasslessInverseRelationTest.php b/tests/ORM/Driver/MySQL/ClasslessInverseRelationTest.php
@@ -7,9 +7,9 @@
  */
 declare(strict_types=1);
 
-namespace Cycle\ORM\Tests\Driver\MySQL;
+namespace Cycle\ORM\Tests\Driver\MySQL; 
 
-class ClasslessInverseRelationTest extends \Cycle\ORM\Tests\Classless\ClasslessInverseRelationTest
-{
-    const DRIVER = "mysql";
+class ClasslessInverseRelationTest extends \Cycle\ORM\Tests\Classless\ClasslessInverseRelationTest 
+{ 
+    const DRIVER = "mysql"; 
 }
diff --git a/tests/ORM/Driver/MySQL/ClasslessMapperTest.php b/tests/ORM/Driver/MySQL/ClasslessMapperTest.php
@@ -7,9 +7,9 @@
  */
 declare(strict_types=1);
 
-namespace Cycle\ORM\Tests\Driver\MySQL;
+namespace Cycle\ORM\Tests\Driver\MySQL; 
 
-class ClasslessMapperTest extends \Cycle\ORM\Tests\Classless\ClasslessMapperTest
-{
-    const DRIVER = "mysql";
+class ClasslessMapperTest extends \Cycle\ORM\Tests\Classless\ClasslessMapperTest 
+{ 
+    const DRIVER = "mysql"; 
 }
diff --git a/tests/ORM/Driver/MySQL/ColumnAliasesTest.php b/tests/ORM/Driver/MySQL/ColumnAliasesTest.php
@@ -7,9 +7,9 @@
  */
 declare(strict_types=1);
 
-namespace Cycle\ORM\Tests\Driver\MySQL;
+namespace Cycle\ORM\Tests\Driver\MySQL; 
 
-class ColumnAliasesTest extends \Cycle\ORM\Tests\ColumnAliasesTest
-{
-    const DRIVER = "mysql";
+class ColumnAliasesTest extends \Cycle\ORM\Tests\ColumnAliasesTest 
+{ 
+    const DRIVER = "mysql"; 
 }
diff --git a/tests/ORM/Driver/MySQL/CustomRepositoryTest.php b/tests/ORM/Driver/MySQL/CustomRepositoryTest.php
@@ -7,9 +7,9 @@
  */
 declare(strict_types=1);
 
-namespace Cycle\ORM\Tests\Driver\MySQL;
+namespace Cycle\ORM\Tests\Driver\MySQL; 
 
-class CustomRepositoryTest extends \Cycle\ORM\Tests\CustomRepositoryTest
-{
-    const DRIVER = "mysql";
+class CustomRepositoryTest extends \Cycle\ORM\Tests\CustomRepositoryTest 
+{ 
+    const DRIVER = "mysql"; 
 }
diff --git a/tests/ORM/Driver/MySQL/CyclicReferencesTest.php b/tests/ORM/Driver/MySQL/CyclicReferencesTest.php
@@ -7,9 +7,9 @@
  */
 declare(strict_types=1);
 
-namespace Cycle\ORM\Tests\Driver\MySQL;
+namespace Cycle\ORM\Tests\Driver\MySQL; 
 
-class CyclicReferencesTest extends \Cycle\ORM\Tests\CyclicReferencesTest
-{
-    const DRIVER = "mysql";
+class CyclicReferencesTest extends \Cycle\ORM\Tests\CyclicReferencesTest 
+{ 
+    const DRIVER = "mysql"; 
 }
diff --git a/tests/ORM/Driver/MySQL/DatetimeTest.php b/tests/ORM/Driver/MySQL/DatetimeTest.php
@@ -7,9 +7,9 @@
  */
 declare(strict_types=1);
 
-namespace Cycle\ORM\Tests\Driver\MySQL;
+namespace Cycle\ORM\Tests\Driver\MySQL; 
 
-class DatetimeTest extends \Cycle\ORM\Tests\DatetimeTest
-{
-    const DRIVER = "mysql";
+class DatetimeTest extends \Cycle\ORM\Tests\DatetimeTest 
+{ 
+    const DRIVER = "mysql"; 
 }
diff --git a/tests/ORM/Driver/MySQL/DeepCyclicTest.php b/tests/ORM/Driver/MySQL/DeepCyclicTest.php
@@ -7,9 +7,9 @@
  */
 declare(strict_types=1);
 
-namespace Cycle\ORM\Tests\Driver\MySQL;
+namespace Cycle\ORM\Tests\Driver\MySQL; 
 
-class DeepCyclicTest extends \Cycle\ORM\Tests\DeepCyclicTest
-{
-    const DRIVER = "mysql";
+class DeepCyclicTest extends \Cycle\ORM\Tests\DeepCyclicTest 
+{ 
+    const DRIVER = "mysql"; 
 }
diff --git a/tests/ORM/Driver/MySQL/DoubleLinkedTest.php b/tests/ORM/Driver/MySQL/DoubleLinkedTest.php
@@ -7,9 +7,9 @@
  */
 declare(strict_types=1);
 
-namespace Cycle\ORM\Tests\Driver\MySQL;
+namespace Cycle\ORM\Tests\Driver\MySQL; 
 
-class DoubleLinkedTest extends \Cycle\ORM\Tests\DoubleLinkedTest
-{
-    const DRIVER = "mysql";
+class DoubleLinkedTest extends \Cycle\ORM\Tests\DoubleLinkedTest 
+{ 
+    const DRIVER = "mysql"; 
 }
diff --git a/tests/ORM/Driver/MySQL/HasManyConstrainTest.php b/tests/ORM/Driver/MySQL/HasManyConstrainTest.php
@@ -7,9 +7,9 @@
  */
 declare(strict_types=1);
 
-namespace Cycle\ORM\Tests\Driver\MySQL;
+namespace Cycle\ORM\Tests\Driver\MySQL; 
 
-class HasManyConstrainTest extends \Cycle\ORM\Tests\HasManyConstrainTest
-{
-    const DRIVER = "mysql";
+class HasManyConstrainTest extends \Cycle\ORM\Tests\HasManyConstrainTest 
+{ 
+    const DRIVER = "mysql"; 
 }
diff --git a/tests/ORM/Driver/MySQL/HasManyPromiseTest.php b/tests/ORM/Driver/MySQL/HasManyPromiseTest.php
@@ -7,9 +7,9 @@
  */
 declare(strict_types=1);
 
-namespace Cycle\ORM\Tests\Driver\MySQL;
+namespace Cycle\ORM\Tests\Driver\MySQL; 
 
-class HasManyPromiseTest extends \Cycle\ORM\Tests\HasManyPromiseTest
-{
-    const DRIVER = "mysql";
+class HasManyPromiseTest extends \Cycle\ORM\Tests\HasManyPromiseTest 
+{ 
+    const DRIVER = "mysql"; 
 }