Merge pull request #10704 from greg0ire/drop-useless-block

greg0ire · web-flow · commit 4e137f77a5dc · 2023-05-16T08:19:42.000+02:00
Remove unreachable piece of code
diff --git a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
@@ -458,9 +458,6 @@ protected function hydrateRowData(array $row, array &$result)
                                         $targetClass->reflFields[$inverseAssoc['fieldName']]->setValue($element, $parentObject);
                                         $this->_uow->setOriginalEntityProperty(spl_object_id($element), $inverseAssoc['fieldName'], $parentObject);
                                     }
-                                } elseif ($parentClass === $targetClass && $relation['mappedBy']) {
-                                    // Special case: bi-directional self-referencing one-one on the same class
-                                    $targetClass->reflFields[$relationField]->setValue($element, $parentObject);
                                 }
                             } else {
                                 // For sure bidirectional, as there is no inverse side in unidirectional mappings
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -485,7 +485,6 @@
       <code>getValue</code>
       <code>setValue</code>
       <code>setValue</code>
-      <code>setValue</code>
     </PossiblyNullReference>
     <PossiblyUndefinedArrayOffset>
       <code><![CDATA[$class->associationMappings[$class->identifier[0]]['joinColumns']]]></code>

Original file line number	Diff line number	Diff line change
`@@ -458,9 +458,6 @@ protected function hydrateRowData(array $row, array &$result)`
`458`	`458`	`$targetClass->reflFields[$inverseAssoc['fieldName']]->setValue($element, $parentObject);`
`459`	`459`	`$this->_uow->setOriginalEntityProperty(spl_object_id($element), $inverseAssoc['fieldName'], $parentObject);`
`460`	`460`	`}`
`461`		`- } elseif ($parentClass === $targetClass && $relation['mappedBy']) {`
`462`		`- // Special case: bi-directional self-referencing one-one on the same class`
`463`		`- $targetClass->reflFields[$relationField]->setValue($element, $parentObject);`
`464`	`461`	`}`
`465`	`462`	`} else {`
`466`	`463`	`// For sure bidirectional, as there is no inverse side in unidirectional mappings`