From 5ae980e0f961bb6ee30b761e3ce3d7be5a9570d9 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Tue, 20 Jan 2015 13:16:41 +0100 Subject: [PATCH] DDC-2704 - reducing test case clutter --- .../Tests/ORM/Functional/MergeSharedEntitiesTest.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/MergeSharedEntitiesTest.php b/tests/Doctrine/Tests/ORM/Functional/MergeSharedEntitiesTest.php index a0010734a..d4929a1af 100644 --- a/tests/Doctrine/Tests/ORM/Functional/MergeSharedEntitiesTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/MergeSharedEntitiesTest.php @@ -106,10 +106,7 @@ class MergeSharedEntitiesTest extends OrmFunctionalTestCase $admin2->setSession('zeh current session data'); - - $merged = $this->_em->merge($admin2); - - $this->assertSame($admin1, $merged); + $this->assertSame($admin1, $this->_em->merge($admin2)); $this->assertSame($admin2->getSession(), $admin1->getSession()); } }