|
@@ -147,7 +147,7 @@ discard block |
|
|
block discarded – undo |
|
147
|
147
|
$worker = new $cfg[ RB::KEY_HANDLER ](); |
|
148
|
148
|
$result = $worker->convert($data, $cfg); |
|
149
|
149
|
$result = $cfg[ RB::KEY_KEY ] === null ? $result : [$cfg[ RB::KEY_KEY ] => $result]; |
|
150
|
|
- } |
|
|
150
|
+ } |
|
151
|
151
|
|
|
152
|
152
|
if ($result === null && \is_array($data)) { |
|
153
|
153
|
$cfg = $this->getPrimitiveMappingConfigOrThrow($data); |
|
@@ -225,7 +225,7 @@ discard block |
|
|
block discarded – undo |
|
225
|
225
|
"Missing '{$key_name}' entry in '{$class_name}' class mapping config."); |
|
226
|
226
|
} |
|
227
|
227
|
|
|
228
|
|
- Validator::assertIsType(RB::KEY_KEY, $class_config[$key_name], $allowed_types); |
|
|
228
|
+ Validator::assertIsType(RB::KEY_KEY, $class_config[$key_name], $allowed_types); |
|
229
|
229
|
} |
|
230
|
230
|
} |
|
231
|
231
|
} |
Please login to merge, or discard this patch.