@@ -26,10 +26,10 @@ |
||
| 26 | 26 | $values = array_values($entry->getGroup()->getKeys()); |
| 27 | 27 | $keys = sprintf('[%s]', implode('][', $values)); |
| 28 | 28 | |
| 29 | - if($entry instanceof \Iterator) { |
|
| 29 | + if ($entry instanceof \Iterator) { |
|
| 30 | 30 | $entry = FlatDumper::toArray($entry); |
| 31 | 31 | } |
| 32 | - else if($entry instanceof Aggregate) { |
|
| 32 | + else if ($entry instanceof Aggregate) { |
|
| 33 | 33 | $entry = $entry->getData(); |
| 34 | 34 | } |
| 35 | 35 | |
@@ -28,8 +28,7 @@ |
||
| 28 | 28 | |
| 29 | 29 | if($entry instanceof \Iterator) { |
| 30 | 30 | $entry = FlatDumper::toArray($entry); |
| 31 | - } |
|
| 32 | - else if($entry instanceof Aggregate) { |
|
| 31 | + } else if($entry instanceof Aggregate) { |
|
| 33 | 32 | $entry = $entry->getData(); |
| 34 | 33 | } |
| 35 | 34 | |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | */ |
| 24 | 24 | public static function merge(&$origin, $merge, array $saveKeys = [], $idKey = null) |
| 25 | 25 | { |
| 26 | - $checkMergeType = function ($a) { |
|
| 26 | + $checkMergeType = function($a) { |
|
| 27 | 27 | if ($a instanceof Aggregate) { |
| 28 | 28 | return 16; |
| 29 | 29 | } elseif ($a instanceof PreAggregate) { |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | if (null === $dataOrigin[$key]) { |
| 130 | 130 | $dataOrigin[$key] = []; |
| 131 | 131 | } |
| 132 | - elseif(!is_array($dataOrigin[$key])) { |
|
| 132 | + elseif (!is_array($dataOrigin[$key])) { |
|
| 133 | 133 | $dataOrigin[$key] = array($dataOrigin[$key]); |
| 134 | 134 | } |
| 135 | 135 | $dataOrigin[$key][] = $value; |
@@ -128,8 +128,7 @@ |
||
| 128 | 128 | case $mergeable && $operation: |
| 129 | 129 | if (null === $dataOrigin[$key]) { |
| 130 | 130 | $dataOrigin[$key] = []; |
| 131 | - } |
|
| 132 | - elseif(!is_array($dataOrigin[$key])) { |
|
| 131 | + } elseif(!is_array($dataOrigin[$key])) { |
|
| 133 | 132 | $dataOrigin[$key] = array($dataOrigin[$key]); |
| 134 | 133 | } |
| 135 | 134 | $dataOrigin[$key][] = $value; |