From 1d961780975ae245eb86e7e095d31f2522b8780c Mon Sep 17 00:00:00 2001
From: bilouwan <moroine.bentefrit@adactive.com>
Date: Thu, 15 Dec 2016 12:19:56 +0100
Subject: [PATCH] Create failing test to reveal the issue

---
 .../Functional/EntityListenersOnMergeTest.php | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 tests/Doctrine/Tests/ORM/Functional/EntityListenersOnMergeTest.php

diff --git a/tests/Doctrine/Tests/ORM/Functional/EntityListenersOnMergeTest.php b/tests/Doctrine/Tests/ORM/Functional/EntityListenersOnMergeTest.php
new file mode 100644
index 000000000..a3575a821
--- /dev/null
+++ b/tests/Doctrine/Tests/ORM/Functional/EntityListenersOnMergeTest.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional;
+
+use Doctrine\Tests\Models\DDC3597\DDC3597Image;
+use Doctrine\Tests\Models\DDC3597\DDC3597Media;
+use Doctrine\Tests\Models\DDC3597\DDC3597Root;
+
+/**
+ */
+class EntityListenersOnMergeTest extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->_schemaTool->createSchema(
+            [
+                $this->_em->getClassMetadata(DDC3597Root::class),
+                $this->_em->getClassMetadata(DDC3597Media::class),
+                $this->_em->getClassMetadata(DDC3597Image::class),
+            ]
+        );
+    }
+
+    protected function tearDown()
+    {
+        parent::tearDown();
+        $this->_schemaTool->dropSchema(
+            [
+                $this->_em->getClassMetadata(DDC3597Root::class),
+                $this->_em->getClassMetadata(DDC3597Media::class),
+                $this->_em->getClassMetadata(DDC3597Image::class),
+            ]
+        );
+    }
+
+    public function testMergeNewEntityLifecyleEventsModificationsShouldBeKept()
+    {
+        $imageEntity = new DDC3597Image('foobar');
+        $imageEntity->setFormat('JPG');
+        $imageEntity->setSize(123);
+        $imageEntity->getDimension()->setWidth(300);
+        $imageEntity->getDimension()->setHeight(500);
+
+        $imageEntity = $this->_em->merge($imageEntity);
+
+        $this->assertNotNull($imageEntity->getCreatedAt());
+        $this->assertNotNull($imageEntity->getUpdatedAt());
+    }
+}
\ No newline at end of file