@@ -232,13 +232,7 @@ protected function _getHtml(
232232
233233 if ($ childLevel === 0 && $ outermostClass ) {
234234 $ outermostClassCode = ' class=" ' . $ outermostClass . '" ' ;
235- $ currentClass = $ child ->getClass ();
236-
237- if (empty ($ currentClass )) {
238- $ child ->setClass ($ outermostClass );
239- } else {
240- $ child ->setClass ($ currentClass . ' ' . $ outermostClass );
241- }
235+ $ this ->setCurrentClass ($ child , $ outermostClass );
242236 }
243237
244238 if ($ this ->shouldAddNewColumn ($ colBrakes , $ counter )) {
@@ -257,7 +251,7 @@ protected function _getHtml(
257251 $ counter ++;
258252 }
259253
260- if (is_array ($ colBrakes ) && count ($ colBrakes ) && $ limit ) {
254+ if (is_array ($ colBrakes ) && ! empty ($ colBrakes ) && $ limit ) {
261255 $ html = '<li class="column"><ul> ' . $ html . '</ul></li> ' ;
262256 }
263257
@@ -419,13 +413,30 @@ private function getChildLevel($parentLevel)
419413 }
420414
421415 /**
422- * @param array $colBrakes
423- * @param $counter
416+ * Check if new column should be added.
424417 *
418+ * @param array $colBrakes
419+ * @param int $counter
425420 * @return bool
426421 */
427- private function shouldAddNewColumn (array $ colBrakes , int $ counter )
422+ private function shouldAddNewColumn (array $ colBrakes , int $ counter ): bool
428423 {
429424 return count ($ colBrakes ) && $ colBrakes [$ counter ]['colbrake ' ];
430425 }
426+
427+ /**
428+ * Set current class.
429+ *
430+ * @param Node $child
431+ * @param string $outermostClass
432+ */
433+ private function setCurrentClass (Node $ child , string $ outermostClass ): void
434+ {
435+ $ currentClass = $ child ->getClass ();
436+ if (empty ($ currentClass )) {
437+ $ child ->setClass ($ outermostClass );
438+ } else {
439+ $ child ->setClass ($ currentClass . ' ' . $ outermostClass );
440+ }
441+ }
431442}
0 commit comments