@@ -76,19 +76,17 @@ function sortingSecondFile(mixed $tree2, mixed $tree1): mixed
76
76
return array_reduce (
77
77
array_keys ($ tree2 ),
78
78
function ($ acc , $ key ) use ($ tree1 , $ tree2 ) {
79
- $ diff = [...$ acc ];
80
-
81
79
if (!array_key_exists ($ key , $ tree1 )) {
82
- $ value [$ key] ['value ' ] = getArrayContent ($ tree2 [$ key ]);
83
- return array_merge ($ diff , $ value );
80
+ $ value = [$ key => ['value ' => getArrayContent ($ tree2 [$ key ])]] ;
81
+ return array_merge ($ acc , $ value );
84
82
}
85
83
86
84
if (is_array ($ tree2 [$ key ]) && is_array ($ tree1 [$ key ])) {
87
- $ value [$ key] ['value ' ] = sortingSecondFile ($ tree2 [$ key ], $ tree1 [$ key ]);
88
- return array_merge ($ diff , $ value );
85
+ $ value = [$ key => ['value ' => sortingSecondFile ($ tree2 [$ key ], $ tree1 [$ key ])]] ;
86
+ return array_merge ($ acc , $ value );
89
87
}
90
88
91
- return $ diff ;
89
+ return $ acc ;
92
90
},
93
91
[]
94
92
);
@@ -101,32 +99,23 @@ function getArrayContent(mixed $tree): mixed
101
99
}
102
100
103
101
return array_reduce (array_keys ($ tree ), function ($ acc , $ key ) use ($ tree ) {
104
- $ diff = [...$ acc ];
105
- $ value [$ key ]['value ' ] = getArrayContent ($ tree [$ key ]);
106
- return array_merge ($ diff , $ value );
102
+ $ value = [$ key => ['value ' => getArrayContent ($ tree [$ key ])]];
103
+ return array_merge ($ acc , $ value );
107
104
}, []);
108
105
}
109
106
110
107
function sortArrayByKeysRecursive (array $ tree ): array
111
108
{
112
- $ keysSorted = sort (
113
- array_keys ($ tree ),
114
- function ($ left , $ right ) {
115
- return strcmp ($ left , $ right );
116
- },
117
- true
118
- );
109
+ $ keysSorted = sort (array_keys ($ tree ), fn ($ left , $ right ) => strcmp ($ left , $ right ), true );
119
110
120
111
return array_reduce ($ keysSorted , function ($ acc , $ key ) use ($ tree ) {
121
- $ diff = [...$ acc ];
122
-
123
112
if (!is_array ($ tree [$ key ])) {
124
- $ diffValue [$ key] = $ tree [$ key ];
125
- return array_merge ($ diff , $ diffValue );
113
+ $ value = [$ key => $ tree [$ key] ];
114
+ return array_merge ($ acc , $ value );
126
115
}
127
116
128
117
$ innerContent = sortArrayByKeysRecursive ($ tree [$ key ]);
129
118
$ diffContent [$ key ] = $ innerContent ;
130
- return array_merge ($ diff , $ diffContent );
119
+ return array_merge ($ acc , $ diffContent );
131
120
}, []);
132
121
}
0 commit comments