Fixes

RobiNN1 · Feb 15, 2025 · dbe13c3 · dbe13c3
1 parent 4f065e8
commit dbe13c3
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/src/Dashboards/APCu/APCuTrait.php b/src/Dashboards/APCu/APCuTrait.php
@@ -282,6 +282,7 @@ private function keysTreeView(array $keys): array {
                             'expanded' => false,
                         ];
                     }
+
                     $current = &$current[$part]['children'];
                 }
             }

diff --git a/src/Dashboards/Memcached/MemcachedTrait.php b/src/Dashboards/Memcached/MemcachedTrait.php
@@ -295,6 +295,7 @@ private function keysTreeView(array $keys): array {
                             'expanded' => false,
                         ];
                     }
+
                     $current = &$current[$part]['children'];
                 }
             }

diff --git a/src/Dashboards/OPCache/OPCacheTrait.php b/src/Dashboards/OPCache/OPCacheTrait.php
@@ -148,9 +148,7 @@ private function getCachedScripts(): array {
             }
         }
 
-        $cached_scripts = Helpers::sortKeys($this->template, $cached_scripts);
-
-        return $cached_scripts;
+        return Helpers::sortKeys($this->template, $cached_scripts);
     }
 
     private function mainDashboard(): string {

diff --git a/src/Dashboards/Realpath/RealpathTrait.php b/src/Dashboards/Realpath/RealpathTrait.php
@@ -61,8 +61,6 @@ private function getAllKeys(): array {
             }
         }
 
-        $keys = Helpers::sortKeys($this->template, $keys);
-
-        return $keys;
+        return Helpers::sortKeys($this->template, $keys);
     }
 }
diff --git a/src/Dashboards/Redis/RedisTrait.php b/src/Dashboards/Redis/RedisTrait.php
@@ -427,6 +427,7 @@ private function keysTreeView(array $keys): array {
                             'expanded' => false,
                         ];
                     }
+
                     $current = &$current[$part]['children'];
                 }
             }

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -55,7 +55,7 @@ public static function keysProvider(): array {
      * @return array<int|string, mixed>
      */
     public function sortKeys(array $keys): array {
-        usort($keys, static fn ($a, $b) => strcmp($a['key'], $b['key']));
+        usort($keys, static fn ($a, $b): int => strcmp((string) $a['key'], (string) $b['key']));
 
         return $keys;
     }
@@ -68,8 +68,8 @@ public function sortKeys(array $keys): array {
     public function sortTreeKeys(array $tree): array {
         foreach ($tree as &$item) {
             if (isset($item['children'])) {
-                usort($item['children'], static fn ($a, $b) => strcmp($a['key'], $b['key']));
-                $item['children'] = self::sortTreeKeys($item['children']);
+                usort($item['children'], static fn ($a, $b): int => strcmp((string) $a['key'], (string) $b['key']));
+                $item['children'] = $this->sortTreeKeys($item['children']);
             }
         }
 
@@ -91,7 +91,7 @@ public function normalizeInfoFields(array $data, array $fields): array {
             }
 
             if (isset($item['children']) && is_array($item['children'])) {
-                $item['children'] = array_map(static function (array $child) use ($fields) {
+                $item['children'] = array_map(static function (array $child) use ($fields): array {
                     foreach ($fields as $field) {
                         if (isset($child['info'][$field])) {
                             $child['info'][$field] = 0;
-Original file line number
+Diff line change
@@ Expand Up / @@ -282,6 +282,7 @@ private function keysTreeView(array $keys): array { @@
                                 'expanded' => false,
                             ];
                         }
                         $current = &$current[$part]['children'];
                     }
                 }
@@ Expand Down @@