Merge branch '4.0' into 'main'

Author: thorsten

CHANGELOG.md

@@ -23,6 +23,11 @@ This is a log of major user-visible changes in each phpMyFAQ release.
 - migrated from Webpack to Vite v6 (Thorsten)
 - migrated from Jest to Vitest v3 (Thorsten)
 
+### phpMyFAQ v4.0.8 - unreleased
+
+- updated third party dependencies (Thorsten)
+- fixed bugs (Thorsten)
+
 ### phpMyFAQ v4.0.7 - 2025-03-24
 
 - updated third party dependencies (Thorsten)

composer.lock

@@ -124,11 +124,16 @@ public function setCategoryTree(
     public function getCategoryTree(array $categories, int $parentId = 0): array
     {
         $result = [];
+        $stack = [[$parentId, &$result]];
 
-        foreach ($categories as $category) {
-            if ((int) $category['parent_id'] === $parentId) {
-                $children = $this->getCategoryTree($categories, $category['category_id']);
-                $result[$category['category_id']] = $children;
+        while (!empty($stack)) {
+            list($currentParentId, &$currentResult) = array_pop($stack);
+
+            foreach ($categories as $category) {
+                if ((int) $category['parent_id'] === $currentParentId) {
+                    $currentResult[$category['category_id']] = [];
+                    $stack[] = [$category['category_id'], &$currentResult[$category['category_id']]];
+                }
             }
         }