Fix tests

Author: RobiNN1

src/Dashboards/APCu/APCuTrait.php

@@ -217,7 +217,7 @@ public function getAllKeys(): array {
      *
      * @return array<int, array<string, string|int>>
      */
-    private function keysTableView(array $keys): array {
+    public function keysTableView(array $keys): array {
         $formatted_keys = [];
 
         foreach ($keys as $key_data) {
@@ -243,7 +243,7 @@ private function keysTableView(array $keys): array {
      *
      * @return array<int, array<string, string|int>>
      */
-    private function keysTreeView(array $keys): array {
+    public function keysTreeView(array $keys): array {
         $separator = Config::get('apcu-separator', ':');
         $this->template->addGlobal('separator', $separator);
 
@@ -314,8 +314,6 @@ static function (string $key, string $value, int $ttl): bool {
         $paginator = new Paginator($this->template, $keys);
         $paginated_keys = $paginator->getPaginated();
 
-
-
         if (Http::get('view', Config::get('list-view', 'table')) === 'tree') {
             $keys_to_display = $this->keysTreeView($paginated_keys);
         } else {

src/Dashboards/Memcached/MemcachedTrait.php

@@ -237,7 +237,7 @@ public function getAllKeys(): array {
      *
      * @return array<int, array<string, string|int>>
      */
-    private function keysTableView(array $keys): array {
+    public function keysTableView(array $keys): array {
         $formatted_keys = [];
 
         foreach ($keys as $key_data) {
@@ -262,7 +262,7 @@ private function keysTableView(array $keys): array {
      *
      * @throws MemcachedException
      */
-    private function keysTreeView(array $keys): array {
+    public function keysTreeView(array $keys): array {
         $separator = $this->servers[$this->current_server]['separator'] ?? ':';
 
         if (version_compare($this->memcached->version(), '1.5.19', '>=')) {

src/Dashboards/Redis/RedisTrait.php

@@ -441,7 +441,7 @@ public function isCommandSupported(string $command): bool {
      *
      * @throws Exception
      */
-    private function keysTableView(array $keys): array {
+    public function keysTableView(array $keys): array {
         $formatted_keys = [];
         $keys_array = array_column($keys, 'key');
         $pipeline = $this->redis->pipelineKeys($keys_array);
@@ -469,7 +469,7 @@ private function keysTableView(array $keys): array {
      *
      * @throws Exception
      */
-    private function keysTreeView(array $keys): array {
+    public function keysTreeView(array $keys): array {
         $keys_array = array_column($keys, 'key');
         $pipeline = $this->redis->pipelineKeys($keys_array);
         $separator = $this->servers[$this->current_server]['separator'] ?? ':';

tests/Dashboards/APCuTest.php

@@ -88,7 +88,6 @@ public function testGetAllKeysTableView(): void {
         apcu_store('pu-test-table1', 'value1');
         apcu_store('pu-test-table2', 'value2');
         $_GET['s'] = 'pu-test-table';
-        $_GET['view'] = 'table';
 
         $result = $this->dashboard->getAllKeys();
 
@@ -113,6 +112,7 @@ public function testGetAllKeysTableView(): void {
             ],
         ];
 
+        $result = $this->dashboard->keysTableView($result);
         $result = $this->normalizeInfoFields($result, ['bytes_size', 'number_hits', 'timediff_last_used', 'time_created']);
 
         $this->assertEquals($this->sortKeys($expected), $this->sortKeys($result));
@@ -123,7 +123,6 @@ public function testGetAllKeysTreeView(): void {
         apcu_store('pu-test-tree1:sub2', 'value2');
         apcu_store('pu-test-tree2', 'value3');
         $_GET['s'] = 'pu-test-tree';
-        $_GET['view'] = 'tree';
 
         $result = $this->dashboard->getAllKeys();
 
@@ -168,6 +167,7 @@ public function testGetAllKeysTreeView(): void {
             ],
         ];
 
+        $result = $this->dashboard->keysTreeView($result);
         $result = $this->normalizeInfoFields($result, ['bytes_size', 'number_hits', 'timediff_last_used', 'time_created']);
 
         $this->assertEquals($this->sortTreeKeys($expected), $this->sortTreeKeys($result));

tests/Dashboards/MemcachedTest.php

@@ -162,7 +162,6 @@ public function testGetAllKeysTableView(): void {
         $this->memcached->set('pu-test-table1', 'value1');
         $this->memcached->set('pu-test-table2', 'value2');
         $_GET['s'] = 'pu-test-table';
-        $_GET['view'] = 'table';
 
         $result = $this->dashboard->getAllKeys();
 
@@ -183,6 +182,7 @@ public function testGetAllKeysTableView(): void {
             ],
         ];
 
+        $result = $this->dashboard->keysTableView($result);
         $result = $this->normalizeInfoFields($result, ['bytes_size', 'timediff_last_access']);
 
         $this->assertEquals($this->sortKeys($expected), $this->sortKeys($result));
@@ -198,7 +198,6 @@ public function testGetAllKeysTreeView(): void {
         $this->memcached->set('pu-test-tree1:sub2', 'value2');
         $this->memcached->set('pu-test-tree2', 'value3');
         $_GET['s'] = 'pu-test-tree';
-        $_GET['view'] = 'tree';
 
         $result = $this->dashboard->getAllKeys();
 
@@ -238,6 +237,7 @@ public function testGetAllKeysTreeView(): void {
             ],
         ];
 
+        $result = $this->dashboard->keysTreeView($result);
         $result = $this->normalizeInfoFields($result, ['bytes_size', 'timediff_last_access']);
 
         $this->assertEquals($this->sortTreeKeys($expected), $this->sortTreeKeys($result));

tests/Dashboards/Redis/RedisTestCase.php

@@ -250,7 +250,6 @@ public function testGetAllKeysTableView(): void {
         $this->redis->set('pu-test-table1', 'value1');
         $this->redis->set('pu-test-table2', 'value2');
         $_GET['s'] = 'pu-test-table*';
-        $_GET['view'] = 'table';
 
         $result = $this->dashboard->getAllKeys();
 
@@ -273,6 +272,7 @@ public function testGetAllKeysTableView(): void {
             ],
         ];
 
+        $result = $this->dashboard->keysTableView($result);
         $result = $this->normalizeInfoFields($result, ['bytes_size']);
 
         $this->assertEquals($this->sortKeys($expected), $this->sortKeys($result));
@@ -286,7 +286,6 @@ public function testGetAllKeysTreeView(): void {
         $this->redis->set('pu-test-tree1:sub2', 'value2');
         $this->redis->set('pu-test-tree2', 'value3');
         $_GET['s'] = 'pu-test-tree*';
-        $_GET['view'] = 'tree';
 
         $result = $this->dashboard->getAllKeys();
 
@@ -329,6 +328,7 @@ public function testGetAllKeysTreeView(): void {
             ],
         ];
 
+        $result = $this->dashboard->keysTreeView($result);
         $result = $this->normalizeInfoFields($result, ['bytes_size']);
 
         $this->assertEquals($this->sortTreeKeys($expected), $this->sortTreeKeys($result));