Fixes & PHP 8.4 support

Author: RobiNN1

.github/workflows/static-analysis.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.3
+          php-version: 8.4
           tools: composer:v2
           coverage: none
 

.github/workflows/tests.yml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [ '8.2', '8.3' ]
+        php: [ '8.2', '8.3', '8.4' ]
         stability: [ prefer-stable ]
 
     name: PHP ${{ matrix.php }} tests
@@ -69,7 +69,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [ '8.2', '8.3' ]
+        php: [ '8.2', '8.3', '8.4' ]
         stability: [ prefer-stable ]
 
     name: PHP ${{ matrix.php }} tests (php clients)

composer.json

@@ -25,7 +25,7 @@
   ],
   "require": {
     "php": ">=8.2",
-    "twig/twig": "^3.14"
+    "twig/twig": "^3.15"
   },
   "require-dev": {
     "clue/phar-composer": "^1.4",
@@ -60,6 +60,6 @@
     "phar:twig": "phar-composer build twig/twig",
     "phar:predis": "phar-composer build predis/predis",
     "phpstan": "phpstan --ansi",
-    "test": "phpunit --colors=always"
+    "test": "phpunit --colors=always --display-skipped"
   }
 }

index.php

@@ -45,11 +45,7 @@
 $tpl = new Template();
 $admin = new Admin($tpl);
 
-$nav = [];
-
-foreach ($admin->dashboards as $d_key => $d_dashboard) {
-    $nav[$d_key] = $d_dashboard->dashboardInfo();
-}
+$nav = array_map(static fn ($d_dashboard) => $d_dashboard->dashboardInfo(), $admin->dashboards);
 
 $current = $admin->currentDashboard();
 $dashboard = $admin->getDashboard($current);

predis.phar

@@ -184,7 +184,7 @@ public function getKey(string $key): string|false {
     }
 
     /**
-     * Get key meta data.
+     * Get key meta-data.
      *
      * @return array<string, string|int>
      * @throws MemcachedException

src/Dashboards/Memcached/PHPMem.php

@@ -121,7 +121,7 @@ public function streamAdd(string $key, string $id, array $messages): string {
         return $this->xadd($key, $messages, $id);
     }
 
-    public function rawCommand(string $command, mixed ...$arguments): mixed {
+    public function rawcommand(string $command, mixed ...$arguments): mixed {
         return $this->executeRaw(func_get_args());
     }
 

src/Dashboards/Redis/Compatibility/Predis.php

@@ -79,7 +79,7 @@ public function getKeyType(string $key): string {
 
         if ($type === self::REDIS_NOT_FOUND) {
             $this->setOption(self::OPT_REPLY_LITERAL, true);
-            $type = $this->rawCommand('TYPE', $key);
+            $type = $this->rawcommand('TYPE', $key);
         }
 
         return $this->getType($type);
@@ -129,7 +129,7 @@ public function scanKeys(string $pattern, int $count): array {
      * @throws RedisException
      */
     public function listRem(string $key, string $value, int $count): int {
-        return $this->lRem($key, $value, $count);
+        return $this->lrem($key, $value, $count);
     }
 
     /**
@@ -138,7 +138,7 @@ public function listRem(string $key, string $value, int $count): int {
      * @throws RedisException
      */
     public function streamAdd(string $key, string $id, array $messages): string {
-        return $this->xAdd($key, $id, $messages);
+        return $this->xadd($key, $id, $messages);
     }
 
     /**

src/Dashboards/Redis/Compatibility/Redis.php

@@ -44,6 +44,12 @@ private function panels(): string {
             $max_memory = (int) $info['memory']['maxmemory'];
             $memory_usage = $max_memory > 0 ? round(($used_memory / $max_memory) * 100, 2) : 0;
 
+            if ($max_memory > 0) { // 0 = unlimited
+                $used_memory_formatted = ['Used', Format::bytes($used_memory).' ('.$memory_usage.'%)', $memory_usage];
+            } else {
+                $used_memory_formatted = ['Used', Format::bytes($used_memory)];
+            }
+
             $panels = [
                 [
                     'title'     => $title ?? null,
@@ -60,9 +66,9 @@ private function panels(): string {
                 [
                     'title' => 'Memory',
                     'data'  => [
-                        'Total'                => Format::bytes($max_memory, 0),
-                        ['Used', Format::bytes($used_memory).' ('.$memory_usage.'%)', $memory_usage],
-                        'Free'                 => Format::bytes($max_memory - $used_memory),
+                        'Total'                => $max_memory > 0 ? Format::bytes($max_memory, 0) : '∞',
+                        $used_memory_formatted,
+                        'Free'                 => $max_memory > 0 ? Format::bytes($max_memory - $used_memory) : '∞',
                         'Fragmentation ratio'  => $info['memory']['mem_fragmentation_ratio'],
                         'Used peak percentage' => $info['memory']['used_memory_peak_perc'],
                     ],

src/Dashboards/Redis/RedisTrait.php

@@ -201,11 +201,7 @@ public static function getServerTitle(array $server): string {
      * @param array<int, array<string, int|string>> $servers
      */
     public static function serverSelector(Template $template, array $servers, int $selected): string {
-        $options = [];
-
-        foreach ($servers as $id => $server) {
-            $options[$id] = self::getServerTitle($server);
-        }
+        $options = array_map(static fn ($server) => self::getServerTitle($server), $servers);
 
         return $template->render('components/select', [
             'id'       => 'server_select',