From e8f40f58a1b5692975b0866ef5e2ce02c7833773 Mon Sep 17 00:00:00 2001
From: bilouwan <moroine.bentefrit@adactive.com>
Date: Mon, 30 Nov 2015 10:35:42 +0100
Subject: [PATCH] Fix compatibility with php5.4

---
 .../MergeVersionedOneToManyTest.php           | 22 +++++--------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/Functional/MergeVersionedOneToManyTest.php b/tests/Doctrine/Tests/ORM/Functional/MergeVersionedOneToManyTest.php
index c5f022c52..178e16ab0 100644
--- a/tests/Doctrine/Tests/ORM/Functional/MergeVersionedOneToManyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/MergeVersionedOneToManyTest.php
@@ -6,7 +6,6 @@ use Doctrine\ORM\OptimisticLockException;
 use Doctrine\ORM\ORMException;
 use Doctrine\Tests\Models\VersionedOneToMany\Article;
 use Doctrine\Tests\Models\VersionedOneToMany\Category;
-use Doctrine\Tests\Models\VersionedOneToMany\Tag;
 
 /**
  *
@@ -21,8 +20,8 @@ class MergeVersionedOneToManyTest extends \Doctrine\Tests\OrmFunctionalTestCase
         try {
             $this->_schemaTool->createSchema(
                 [
-                    $this->_em->getClassMetadata(Category::class),
-                    $this->_em->getClassMetadata(Article::class),
+                    $this->_em->getClassMetadata('Doctrine\Tests\Models\VersionedOneToMany\Category'),
+                    $this->_em->getClassMetadata('Doctrine\Tests\Models\VersionedOneToMany\Article'),
                 ]
             );
         } catch (ORMException $e) {
@@ -46,22 +45,11 @@ class MergeVersionedOneToManyTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->_em->flush();
         $this->_em->clear();
 
-        $mergeSucceed = false;
-        try {
-            $articleMerged = $this->_em->merge($article);
-            $mergeSucceed = true;
-        } catch (OptimisticLockException $e) {
-        }
-        $this->assertTrue($mergeSucceed);
+        $articleMerged = $this->_em->merge($article);
 
         $articleMerged->name = 'Article Merged';
 
-        $flushSucceed = false;
-        try {
-            $this->_em->flush();
-            $flushSucceed = true;
-        } catch (OptimisticLockException $e) {
-        }
-        $this->assertTrue($flushSucceed);
+        $this->_em->flush();
+        $this->assertEquals(2, $articleMerged->version);
     }
 }