@@ -32,30 +32,25 @@ function sortingFirstFile(mixed $tree1, mixed $tree2): mixed
32
32
array_keys ($ tree1 ),
33
33
function ($ acc , $ key ) use ($ tree1 , $ tree2 ) {
34
34
$ diff = [...$ acc ];
35
- $ status = [];
36
35
37
36
if (!array_key_exists ($ key , $ tree2 )) {
38
- $ status [$ key ]['status ' ] = 'remove ' ;
39
- $ diff = array_merge ($ diff , $ status );
37
+ $ diff [$ key ]['status ' ] = 'remove ' ;
40
38
$ innerContent = sortingFirstFile ($ tree1 [$ key ], $ tree1 [$ key ]);
41
39
$ diff [$ key ]['value ' ] = $ innerContent ;
42
40
return $ diff ;
43
41
}
44
42
45
43
if ($ tree1 [$ key ] === $ tree2 [$ key ]) {
46
- $ status [$ key ]['status ' ] = 'unchanged ' ;
47
- $ diff = array_merge ($ diff , $ status );
44
+ $ diff [$ key ]['status ' ] = 'unchanged ' ;
48
45
$ diff [$ key ]['value ' ] = sortingFirstFile ($ tree1 [$ key ], $ tree1 [$ key ]);
49
46
return $ diff ;
50
47
}
51
48
52
49
if (is_array ($ tree1 [$ key ]) && is_array ($ tree2 [$ key ])) {
53
- $ status [$ key ]['status ' ] = 'changed ' ;
54
- $ diff = array_merge ($ diff , $ status );
50
+ $ diff [$ key ]['status ' ] = 'changed ' ;
55
51
$ diff [$ key ]['value ' ] = sortingFirstFile ($ tree1 [$ key ], $ tree2 [$ key ]);
56
52
} else {
57
- $ status [$ key ]['status ' ] = 'remove ' ;
58
- $ diff = array_merge ($ diff , $ status );
53
+ $ diff [$ key ]['status ' ] = 'remove ' ;
59
54
$ diff [$ key ]['beforeValue ' ] = sortingFirstFile ($ tree1 [$ key ], $ tree1 [$ key ]);
60
55
$ diff [$ key ]['afterValue ' ] = sortingFirstFile ($ tree2 [$ key ], $ tree2 [$ key ]);
61
56
}
0 commit comments