From 3163679f07de94549ceb75d8794df6a2de0bf6a0 Mon Sep 17 00:00:00 2001
From: "A. B. M. Mahmudul Hasan" <abmmhasan@users.noreply.github.com>
Date: Fri, 17 Jul 2026 09:44:53 +0600
Subject: [PATCH] updated std

---
 src/Cluster/Transport/EventField.php          | 28 -------------------
 .../Pdo/PdoInvalidationTransport.php          | 17 ++++++-----
 .../RedisStreamInvalidationTransport.php      | 16 +++++++----
 src/Support/RedisConnection.php               | 28 +++++++++++++++----
 tests/Support/RedisConnectionTest.php         | 12 ++++++--
 5 files changed, 52 insertions(+), 49 deletions(-)
 delete mode 100644 src/Cluster/Transport/EventField.php

diff --git a/src/Cluster/Transport/EventField.php b/src/Cluster/Transport/EventField.php
deleted file mode 100644
index 86f5942..0000000
--- a/src/Cluster/Transport/EventField.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Infocyph\CacheLayer\Cluster\Transport;
-
-use Infocyph\CacheLayer\Cluster\Exception\ClusterTransportException;
-
-final class EventField
-{
-    public static function requiredString(
-        mixed $fields,
-        string $name,
-        string $invalidFieldsMessage,
-        string $invalidValueMessage,
-    ): string {
-        if (!is_array($fields)) {
-            throw new ClusterTransportException($invalidFieldsMessage);
-        }
-
-        $value = $fields[$name] ?? null;
-        if (!is_string($value) || $value === '') {
-            throw new ClusterTransportException($invalidValueMessage);
-        }
-
-        return $value;
-    }
-}
diff --git a/src/Cluster/Transport/Pdo/PdoInvalidationTransport.php b/src/Cluster/Transport/Pdo/PdoInvalidationTransport.php
index 8ed481b..56838d2 100644
--- a/src/Cluster/Transport/Pdo/PdoInvalidationTransport.php
+++ b/src/Cluster/Transport/Pdo/PdoInvalidationTransport.php
@@ -8,7 +8,6 @@
 use Infocyph\CacheLayer\Cluster\Event\InvalidationEvent;
 use Infocyph\CacheLayer\Cluster\Event\InvalidationEventType;
 use Infocyph\CacheLayer\Cluster\Exception\ClusterTransportException;
-use Infocyph\CacheLayer\Cluster\Transport\EventField;
 use Infocyph\CacheLayer\Cluster\Transport\InvalidationTransportInspectorInterface;
 use Infocyph\CacheLayer\Cluster\Transport\TransactionalInvalidationTransportInterface;
 use PDO;
@@ -330,12 +329,16 @@ private function pruneSql(): string
 
     private function requiredString(mixed $row, string $key): string
     {
-        return EventField::requiredString(
-            $row,
-            $key,
-            'Invalid PDO transport event row.',
-            "Invalid {$key} returned by PDO transport.",
-        );
+        if (!is_array($row)) {
+            throw new ClusterTransportException('Invalid PDO transport event row.');
+        }
+
+        $value = $row[$key] ?? null;
+        if (!is_string($value) || $value === '') {
+            throw new ClusterTransportException("Invalid {$key} returned by PDO transport.");
+        }
+
+        return $value;
     }
 
     private function timestampFromValue(mixed $value): int
diff --git a/src/Cluster/Transport/RedisStreamInvalidationTransport.php b/src/Cluster/Transport/RedisStreamInvalidationTransport.php
index 096a310..ac9272e 100644
--- a/src/Cluster/Transport/RedisStreamInvalidationTransport.php
+++ b/src/Cluster/Transport/RedisStreamInvalidationTransport.php
@@ -158,12 +158,16 @@ private function eventFromFields(string $id, array $fields): InvalidationEvent
 
     private function field(mixed $fields, string $name): string
     {
-        return EventField::requiredString(
-            $fields,
-            $name,
-            'Redis Stream event fields must be an array.',
-            "Redis Stream event has an invalid {$name} field.",
-        );
+        if (!is_array($fields)) {
+            throw new ClusterTransportException('Redis Stream event fields must be an array.');
+        }
+
+        $value = $fields[$name] ?? null;
+        if (!is_string($value) || $value === '') {
+            throw new ClusterTransportException("Redis Stream event has an invalid {$name} field.");
+        }
+
+        return $value;
     }
 
     /**
diff --git a/src/Support/RedisConnection.php b/src/Support/RedisConnection.php
index f2386d7..16ef59f 100644
--- a/src/Support/RedisConnection.php
+++ b/src/Support/RedisConnection.php
@@ -11,19 +11,37 @@ final class RedisConnection
     public static function connect(string $dsn): \Redis
     {
         $parts = parse_url($dsn);
-        if (!is_array($parts)) {
+        $scheme = is_array($parts) ? $parts['scheme'] ?? null : null;
+        $host = is_array($parts) ? $parts['host'] ?? null : null;
+        if (
+            !is_string($scheme)
+            || !in_array($scheme, ['redis', 'valkey'], true)
+            || !is_string($host)
+            || $host === ''
+        ) {
+            throw new InvalidArgumentException('Invalid Redis-compatible DSN.');
+        }
+
+        $path = $parts['path'] ?? '';
+        $database = $path === '' || $path === '/'
+            ? null
+            : ltrim($path, '/');
+        if ($database !== null && !ctype_digit($database)) {
+            throw new InvalidArgumentException('Invalid Redis-compatible DSN.');
+        }
+
+        $port = $parts['port'] ?? 6379;
+        if ($port === 0) {
             throw new InvalidArgumentException('Invalid Redis-compatible DSN.');
         }
 
         $connection = new \Redis();
-        $host = is_string($parts['host'] ?? null) ? $parts['host'] : '127.0.0.1';
-        $port = is_int($parts['port'] ?? null) ? $parts['port'] : 6379;
         $connection->connect($host, $port);
         if (is_string($parts['pass'] ?? null) && $parts['pass'] !== '') {
             $connection->auth($parts['pass']);
         }
-        if (is_string($parts['path'] ?? null) && $parts['path'] !== '/') {
-            $connection->select((int) ltrim($parts['path'], '/'));
+        if ($database !== null) {
+            $connection->select((int) $database);
         }
 
         return $connection;
diff --git a/tests/Support/RedisConnectionTest.php b/tests/Support/RedisConnectionTest.php
index abc3368..699b173 100644
--- a/tests/Support/RedisConnectionTest.php
+++ b/tests/Support/RedisConnectionTest.php
@@ -4,7 +4,13 @@
 
 use Infocyph\CacheLayer\Support\RedisConnection;
 
-test('redis connection rejects malformed DSNs before creating a client', function () {
-    expect(fn () => RedisConnection::connect('redis://'))
+test('redis connection rejects malformed DSNs before creating a client', function (string $dsn) {
+    expect(fn () => RedisConnection::connect($dsn))
         ->toThrow(\InvalidArgumentException::class, 'Invalid Redis-compatible DSN.');
-});
+})->with([
+    'missing host' => 'redis://',
+    'missing scheme' => '127.0.0.1:6379',
+    'unsupported scheme' => 'http://127.0.0.1:6379',
+    'invalid database' => 'redis://127.0.0.1/database',
+    'invalid port' => 'redis://127.0.0.1:0',
+]);