RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-02 21:41:45 +03:00
Code Issues Projects Releases Wiki Activity

1. merge conditions

Browse Source 
2. convert `if` to `condition`
This commit is contained in:
ReenExe 2016-07-03 00:05:31 +03:00
parent b108a2af52
commit a81458a0aa
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
View File

@ -1597,8 +1597,8 @@ class ClassMetadataInfo implements ClassMetadata
foreach ($mapping['joinColumns'] as &$joinColumn) { foreach ($mapping['joinColumns'] as &$joinColumn) {
if ($mapping['type'] === self::ONE_TO_ONE && ! $this->isInheritanceTypeSingleTable()) { if ($mapping['type'] === self::ONE_TO_ONE && ! $this->isInheritanceTypeSingleTable()) {
if (count($mapping['joinColumns']) == 1) { if (count($mapping['joinColumns']) === 1) {
if ( ! isset($mapping['id']) || ! $mapping['id']) { if (empty($mapping['id'])) {
$joinColumn['unique'] = true; $joinColumn['unique'] = true;
} }
} else { } else {
@ -1643,8 +1643,8 @@ class ClassMetadataInfo implements ClassMetadata
$mapping['targetToSourceKeyColumns'] = array_flip($mapping['sourceToTargetKeyColumns']); $mapping['targetToSourceKeyColumns'] = array_flip($mapping['sourceToTargetKeyColumns']);
} }
$mapping['orphanRemoval'] = isset($mapping['orphanRemoval']) ? (bool) $mapping['orphanRemoval'] : false; $mapping['orphanRemoval'] = isset($mapping['orphanRemoval']) && $mapping['orphanRemoval'];
$mapping['isCascadeRemove'] = $mapping['orphanRemoval'] ? true : $mapping['isCascadeRemove']; $mapping['isCascadeRemove'] = $mapping['orphanRemoval'] || $mapping['isCascadeRemove'];
if ($mapping['orphanRemoval']) { if ($mapping['orphanRemoval']) {
unset($mapping['unique']); unset($mapping['unique']);