[WIP] Nullable embedded objects. #1275
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
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
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
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 |
|---|---|---|
|
|
@@ -2564,6 +2564,8 @@ public function createEntity($className, array $data, &$hints = array()) | |
| return $entity; | ||
| } | ||
|
|
||
| $this->removeNullableEmbeddedReferences($data, $class); | ||
|
|
||
| foreach ($data as $field => $value) { | ||
| if (isset($class->fieldMappings[$field])) { | ||
| $class->reflFields[$field]->setValue($entity, $value); | ||
|
|
@@ -2767,6 +2769,34 @@ public function createEntity($className, array $data, &$hints = array()) | |
| return $entity; | ||
| } | ||
|
|
||
| /** | ||
| * @param array $data | ||
| * @param ClassMetadata $class | ||
| */ | ||
| private function removeNullableEmbeddedReferences(array &$data, ClassMetadata $class) | ||
|
There was a problem hiding this comment. @Ocramius I've tried to keep the things simple here, but if we have a huge amount of data or a large result set I think we might have a little delay to process. I just don't have any idea to improve this =/ There was a problem hiding this comment. What about something like this: public function createEntity($className, array $data, &$hints = array())
{
// ...
//$this->removeNullableEmbeddedReferences($data, $class);
foreach ($data as $field => $value) {
if (null === $value && $this->isNullableEmbeddedField($class, $field)) {
continue;
}
if (isset($class->fieldMappings[$field])) {
$class->reflFields[$field]->setValue($entity, $value);
}
}
// ...
}
private function isNullableEmbeddedField(ClassMetadata $class, $field)
{
return isset(
$class->fieldMappings[$field]['declaredField'],
$class->embeddedClasses[$name = $class->fieldMappings[$field]['declaredField']]
) ? true === $class->embeddedClasses[$name]['nullable'] : false;
}There was a problem hiding this comment. Thanks @1ed, its a good alternative. I'll play a lit bit now 😄 There was a problem hiding this comment. @Ocramius, @1ed and @beberlei what do you think to extract that logic from I thought something like |
||
| { | ||
| $nullables = array_keys( | ||
| array_filter( | ||
| $class->embeddedClasses, | ||
| function (array $embedded) { | ||
| return $embedded['nullable'] === true; | ||
| } | ||
| ) | ||
| ); | ||
|
|
||
| if (empty($nullables)) { | ||
| return; | ||
| } | ||
|
|
||
| foreach ($data as $field => $value) { | ||
| $property = substr($field, 0, strpos($field, '.')); | ||
|
|
||
| if (in_array($property, $nullables) && $value === null) { | ||
| unset($data[$field]); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @return void | ||
| */ | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -19,6 +19,7 @@ public function setUp() | |
| $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC93Car'), | ||
| $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3027Animal'), | ||
| $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3027Dog'), | ||
| $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC93Event'), | ||
| )); | ||
| } catch(\Exception $e) { | ||
| } | ||
|
|
@@ -242,6 +243,48 @@ public function testThrowsExceptionOnInfiniteEmbeddableNesting($embeddableClassN | |
| )); | ||
| } | ||
|
|
||
| public function testCRUDOfNullableEmbedded() | ||
|
There was a problem hiding this comment. @lcobucci consider splitting this test into smaller tests depending on each other via There was a problem hiding this comment. Perfect, I followed the other test case (testCRUD). But using There was a problem hiding this comment. I'll also change the name of the classes that I've created on that file to match the issue on JIRA (DDC-3529) |
||
| { | ||
| $event = new DDC93Event(); | ||
| $event->name = 'PHP Conference'; | ||
| $event->country = new DDC93Country('Brazil'); | ||
| $event->period = new DDC93DateInterval(new \DateTime('2015-01-20 08:00:00'), new \DateTime('2015-01-23 19:00:00')); | ||
|
|
||
| // 1. check saving value objects works | ||
| $this->_em->persist($event); | ||
| $this->_em->flush(); | ||
|
|
||
| $this->_em->clear(); | ||
|
|
||
| // 2. check loading value objects works | ||
| $event = $this->_em->find(DDC93Event::CLASSNAME, $event->id); | ||
|
|
||
| $this->assertEquals('PHP Conference', $event->name); | ||
| $this->assertEquals('Brazil', $event->country->name); | ||
| $this->assertEquals('2015-01-20 08:00:00', $event->period->begin->format('Y-m-d H:i:s')); | ||
| $this->assertEquals('2015-01-23 19:00:00', $event->period->end->format('Y-m-d H:i:s')); | ||
| $this->assertNull($event->submissions); | ||
|
|
||
| // 3. check changing value objects works | ||
| $event->submissions = new DDC93DateInterval(new \DateTime('2014-11-20 08:00:00'), new \DateTime('2014-12-23 19:00:00')); | ||
|
|
||
| $this->_em->persist($event); | ||
| $this->_em->flush(); | ||
| $this->_em->clear(); | ||
|
|
||
| $event = $this->_em->find(DDC93Event::CLASSNAME, $event->id); | ||
|
|
||
| $this->assertEquals('2014-11-20 08:00:00', $event->submissions->begin->format('Y-m-d H:i:s')); | ||
| $this->assertEquals('2014-12-23 19:00:00', $event->submissions->end->format('Y-m-d H:i:s')); | ||
|
|
||
| // 4. check deleting works | ||
| $eventId = $event->id;; | ||
| $this->_em->remove($event); | ||
| $this->_em->flush(); | ||
|
|
||
| $this->assertNull($this->_em->find(DDC93Event::CLASSNAME, $eventId)); | ||
| } | ||
|
|
||
| public function getInfiniteEmbeddableNestingData() | ||
| { | ||
| return array( | ||
|
|
@@ -279,6 +322,47 @@ public function __construct($name = null, DDC93Address $address = null) | |
| } | ||
| } | ||
|
|
||
| /** | ||
| * @Embeddable | ||
| */ | ||
| class DDC93DateInterval | ||
| { | ||
| /** @Column(type = "datetime") */ | ||
| public $begin; | ||
|
|
||
| /** @Column(type = "datetime") */ | ||
| public $end; | ||
|
|
||
| public function __construct(\DateTime $begin, \DateTime $end) | ||
| { | ||
| $this->begin = $begin; | ||
| $this->end = $end; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @Entity | ||
| */ | ||
| class DDC93Event | ||
| { | ||
| const CLASSNAME = __CLASS__; | ||
|
|
||
| /** @Id @GeneratedValue @Column(type="integer") */ | ||
| public $id; | ||
|
|
||
| /** @Column(type = "string") */ | ||
| public $name; | ||
|
|
||
| /** @Embedded(class = "DDC93DateInterval") */ | ||
| public $period; | ||
|
|
||
| /** @Embedded(class = "DDC93DateInterval", nullable = true) */ | ||
| public $submissions; | ||
|
|
||
| /** @Embedded(class = "DDC93Country", nullable = false) */ | ||
| public $country; | ||
| } | ||
|
|
||
| /** | ||
| * @Embeddable | ||
| */ | ||
|
|
||
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Is that extra parameters really required? Can't you use
$this->embeddedClasses[$property]['nullable']in this method instead?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.
You're right, my mistake.