Skip to content

Commit

Permalink
Fixes for coding standard autotests[F
Browse files Browse the repository at this point in the history
  • Loading branch information
Pascal Vilarem committed Oct 14, 2019
1 parent d768742 commit 8b66e05
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,9 @@ public function loadMetadataForClass(
$associationMapping['fieldName'] = $this->getFieldNameForColumn($manyTable->getName(), current($otherFk->getColumns()), true);
$associationMapping['targetEntity'] = $this->getClassNameForTable($otherFk->getForeignTableName());

if (isset($metadata->fieldMappings[$associationMapping['fieldName']])
|| isset($metadata->associationMappings[$associationMapping['fieldName']])) {
if (isset($metadata->fieldMappings[$associationMapping['fieldName']]) || isset($metadata->associationMappings[$associationMapping['fieldName']])) {
$ii=2;
while ( isset($metadata->fieldMappings[$associationMapping['fieldName'].(string)$ii]) ||
isset($metadata->associationMappings[$associationMapping['fieldName'].(string)$ii])) {
while ( isset($metadata->fieldMappings[$associationMapping['fieldName'].(string)$ii]) || isset($metadata->associationMappings[$associationMapping['fieldName'].(string)$ii])) {
$ii++;
}
$associationMapping['fieldName'] .= (string)$ii;
Expand Down

0 comments on commit 8b66e05

Please sign in to comment.