Add support for embeddable, add test

Author: kvdnberg

lib/Gedmo/AbstractTrackingListener.php

@@ -106,14 +106,19 @@ public function onFlush(EventArgs $args)
                         $trackedFields = $options['trackedField'];
                     }
 
-                    foreach ($trackedFields as $tracked) {
+                    foreach ($trackedFields as $trackedField) {
                         $trackedChild = null;
-                        $parts = explode('.', $tracked);
+                        $parts = explode('.', $trackedField);
                         if (isset($parts[1])) {
                             $tracked = $parts[0];
                             $trackedChild = $parts[1];
                         }
 
+                        if (!isset($tracked) || array_key_exists($trackedField, $changeSet)) {
+                            $tracked = $trackedField;
+                            unset($trackedChild);
+                        }
+
                         if (isset($changeSet[$tracked])) {
                             $changes = $changeSet[$tracked];
                             if (isset($trackedChild)) {

tests/Gedmo/Timestampable/Fixture/Article.php

@@ -28,6 +28,11 @@ class Article implements Timestampable
      */
     private $comments;
 
+    /**
+     * @ORM\Embedded(class="Timestampable\Fixture\Author")
+     */
+    private $author;
+
     /**
      * @var datetime $created
      *
@@ -59,6 +64,13 @@ class Article implements Timestampable
      * @Gedmo\Timestampable(on="change", field={"title", "body"})
      */
     private $contentChanged;
+    /**
+     * @var datetime $authorChanged
+     *
+     * @ORM\Column(name="author_changed", type="datetime", nullable=true)
+     * @Gedmo\Timestampable(on="change", field={"author.name", "author.email"})
+     */
+    private $authorChanged;
 
     /**
      * @ORM\ManyToOne(targetEntity="Type", inversedBy="articles")
@@ -106,6 +118,16 @@ public function getComments()
         return $this->comments;
     }
 
+    public function getAuthor()
+    {
+        return $this->author;
+    }
+
+    public function setAuthor(Author $author)
+    {
+        $this->author = $author;
+    }
+
     /**
      * Get created
      *

tests/Gedmo/Timestampable/Fixture/Author.php

@@ -0,0 +1,44 @@
+<?php
+namespace Timestampable\Fixture;
+
+use Gedmo\Timestampable\Timestampable;
+use Gedmo\Mapping\Annotation as Gedmo;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Embeddable()
+ */
+class Author
+{
+    /**
+     * @ORM\Column(name="author_name", type="string", length=128)
+     */
+    private $name;
+
+    /**
+     * @ORM\Column(name="author_email", type="string", length=50)
+     */
+    private $email;
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
+
+    public function getEmail()
+    {
+        return $this->email;
+    }
+
+    public function setEmail($email)
+    {
+        $this->email = $email;
+    }
+
+
+}

tests/Gedmo/Timestampable/TimestampableTest.php

@@ -3,6 +3,7 @@
 namespace Gedmo\Timestampable;
 
 use Doctrine\Common\EventManager;
+use Timestampable\Fixture\Author;
 use Tool\BaseTestCaseORM;
 use Timestampable\Fixture\Article;
 use Timestampable\Fixture\Comment;
@@ -93,6 +94,12 @@ function shouldHandleStandardBehavior()
         $sportComment->setArticle($sport);
         $sportComment->setStatus(0);
 
+        $author = new Author();
+        $author->setName('Original author');
+        $author->setEmail('[email protected]');
+
+        $sport->setAuthor($author);
+
         $this->em->persist($sport);
         $this->em->persist($sportComment);
         $this->em->flush();
@@ -102,6 +109,11 @@ function shouldHandleStandardBehavior()
         $this->assertNotNull($su = $sport->getUpdated());
         $this->assertNull($sport->getContentChanged());
         $this->assertNull($sport->getPublished());
+        $this->assertNull($sport->getAuthorChanged());
+
+        $author = $sport->getAuthor();
+        $author->setName('New author');
+        $sport->setAuthor($author);
 
         $sportComment = $this->em->getRepository(self::COMMENT)->findOneByMessage('hello');
         $this->assertNotNull($scm = $sportComment->getModified());
@@ -120,6 +132,7 @@ function shouldHandleStandardBehavior()
         $sportComment = $this->em->getRepository(self::COMMENT)->findOneByMessage('hello');
         $this->assertNotNull($scc = $sportComment->getClosed());
         $this->assertNotNull($sp = $sport->getPublished());
+        $this->assertNotNull($sa = $sport->getAuthorChanged());
 
         $sport->setTitle('Updated');
         $this->em->persist($sport);
@@ -131,6 +144,11 @@ function shouldHandleStandardBehavior()
         $this->assertNotSame($su2 = $sport->getUpdated(), $su, "Date updated should change after update");
         $this->assertSame($sport->getPublished(), $sp, "Date published should remain the same after update");
         $this->assertNotSame($scc2 = $sport->getContentChanged(), $scc, "Content must have changed after update");
+        $this->assertSame($sport->authorChanged(), $sa, "Author should remain same after update");
+
+        $author = $sport->getAuthor();
+        $author->setName('Third author');
+        $sport->setAuthor($author);
 
         $sport->setBody('Body updated');
         $this->em->persist($sport);
@@ -142,6 +160,7 @@ function shouldHandleStandardBehavior()
         $this->assertNotSame($sport->getUpdated(), $su2, "Date updated should change after update");
         $this->assertSame($sport->getPublished(), $sp, "Date published should remain the same after update");
         $this->assertNotSame($sport->getContentChanged(), $scc2, "Content must have changed after update");
+        $this->assertNotSame($sport->getAuthorChanged(), $sa, "Author must have changed after update");
     }
 
     /**