Fix DDC-1690 #541

Merged
merged 3 commits into from Dec 22, 2012

Projects

None yet

4 participants

@PSchwisow

Added the lines suggested by the original reporter.

@PSchwisow PSchwisow Fix DDC-1690
Added the lines suggested by the original reporter.
5627993
@doctrinebot
Collaborator

Hello,

thank you for positing this Pull Request. I have automatically opened an issue on our Jira Bug Tracker for you with the details of this Pull-Request. See the Link:

http://doctrine-project.org/jira/browse/DDC-2211

@FabioBatSilva FabioBatSilva and 1 other commented on an outdated diff Dec 21, 2012
lib/Doctrine/ORM/UnitOfWork.php
@@ -2573,6 +2573,9 @@ public function createEntity($className, array $data, &$hints = array())
$newValueOid = spl_object_hash($newValue);
$this->entityIdentifiers[$newValueOid] = $associatedId;
$this->identityMap[$targetClass->rootEntityName][$relatedIdHash] = $newValue;
+ if ($newValue instanceof NotifyPropertyChanged) {
@FabioBatSilva
FabioBatSilva Dec 21, 2012 Doctrine member

Missing line before conditional expression

@PSchwisow
PSchwisow Dec 21, 2012

I'm not sure what you mean about a missing line.

@FabioBatSilva
FabioBatSilva Dec 21, 2012 Doctrine member

you should keep a empty line before if

<?php
$this->identityMap[$targetClass->rootEntityName][$relatedIdHash] = $newValue;
// empty line
if ($newValue instanceof NotifyPropertyChanged) {
    $newValue->addPropertyChangedListener($this);
}
@FabioBatSilva
Member

Hi @PSchwisow
Could you add a test case please ?

@beberlei beberlei merged commit 015771f into doctrine:master Dec 22, 2012

1 check passed

Details default The Travis build passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment