Skip to content
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

Merged
merged 2 commits into from
Jun 1, 2017

Conversation

mkosiedowski
Copy link
Contributor

This fixes #6460

$this->_em->getClassMetadata(DDC6460ParentEntity::class),
]
);
} catch (\Exception $e) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please only catch schemaexception

->getClassMetadata(DDC6460Entity::class)
->hasField('embedded');

$this->assertTrue($isFieldMapped);
Copy link
Member

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

Copy link
Contributor Author

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


$proxy = $this->_em->getRepository(DDC6460ParentEntity::class)->findOneById(1);

$this->assertNotNull($proxy->lazyLoaded->embedded);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use self::assertInstanceOf()

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would also check the value of field after this call

$second->id = 1;
$second->lazyLoaded = $entity;
$this->_em->persist($second);
$this->_em->flush();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why two flush operations?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added cascade persist in order to remove one flush

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!


$this->_em->clear();

$proxy = $this->_em->getRepository(DDC6460ParentEntity::class)->findOneById(1);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not a proxy here: please add assertions to verify if it is a proxy, and if it is loaded

$second->id = 1;
$second->lazyLoaded = $entity;
$this->_em->persist($second);
$this->_em->flush();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@Ocramius Ocramius added the Bug label Jun 1, 2017
@Ocramius Ocramius added this to the 2.6.0 milestone Jun 1, 2017
@Ocramius
Copy link
Member

Ocramius commented Jun 1, 2017

LGTM! 👍

Note that I'm not changing this for 2.5.x, because there's a subtle behavioral change when this API is used when looping over fields. It will land in 2.6.0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Getting embeddable should trigger entity initalization
2 participants