|
@@ -87,7 +87,7 @@ discard block |
|
|
block discarded – undo |
|
87
|
87
|
$discrColumnName = $metaMappingDiscrColumnName; |
|
88
|
88
|
} |
|
89
|
89
|
|
|
90
|
|
- if (! isset($sqlResult[$discrColumnName])) { |
|
|
90
|
+ if ( ! isset($sqlResult[$discrColumnName])) { |
|
91
|
91
|
throw HydrationException::missingDiscriminatorColumn($entityName, $discrColumnName, key($this->rsm->aliasMap)); |
|
92
|
92
|
} |
|
93
|
93
|
|
|
@@ -97,7 +97,7 @@ discard block |
|
|
block discarded – undo |
|
97
|
97
|
|
|
98
|
98
|
$discrMap = $this->class->discriminatorMap; |
|
99
|
99
|
|
|
100
|
|
- if (! isset($discrMap[$sqlResult[$discrColumnName]])) { |
|
|
100
|
+ if ( ! isset($discrMap[$sqlResult[$discrColumnName]])) { |
|
101
|
101
|
throw HydrationException::invalidDiscriminatorValue($sqlResult[$discrColumnName], array_keys($discrMap)); |
|
102
|
102
|
} |
|
103
|
103
|
|
|
@@ -115,7 +115,7 @@ discard block |
|
|
block discarded – undo |
|
115
|
115
|
|
|
116
|
116
|
$cacheKeyInfo = $this->hydrateColumnInfo($column); |
|
117
|
117
|
|
|
118
|
|
- if (! $cacheKeyInfo) { |
|
|
118
|
+ if ( ! $cacheKeyInfo) { |
|
119
|
119
|
continue; |
|
120
|
120
|
} |
|
121
|
121
|
|
|
@@ -131,7 +131,7 @@ discard block |
|
|
block discarded – undo |
|
131
|
131
|
$fieldName = $cacheKeyInfo['fieldName']; |
|
132
|
132
|
|
|
133
|
133
|
// Prevent overwrite in case of inherit classes using same property name (See AbstractHydrator) |
|
134
|
|
- if (! isset($data[$fieldName]) || ! $valueIsNull) { |
|
|
134
|
+ if ( ! isset($data[$fieldName]) || ! $valueIsNull) { |
|
135
|
135
|
// If we have inheritance in resultset, make sure the field belongs to the correct class |
|
136
|
136
|
if (isset($cacheKeyInfo['discriminatorValues']) && ! in_array($discrColumnValue, $cacheKeyInfo['discriminatorValues'], true)) { |
|
137
|
137
|
continue; |