Allow using objects as discriminators #6141
Conversation
lcobucci
force-pushed
the
object-as-discriminators
branch
from
85da025
to
f5c899d
Compare
| { | ||
| parent::setUp(); | ||
|
|
||
| Type::addType(GH6141PeopleType::NAME, __NAMESPACE__ . '\\GH6141PeopleType'); |
There was a problem hiding this comment.
Can you please use ::class here?
| Type::addType(GH6141PeopleType::NAME, __NAMESPACE__ . '\\GH6141PeopleType'); | ||
|
|
||
| $this->_schemaTool->createSchema(array( | ||
| $this->_em->getClassMetadata(__NAMESPACE__ . '\\GH6141Person'), |
|
|
||
| $this->_schemaTool->createSchema(array( | ||
| $this->_em->getClassMetadata(__NAMESPACE__ . '\\GH6141Person'), | ||
| $this->_em->getClassMetadata(__NAMESPACE__ . '\\GH6141Boss'), |
| $this->_schemaTool->createSchema(array( | ||
| $this->_em->getClassMetadata(__NAMESPACE__ . '\\GH6141Person'), | ||
| $this->_em->getClassMetadata(__NAMESPACE__ . '\\GH6141Boss'), | ||
| $this->_em->getClassMetadata(__NAMESPACE__ . '\\GH6141Employee'), |
| )); | ||
| } | ||
|
|
||
| public function testEnumDiscriminatorsShouldBeConvertedToString() |
There was a problem hiding this comment.
One last thing to add to this test: asserting that the discriminator is an object.
There was a problem hiding this comment.
How would I do that? The retrieved object doesn't have the discriminator and the entity metadata contains it as a string
There was a problem hiding this comment.
Probably via metadata and $metadata->getDiscriminatorValue(), or by hydrating a row as array.
| $this->_em->flush(); | ||
| $this->_em->clear(); | ||
|
|
||
| $query = $this->_em->createQueryBuilder() |
There was a problem hiding this comment.
findOneBy() instead - simpler here, as we don't go through the entire DQL scenarios
There was a problem hiding this comment.
With that findOneBy() would use the SimpleObjectHydrator instead of the ObjectHydrator.
There was a problem hiding this comment.
Can you add a comment about that then?
| return new self($value); | ||
| } | ||
|
|
||
| public static function isValid($valid) |
There was a problem hiding this comment.
Remove or make private, since it's not used in the examples
|
|
||
| private $value; | ||
|
|
||
| public static function get($value) |
There was a problem hiding this comment.
Docblocks for types here (methods/properties)
| * @InheritanceType("JOINED") | ||
| * @DiscriminatorColumn(name="discr", type="gh6141people") | ||
| * @DiscriminatorMap({ | ||
| * "boss" = "Doctrine\Tests\ORM\Functional\Ticket\GH6141Boss", |
There was a problem hiding this comment.
Can use GH6141Boss::class here, instead of a string
| * @DiscriminatorColumn(name="discr", type="gh6141people") | ||
| * @DiscriminatorMap({ | ||
| * "boss" = "Doctrine\Tests\ORM\Functional\Ticket\GH6141Boss", | ||
| * "employee" = "Doctrine\Tests\ORM\Functional\Ticket\GH6141Employee" |
There was a problem hiding this comment.
Can use GH6141Employee::class here, instead of a string
lcobucci
force-pushed
the
object-as-discriminators
branch
from
f5c899d
to
bc3d209
Compare
|
|
||
| Type::addType(GH6141PeopleType::NAME, GH6141PeopleType::class); | ||
|
|
||
| $this->_schemaTool->createSchema(array( |
There was a problem hiding this comment.
I'll just convert this to short-array notation
lcobucci
force-pushed
the
object-as-discriminators
branch
from
bc3d209
to
1b39cd8
Compare
|
Aaaaaaand merged! Thanks @lcobucci! 👍 |
@Ocramius was too eager to merge stuff Related to: doctrine#6141
@Ocramius this is the small change to make it work on
master.The test passes without any change on
2.5-xso it looks like we have a small break onmasterwhich is fixed with this changeset.