Merge pull request #32 from yannickl88/fix/non-owning-assocation-clone

Made sure to also fill in associations
hostnet · Oct 16, 2017 · dd76c75 · dd76c75
2 parents bd132aa + b126271
commit dd76c75
Show file tree

Hide file tree

Showing 5 changed files with 122 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
-    "name":              "hostnet/entity-tracker-component",
-    "description":       "Provides an event when a Tracked entity changes",
-    "license":           "MIT",
+    "name":        "hostnet/entity-tracker-component",
+    "description": "Provides an event when a Tracked entity changes",
+    "license":     "MIT",
     "require": {
         "php":                  "5.*,>=5.6||7.*",
         "doctrine/annotations": "1.*,>=1.2.0",
@@ -10,10 +10,10 @@
         "psr/log":              "^1.0.0"
     },
     "require-dev": {
-        "hostnet/database-test-lib": "^1.0",
+        "hostnet/database-test-lib": "^1.0.5",
         "hostnet/phpcs-tool":        "^4.0.8",
         "phpunit/phpunit":           "^5.5.0",
-        "symfony/var-dumper": "^3.1"
+        "symfony/var-dumper":        "^3.1"
     },
     "minimum-stability": "stable",
     "autoload": {

diff --git a/src/Provider/EntityMutationMetadataProvider.php b/src/Provider/EntityMutationMetadataProvider.php
@@ -58,10 +58,10 @@ public function createOriginalEntity(EntityManagerInterface $em, $entity)
         foreach ($fields as $field) {
             if (isset($data[$field])) {
                 $metadata->setFieldValue($original, $field, $data[$field]);
-                continue;
-            }
-            if (isset($id_data[$field]) && $metadata->isIdentifier($field) && $metadata->isIdGeneratorIdentity()) {
+            } elseif (isset($id_data[$field]) && $metadata->isIdentifier($field) && $metadata->isIdGeneratorIdentity()) {
                 $metadata->setFieldValue($original, $field, $id_data[$field]);
+            } elseif ($metadata->isAssociationInverseSide($field)) {
+                $metadata->setFieldValue($original, $field, $metadata->getFieldValue($entity, $field));
             }
         }
 

diff --git a/test/Provider/Entity/Visit.php b/test/Provider/Entity/Visit.php
@@ -0,0 +1,65 @@
+<?php
+namespace Hostnet\Component\EntityTracker\Provider\Entity;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity()
+ */
+class Visit
+{
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    private $id;
+
+    /**
+     * @ORM\Column(type="datetime")
+     * @var \DateTime
+     */
+    private $date;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Visitor", inversedBy="visits")
+     * @var Visitor
+     */
+    private $visitor;
+
+    /**
+     * @param \DateTime $date
+     * @param Visitor   $visitor
+     */
+    public function __construct(\DateTime $date, Visitor $visitor)
+    {
+        $this->date    = $date;
+        $this->visitor = $visitor;
+    }
+
+    /**
+     * @return \DateTime
+     */
+    public function getDate()
+    {
+        return $this->date;
+    }
+
+    /**
+     * @param \DateTime $date
+     */
+    public function setDate($date)
+    {
+        $this->date = $date;
+    }
+
+    /**
+     * @return Visitor
+     */
+    public function getVisitor()
+    {
+        return $this->visitor;
+    }
+}
diff --git a/test/Provider/Entity/Visitor.php b/test/Provider/Entity/Visitor.php
@@ -1,6 +1,7 @@
 <?php
 namespace Hostnet\Component\EntityTracker\Provider\Entity;
 
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
@@ -24,10 +25,37 @@ class Visitor
     private $name;
 
     /**
-     * @param string  $name
+     * @ORM\OneToMany(targetEntity="Visit", mappedBy="visitor", cascade={"persist"})
+     * @var ArrayCollection|Visit[]
+     */
+    private $visits;
+
+    /**
+     * @param string $name
      */
     public function __construct($name)
+    {
+        $this->name   = $name;
+        $this->visits = new ArrayCollection();
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function setName($name)
     {
         $this->name = $name;
     }
+
+    public function getVisits()
+    {
+        return $this->visits;
+    }
+
+    public function addVisit(Visit $visit)
+    {
+        $this->visits->add($visit);
+    }
 }
diff --git a/test/Provider/EntityMutationMetadataProviderTest.php b/test/Provider/EntityMutationMetadataProviderTest.php
@@ -10,6 +10,8 @@
 use Hostnet\Component\EntityTracker\Provider\Entity\Gallery;
 use Hostnet\Component\EntityTracker\Provider\Entity\Node;
 use Hostnet\Component\EntityTracker\Provider\Entity\Painting;
+use Hostnet\Component\EntityTracker\Provider\Entity\Visit;
+use Hostnet\Component\EntityTracker\Provider\Entity\Visitor;
 
 /**
  * @covers \Hostnet\Component\EntityTracker\Provider\EntityMutationMetadataProvider
@@ -89,6 +91,24 @@ public function testCreateOriginalEntityIdentity()
         self::assertSame($gallery->getId(), $original->getId());
     }
 
+    public function testCreateOriginalEntityNonOwning()
+    {
+        $visitor = new Visitor('Henk de Vries');
+        $visitor->addVisit(new Visit(new \DateTime('2016-10-10 10:10:10'), $visitor));
+
+        $this->em->persist($visitor);
+        $this->em->flush();
+
+        $visitor->setName('foobar');
+
+        $this->em->flush();
+
+        $original = $this->provider->createOriginalEntity($this->em, $visitor);
+
+        self::assertSame($visitor->getName(), $original->getName());
+        self::assertSame($visitor->getVisits(), $original->getVisits());
+    }
+
     /**
      * @depends testCreateOriginalEntity
      */