File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ final class Type implements Schema
2828 private array $ range = [null , null ];
2929 private ?string $ pattern = null ;
3030 private bool $ merge = false ;
31- private ? MergeMode $ mergeMode = null ;
31+ private MergeMode $ mergeMode = MergeMode::AppendKeys ;
3232
3333
3434 public function __construct (string $ type )
@@ -148,7 +148,7 @@ public function merge(mixed $value, mixed $base): mixed
148148 return $ value ;
149149 }
150150
151- if (is_array ($ value ) && is_array ($ base ) && ( $ this -> itemsValue || $ this -> mergeMode ) ) {
151+ if (is_array ($ value ) && is_array ($ base )) {
152152 $ index = $ this ->mergeMode === MergeMode::OverwriteKeys ? null : 0 ;
153153 foreach ($ value as $ key => $ val ) {
154154 if ($ key === $ index ) {
@@ -164,7 +164,7 @@ public function merge(mixed $value, mixed $base): mixed
164164 return $ base ;
165165 }
166166
167- return Helpers:: merge ( $ value, $ base );
167+ return $ value === null && is_array ( $ base ) ? $ base : $ value ;
168168 }
169169
170170
You can’t perform that action at this time.
0 commit comments