-
Notifications
You must be signed in to change notification settings - Fork 2.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix #6460 - \Doctrine\ORM\Mapping\ClassMetadataInfo::hasField should return true for embedded fields #6462
Fix #6460 - \Doctrine\ORM\Mapping\ClassMetadataInfo::hasField should return true for embedded fields #6462
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,111 @@ | ||
<?php | ||
|
||
namespace Doctrine\Tests\ORM\Functional\Ticket; | ||
|
||
use Doctrine\DBAL\Schema\SchemaException; | ||
use Doctrine\ORM\Mapping\Column; | ||
use Doctrine\ORM\Mapping\Embeddable; | ||
use Doctrine\ORM\Mapping\Entity; | ||
use Doctrine\ORM\Mapping\Id; | ||
use Doctrine\ORM\Mapping\GeneratedValue; | ||
use Doctrine\ORM\Mapping\ManyToOne; | ||
use Doctrine\ORM\Proxy\Proxy; | ||
|
||
class DDC6460Test extends \Doctrine\Tests\OrmFunctionalTestCase | ||
{ | ||
public function setUp() | ||
{ | ||
parent::setUp(); | ||
|
||
try { | ||
$this->setUpEntitySchema( | ||
[ | ||
DDC6460Entity::class, | ||
DDC6460ParentEntity::class, | ||
] | ||
); | ||
} catch (SchemaException $e) { | ||
} | ||
} | ||
|
||
/** | ||
* @group DDC-6460 | ||
*/ | ||
public function testInlineEmbeddable() | ||
{ | ||
$isFieldMapped = $this->_em | ||
->getClassMetadata(DDC6460Entity::class) | ||
->hasField('embedded'); | ||
|
||
$this->assertTrue($isFieldMapped); | ||
} | ||
|
||
/** | ||
* @group DDC-6460 | ||
*/ | ||
public function testInlineEmbeddableProxyInitialization() | ||
{ | ||
$entity = new DDC6460Entity(); | ||
$entity->id = 1; | ||
$entity->embedded = new DDC6460Embeddable(); | ||
$entity->embedded->field = 'test'; | ||
$this->_em->persist($entity); | ||
|
||
$second = new DDC6460ParentEntity(); | ||
$second->id = 1; | ||
$second->lazyLoaded = $entity; | ||
$this->_em->persist($second); | ||
$this->_em->flush(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why two flush operations? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I've added cascade persist in order to remove one flush There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks! |
||
|
||
$this->_em->clear(); | ||
|
||
$secondEntityWithLazyParameter = $this->_em->getRepository(DDC6460ParentEntity::class)->findOneById(1); | ||
|
||
$this->assertInstanceOf(Proxy::class, $secondEntityWithLazyParameter->lazyLoaded); | ||
$this->assertInstanceOf(DDC6460Entity::class, $secondEntityWithLazyParameter->lazyLoaded); | ||
$this->assertFalse($secondEntityWithLazyParameter->lazyLoaded->__isInitialized()); | ||
$this->assertEquals($secondEntityWithLazyParameter->lazyLoaded->embedded, $entity->embedded); | ||
$this->assertTrue($secondEntityWithLazyParameter->lazyLoaded->__isInitialized()); | ||
} | ||
} | ||
|
||
/** | ||
* @Embeddable() | ||
*/ | ||
class DDC6460Embeddable | ||
{ | ||
/** @Column(type="string") */ | ||
public $field; | ||
} | ||
|
||
/** | ||
* @Entity() | ||
*/ | ||
class DDC6460Entity | ||
{ | ||
/** | ||
* @Id | ||
* @GeneratedValue(strategy = "NONE") | ||
* @Column(type = "integer") | ||
*/ | ||
public $id; | ||
|
||
/** @Embedded(class = "DDC6460Embeddable") */ | ||
public $embedded; | ||
} | ||
|
||
/** | ||
* @Entity() | ||
*/ | ||
class DDC6460ParentEntity | ||
{ | ||
/** | ||
* @Id | ||
* @GeneratedValue(strategy = "NONE") | ||
* @Column(type = "integer") | ||
*/ | ||
public $id; | ||
|
||
/** @ManyToOne(targetEntity = "DDC6460Entity", fetch="EXTRA_LAZY", cascade={"persist"}) */ | ||
public $lazyLoaded; | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This test should probably be on the class metadata tests
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've added similar test there