File tree Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -674,11 +674,11 @@ public static function expand(array $data, $separator = '.') {
674
674
while (!empty ($ stack )) {
675
675
foreach ($ stack as $ curKey => &$ curMerge ) {
676
676
foreach ($ curMerge [0 ] as $ key => &$ val ) {
677
- if (!empty ($ curMerge [1 ][$ key ]) && (array )$ curMerge [1 ][$ key ]===$ curMerge [1 ][$ key ] && (array )$ val ===$ val ) {
677
+ if (!empty ($ curMerge [1 ][$ key ]) && (array )$ curMerge [1 ][$ key ] === $ curMerge [1 ][$ key ] && (array )$ val === $ val ) {
678
678
$ stack [] = array (&$ val , &$ curMerge [1 ][$ key ]);
679
- } elseif ((int )$ key ===$ key && isset ($ curMerge [1 ][$ key ])) {
679
+ } elseif ((int )$ key === $ key && isset ($ curMerge [1 ][$ key ])) {
680
680
$ curMerge [1 ][] = $ val ;
681
- } else {
681
+ } else {
682
682
$ curMerge [1 ][$ key ] = $ val ;
683
683
}
684
684
}
@@ -716,11 +716,11 @@ public static function merge(array $data, $merge) {
716
716
while (!empty ($ stack )) {
717
717
foreach ($ stack as $ curKey => &$ curMerge ) {
718
718
foreach ($ curMerge [0 ] as $ key => &$ val ) {
719
- if (!empty ($ curMerge [1 ][$ key ]) && (array )$ curMerge [1 ][$ key ]===$ curMerge [1 ][$ key ] && (array )$ val ===$ val ) {
719
+ if (!empty ($ curMerge [1 ][$ key ]) && (array )$ curMerge [1 ][$ key ] === $ curMerge [1 ][$ key ] && (array )$ val === $ val ) {
720
720
$ stack [] = array (&$ val , &$ curMerge [1 ][$ key ]);
721
- } elseif ((int )$ key ===$ key && isset ($ curMerge [1 ][$ key ])) {
721
+ } elseif ((int )$ key === $ key && isset ($ curMerge [1 ][$ key ])) {
722
722
$ curMerge [1 ][] = $ val ;
723
- } else {
723
+ } else {
724
724
$ curMerge [1 ][$ key ] = $ val ;
725
725
}
726
726
}
You can’t perform that action at this time.
0 commit comments