diff --git a/tests/Doctrine/Tests/Models/VersionedOneToMany/Article.php b/tests/Doctrine/Tests/Models/VersionedOneToMany/Article.php index c284fc15f..bd0cfdf48 100644 --- a/tests/Doctrine/Tests/Models/VersionedOneToMany/Article.php +++ b/tests/Doctrine/Tests/Models/VersionedOneToMany/Article.php @@ -5,7 +5,6 @@ namespace Doctrine\Tests\Models\VersionedOneToMany; use Doctrine\Common\Collections\ArrayCollection; /** - * * @Entity * @Table(name="article") */ @@ -38,7 +37,6 @@ class Article /** * Category constructor. - * */ public function __construct() { diff --git a/tests/Doctrine/Tests/Models/VersionedOneToMany/Category.php b/tests/Doctrine/Tests/Models/VersionedOneToMany/Category.php index 5ace04603..d4dbdefbb 100644 --- a/tests/Doctrine/Tests/Models/VersionedOneToMany/Category.php +++ b/tests/Doctrine/Tests/Models/VersionedOneToMany/Category.php @@ -5,7 +5,6 @@ namespace Doctrine\Tests\Models\VersionedOneToMany; use Doctrine\Common\Collections\ArrayCollection; /** - * * @Entity * @Table(name="category") */ @@ -38,12 +37,9 @@ class Category /** * Category constructor. - * */ public function __construct() { $this->articles = new ArrayCollection(); } - - } diff --git a/tests/Doctrine/Tests/ORM/Functional/MergeVersionedOneToManyTest.php b/tests/Doctrine/Tests/ORM/Functional/MergeVersionedOneToManyTest.php index 178e16ab0..b51a24013 100644 --- a/tests/Doctrine/Tests/ORM/Functional/MergeVersionedOneToManyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/MergeVersionedOneToManyTest.php @@ -29,8 +29,8 @@ class MergeVersionedOneToManyTest extends \Doctrine\Tests\OrmFunctionalTestCase } /** - * This test case tests that a versionable entity, that has a oneToOne relationship as it's id can be created - * without this bug fix (DDC-3318), you could not do this + * This test case asserts that a detached and unmodified entity could be merge without firing + * OptimisticLockException. */ public function testSetVersionOnCreate() {