RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-02 13:31:45 +03:00
Code Issues Projects Releases Wiki Activity

Fix compatibility with php5.4

Browse Source
This commit is contained in:
bilouwan 2015-11-30 10:35:42 +01:00 committed by Marco Pivetta
parent 216c466233
commit 7071984559
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/Doctrine/Tests/ORM/Functional/MergeVersionedOneToManyTest.php
View File

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