Added EXPIRETIME command to KeyPrefixProcessor (#1369)

vladvildanov · web-flow · commit 16bdd83d23b8 · 2023-08-25T14:27:24.000-07:00
* Added EXPIRETIME command to KeyPrefixProcessor

* Fixed test responses for Redis 7.2

* Marked test as relay-incompatible
diff --git a/src/Command/Processor/KeyPrefixProcessor.php b/src/Command/Processor/KeyPrefixProcessor.php
@@ -190,6 +190,9 @@ public function __construct($prefix)
             /* ---------------- Redis 6.2 ---------------- */
             'GETDEL' => $prefixFirst,
 
+            /* ---------------- Redis 7.0 ---------------- */
+            'EXPIRETIME' => $prefixFirst,
+
             /* RedisJSON */
             'JSON.ARRAPPEND' => $prefixFirst,
             'JSON.ARRINDEX' => $prefixFirst,
diff --git a/tests/Predis/ClientTest.php b/tests/Predis/ClientTest.php
@@ -1255,6 +1255,7 @@ public function testGetIteratorWithNonTraversableConnectionNoException(): void
 
     /**
      * @group connected
+     * @group relay-incompatible
      * @requiresRedisVersion >= 7.2.0
      */
     public function testSetClientInfoOnConnection(): void
diff --git a/tests/Predis/Command/Processor/KeyPrefixProcessorTest.php b/tests/Predis/Command/Processor/KeyPrefixProcessorTest.php
@@ -978,6 +978,11 @@ public function commandArgumentsDataProvider(): array
                 ['key'],
                 ['prefix:key'],
             ],
+            /* ---------------- Redis 7.0 ---------------- */
+            ['EXPIRETIME',
+                ['key'],
+                ['prefix:key'],
+            ],
         ];
     }
 }
diff --git a/tests/Predis/Command/Redis/ACL_Test.php b/tests/Predis/Command/Redis/ACL_Test.php
@@ -101,7 +101,7 @@ public function testDryRunSimulateExecutionOfGivenCommandByUser(): void
             $redis->acl->dryRun('Test', 'SET', 'foo', 'bar')
         );
         $this->assertEquals(
-            "This user has no permissions to run the 'get' command",
+            "User Test has no permissions to run the 'get' command",
             $redis->acl->dryRun('Test', 'GET', 'foo')
         );
     }
diff --git a/tests/Predis/Command/Redis/OBJECT_Test.php b/tests/Predis/Command/Redis/OBJECT_Test.php
@@ -82,7 +82,7 @@ public function testObjectIdletime(): void
 
     /**
      * @group connected
-     * @requiresRedisVersion >= 2.2.3
+     * @requiresRedisVersion < 7.2.0
      */
     public function testObjectEncoding(): void
     {
@@ -92,6 +92,19 @@ public function testObjectEncoding(): void
         $this->assertMatchesRegularExpression('/[zip|quick]list/', $redis->object('ENCODING', 'list:metavars'));
     }
 
+    /**
+     * @group connected
+     * @requiresRedisVersion >= 7.2.0
+     */
+    public function testObjectEncodingReturnsUpdatedResponse(): void
+    {
+        $redis = $this->getClient();
+
+        $redis->lpush('list:metavars', 'foo', 'bar');
+
+        $this->assertSame('listpack', $redis->object('ENCODING', 'list:metavars'));
+    }
+
     /**
      * @group connected
      * @requiresRedisVersion >= 2.2.3

Original file line number	Diff line number	Diff line change
`@@ -978,6 +978,11 @@ public function commandArgumentsDataProvider(): array`
`978`	`978`	`['key'],`
`979`	`979`	`['prefix:key'],`
`980`	`980`	`],`
	`981`	`+ /* ---------------- Redis 7.0 ---------------- */`
	`982`	`+ ['EXPIRETIME',`
	`983`	`+ ['key'],`
	`984`	`+ ['prefix:key'],`
	`985`	`+ ],`
`981`	`986`	`];`
`982`	`987`	`}`
`983`	`988`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public function testDryRunSimulateExecutionOfGivenCommandByUser(): void`
`101`	`101`	`$redis->acl->dryRun('Test', 'SET', 'foo', 'bar')`
`102`	`102`	`);`
`103`	`103`	`$this->assertEquals(`
`104`		`- "This user has no permissions to run the 'get' command",`
	`104`	`+ "User Test has no permissions to run the 'get' command",`
`105`	`105`	`$redis->acl->dryRun('Test', 'GET', 'foo')`
`106`	`106`	`);`
`107`	`107`	`}`