Small fixes

Author: RobiNN1

src/Dashboards/Redis/RedisDashboard.php

@@ -14,6 +14,7 @@
 
 use Exception;
 use Redis;
+use RedisException;
 use RobiNN\Pca\Config;
 use RobiNN\Pca\Dashboards\DashboardException;
 use RobiNN\Pca\Dashboards\DashboardInterface;
@@ -130,7 +131,7 @@ public function ajax(): string {
                 if (isset($_GET['delete'])) {
                     $return = $this->deleteKey($redis);
                 }
-            } catch (DashboardException $e) {
+            } catch (DashboardException|RedisException $e) {
                 $return = $e->getMessage();
             }
         }
@@ -197,7 +198,7 @@ public function dashboard(): string {
                 } else {
                     $return = $this->mainDashboard($redis);
                 }
-            } catch (Exception $e) {
+            } catch (DashboardException|RedisException $e) {
                 return $e->getMessage();
             }
         }

src/Dashboards/Redis/RedisTrait.php

@@ -13,6 +13,7 @@
 namespace RobiNN\Pca\Dashboards\Redis;
 
 use Redis;
+use RedisException;
 use RobiNN\Pca\Dashboards\DashboardException;
 use RobiNN\Pca\Helpers;
 use RobiNN\Pca\Http;
@@ -65,7 +66,7 @@ private function serverInfo(array $servers): array {
                 'Memory used'       => Helpers::formatBytes($server_info['used_memory']),
                 'Keys'              => Helpers::formatNumber($all_keys).' (all databases)',
             ];
-        } catch (DashboardException $e) {
+        } catch (DashboardException|RedisException $e) {
             $data = [
                 'error' => $e->getMessage(),
             ];
@@ -80,6 +81,7 @@ private function serverInfo(array $servers): array {
      * @param Redis $redis
      *
      * @return string
+     * @throws RedisException
      */
     private function deleteAllKeys(Redis $redis): string {
         if ($redis->flushDB()) {
@@ -97,6 +99,7 @@ private function deleteAllKeys(Redis $redis): string {
      * @param Redis $redis
      *
      * @return string
+     * @throws RedisException
      */
     private function deleteKey(Redis $redis): string {
         $keys = explode(',', Http::get('delete'));
@@ -119,6 +122,7 @@ private function deleteKey(Redis $redis): string {
      * @param Redis $redis
      *
      * @return array<string, mixed>
+     * @throws RedisException
      */
     private function getInfo(Redis $redis): array {
         $options = ['SERVER', 'CLIENTS', 'MEMORY', 'PERSISTENCE', 'STATS', 'REPLICATION', 'CPU', 'CLASTER', 'KEYSPACE', 'COMANDSTATS'];
@@ -166,7 +170,7 @@ private function moreInfo(array $servers): string {
                 'array'          => $this->getInfo($redis),
                 'bottom_content' => method_exists($redis, 'resetStat') && isset($reset_link) ? $reset_link : '',
             ]);
-        } catch (DashboardException $e) {
+        } catch (DashboardException|RedisException $e) {
             return $e->getMessage();
         }
     }
@@ -177,6 +181,7 @@ private function moreInfo(array $servers): string {
      * @param Redis $redis
      *
      * @return array<int, string>
+     * @throws RedisException
      */
     private function getDatabases(Redis $redis): array {
         $databases = [];
@@ -207,6 +212,7 @@ private function getDatabases(Redis $redis): array {
      * @param Redis $redis
      *
      * @return array<int, array<string, string|int>>
+     * @throws RedisException
      */
     private function getAllKeys(Redis $redis): array {
         static $keys = [];
@@ -235,6 +241,7 @@ private function getAllKeys(Redis $redis): array {
      * @param Redis $redis
      *
      * @return string
+     * @throws RedisException
      */
     private function mainDashboard(Redis $redis): string {
         $keys = $this->getAllKeys($redis);
@@ -264,6 +271,7 @@ private function mainDashboard(Redis $redis): string {
      * @param Redis $redis
      *
      * @return string
+     * @throws RedisException
      */
     private function viewKey(Redis $redis): string {
         $key = Http::get('key');
@@ -342,6 +350,7 @@ private function viewKey(Redis $redis): string {
      * @param Redis $redis
      *
      * @return void
+     * @throws RedisException
      */
     private function import(Redis $redis): void {
         if ($_FILES['import']['type'] === 'application/octet-stream') {
@@ -366,6 +375,7 @@ private function import(Redis $redis): void {
      * @param Redis $redis
      *
      * @return string
+     * @throws RedisException
      */
     private function form(Redis $redis): string {
         $key = Http::get('key');

src/Dashboards/Redis/TypesTrait.php

@@ -13,6 +13,7 @@
 namespace RobiNN\Pca\Dashboards\Redis;
 
 use Redis;
+use RedisException;
 use RobiNN\Pca\Helpers;
 use RobiNN\Pca\Http;
 
@@ -45,6 +46,7 @@ private function getType(int $type): string {
      * @param string $key
      *
      * @return array<mixed, mixed>
+     * @throws RedisException
      */
     private function getKeyValue(Redis $redis, string $type, string $key): array {
         $value = '';
@@ -99,6 +101,7 @@ private function getKeyValue(Redis $redis, string $type, string $key): array {
      * @param string $key
      *
      * @return array<mixed, mixed>|string
+     * @throws RedisException
      */
     private function getAllKeyValues(Redis $redis, string $type, string $key) {
         switch ($type) {
@@ -130,6 +133,7 @@ private function getAllKeyValues(Redis $redis, string $type, string $key) {
      * @param Redis $redis
      *
      * @return void
+     * @throws RedisException
      */
     private function saveKey(Redis $redis): void {
         if (isset($_POST['submit'])) {
@@ -211,6 +215,7 @@ private function saveKey(Redis $redis): void {
      * @param string $key
      *
      * @return void
+     * @throws RedisException
      */
     private function deleteSubKey(Redis $redis, string $type, string $key): void {
         switch ($type) {
@@ -242,6 +247,7 @@ private function deleteSubKey(Redis $redis, string $type, string $key): void {
      * @param string $key
      *
      * @return int|null
+     * @throws RedisException
      */
     private function getCountOfItemsInKey(Redis $redis, string $type, string $key): ?int {
         switch ($type) {