@@ -53,7 +53,7 @@ public function execute(\Iterator $iterator): array
53
53
$ pathElements = explode ("/ " , $ category ->getPath ());
54
54
$ this ->iteratingCategory = $ category ;
55
55
56
- $ currentLevelTree = $ this ->generateLevelTree ($ pathElements , self ::START_CATEGORY_FETCH_LEVEL );
56
+ $ currentLevelTree = $ this ->explodePathToArray ($ pathElements , self ::START_CATEGORY_FETCH_LEVEL );
57
57
if (empty ($ tree )) {
58
58
$ tree = $ currentLevelTree ;
59
59
}
@@ -64,7 +64,7 @@ public function execute(\Iterator $iterator): array
64
64
}
65
65
66
66
/**
67
- * Merge together complex categories tree
67
+ * Merge together complex categories trees
68
68
*
69
69
* @param array $tree1
70
70
* @param array $tree2
@@ -86,23 +86,23 @@ private function mergeCategoriesTrees(array &$tree1, array &$tree2): array
86
86
/**
87
87
* Recursive method to generate tree for one category path
88
88
*
89
- * @param $elements
89
+ * @param $pathElements
90
90
* @param $index
91
91
* @return array
92
92
*/
93
- private function generateLevelTree ( $ elements , $ index ): array
93
+ private function explodePathToArray ( $ pathElements , $ index ): array
94
94
{
95
95
96
96
$ tree = [];
97
- $ tree [$ elements [$ index ]]['id ' ] = $ elements [$ index ];
98
- if ($ index === count ($ elements ) - 1 ) {
99
- $ tree [$ elements [$ index ]] = $ this ->categoryHydrator ->hydrateCategory ($ this ->iteratingCategory );
100
- $ tree [$ elements [$ index ]]['model ' ] = $ this ->iteratingCategory ;
97
+ $ tree [$ pathElements [$ index ]]['id ' ] = $ pathElements [$ index ];
98
+ if ($ index === count ($ pathElements ) - 1 ) {
99
+ $ tree [$ pathElements [$ index ]] = $ this ->categoryHydrator ->hydrateCategory ($ this ->iteratingCategory );
100
+ $ tree [$ pathElements [$ index ]]['model ' ] = $ this ->iteratingCategory ;
101
101
}
102
102
$ currentIndex = $ index ;
103
103
$ index ++;
104
- if (isset ($ elements [$ index ])) {
105
- $ tree [$ elements [$ currentIndex ]]['children ' ] = $ this ->generateLevelTree ( $ elements , $ index );
104
+ if (isset ($ pathElements [$ index ])) {
105
+ $ tree [$ pathElements [$ currentIndex ]]['children ' ] = $ this ->explodePathToArray ( $ pathElements , $ index );
106
106
}
107
107
return $ tree ;
108
108
}
0 commit comments