-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'hotfix/#1387-DDC-3699-do-not-merge-managed-uninitialize…
…d-entities-2.5' into 2.5 Close #1387
- Loading branch information
Showing
7 changed files
with
181 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
<?php | ||
|
||
namespace Doctrine\Tests\Models\DDC3699; | ||
|
||
/** @Entity @Table(name="ddc3699_child") */ | ||
class DDC3699Child extends DDC3699Parent | ||
{ | ||
const CLASSNAME = __CLASS__; | ||
|
||
/** @Id @Column(type="integer") */ | ||
public $id; | ||
|
||
/** @Column(type="string") */ | ||
public $childField; | ||
|
||
/** @OneToOne(targetEntity="DDC3699RelationOne", inversedBy="child") */ | ||
public $oneRelation; | ||
|
||
/** @OneToMany(targetEntity="DDC3699RelationMany", mappedBy="child") */ | ||
public $relations; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
<?php | ||
|
||
namespace Doctrine\Tests\Models\DDC3699; | ||
|
||
/** @MappedSuperclass */ | ||
abstract class DDC3699Parent | ||
{ | ||
const CLASSNAME = __CLASS__; | ||
|
||
/** @Column(type="string") */ | ||
public $parentField; | ||
} |
18 changes: 18 additions & 0 deletions
18
tests/Doctrine/Tests/Models/DDC3699/DDC3699RelationMany.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
<?php | ||
|
||
namespace Doctrine\Tests\Models\DDC3699; | ||
|
||
/** | ||
* @Entity | ||
* @Table(name="ddc3699_relation_many") | ||
*/ | ||
class DDC3699RelationMany | ||
{ | ||
const CLASSNAME = __CLASS__; | ||
|
||
/** @Id @Column(type="integer") */ | ||
public $id; | ||
|
||
/** @ManyToOne(targetEntity="DDC3699Child", inversedBy="relations") */ | ||
public $child; | ||
} |
18 changes: 18 additions & 0 deletions
18
tests/Doctrine/Tests/Models/DDC3699/DDC3699RelationOne.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
<?php | ||
|
||
namespace Doctrine\Tests\Models\DDC3699; | ||
|
||
/** | ||
* @Entity | ||
* @Table(name="ddc3699_relation_one") | ||
*/ | ||
class DDC3699RelationOne | ||
{ | ||
const CLASSNAME = __CLASS__; | ||
|
||
/** @Id @Column(type="integer") */ | ||
public $id; | ||
|
||
/** @OneToOne(targetEntity="DDC3699Child", mappedBy="oneRelation") */ | ||
public $child; | ||
} |
104 changes: 104 additions & 0 deletions
104
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3699Test.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,104 @@ | ||
<?php | ||
|
||
use Doctrine\DBAL\Schema\SchemaException; | ||
use Doctrine\Tests\Models\DDC3699\DDC3699Parent; | ||
use Doctrine\Tests\Models\DDC3699\DDC3699RelationOne; | ||
use Doctrine\Tests\Models\DDC3699\DDC3699RelationMany; | ||
use Doctrine\Tests\Models\DDC3699\DDC3699Child; | ||
|
||
/** | ||
* @group DDC-3699 | ||
*/ | ||
class DDC3597Test extends \Doctrine\Tests\OrmFunctionalTestCase | ||
{ | ||
protected function setUp() | ||
{ | ||
$this->useModelSet('ddc3699'); | ||
|
||
parent::setUp(); | ||
} | ||
|
||
/** | ||
* @group DDC-3699 | ||
*/ | ||
public function testMergingParentClassFieldsDoesNotStopMergingScalarFieldsForToOneUninitializedAssociations() | ||
{ | ||
$id = 1; | ||
|
||
$child = new DDC3699Child(); | ||
|
||
$child->id = $id; | ||
$child->childField = 'childValue'; | ||
$child->parentField = 'parentValue'; | ||
|
||
$relation = new DDC3699RelationOne(); | ||
|
||
$relation->id = $id; | ||
$relation->child = $child ; | ||
$child->oneRelation = $relation; | ||
|
||
$this->_em->persist($relation); | ||
$this->_em->persist($child); | ||
$this->_em->flush(); | ||
$this->_em->clear(); | ||
|
||
// fixtures loaded | ||
/* @var $unManagedChild DDC3699Child */ | ||
$unManagedChild = $this->_em->find(DDC3699Child::CLASSNAME, $id); | ||
|
||
$this->_em->detach($unManagedChild); | ||
|
||
// make it managed again | ||
$this->_em->find(DDC3699Child::CLASSNAME, $id); | ||
|
||
$unManagedChild->childField = 'modifiedChildValue'; | ||
$unManagedChild->parentField = 'modifiedParentValue'; | ||
|
||
/* @var $mergedChild DDC3699Child */ | ||
$mergedChild = $this->_em->merge($unManagedChild); | ||
|
||
$this->assertSame($mergedChild->childField, 'modifiedChildValue'); | ||
$this->assertSame($mergedChild->parentField, 'modifiedParentValue'); | ||
} | ||
|
||
/** | ||
* @group DDC-3699 | ||
*/ | ||
public function testMergingParentClassFieldsDoesNotStopMergingScalarFieldsForToManyUninitializedAssociations() | ||
{ | ||
$id = 2; | ||
|
||
$child = new DDC3699Child(); | ||
|
||
$child->id = $id; | ||
$child->childField = 'childValue'; | ||
$child->parentField = 'parentValue'; | ||
|
||
$relation = new DDC3699RelationMany(); | ||
|
||
$relation->id = $id; | ||
$relation->child = $child ; | ||
$child->relations[] = $relation; | ||
|
||
$this->_em->persist($relation); | ||
$this->_em->persist($child); | ||
$this->_em->flush(); | ||
$this->_em->clear(); | ||
|
||
/* @var $unmanagedChild DDC3699Child */ | ||
$unmanagedChild = $this->_em->find(DDC3699Child::CLASSNAME, $id); | ||
$this->_em->detach($unmanagedChild); | ||
|
||
// make it managed again | ||
$this->_em->find(DDC3699Child::CLASSNAME, $id); | ||
|
||
$unmanagedChild->childField = 'modifiedChildValue'; | ||
$unmanagedChild->parentField = 'modifiedParentValue'; | ||
|
||
/* @var $mergedChild DDC3699Child */ | ||
$mergedChild = $this->_em->merge($unmanagedChild); | ||
|
||
$this->assertSame($mergedChild->childField, 'modifiedChildValue'); | ||
$this->assertSame($mergedChild->parentField, 'modifiedParentValue'); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters