From 21995a8b10746d35d95e70296be01d0ec7caa9a4 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Tue, 20 Jan 2015 15:40:36 +0100 Subject: [PATCH] DDC-2704 - more explicit value checking --- tests/Doctrine/Tests/ORM/Functional/MergeSharedEntitiesTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/MergeSharedEntitiesTest.php b/tests/Doctrine/Tests/ORM/Functional/MergeSharedEntitiesTest.php index d4929a1af..28e89c360 100644 --- a/tests/Doctrine/Tests/ORM/Functional/MergeSharedEntitiesTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/MergeSharedEntitiesTest.php @@ -107,7 +107,7 @@ class MergeSharedEntitiesTest extends OrmFunctionalTestCase $admin2->setSession('zeh current session data'); $this->assertSame($admin1, $this->_em->merge($admin2)); - $this->assertSame($admin2->getSession(), $admin1->getSession()); + $this->assertSame('zeh current session data', $admin1->getSession()); } }