fix: delegate reset to decorated adapter instead of clear (#12)

Author: ganzyukv

.github/workflows/ci.yaml

@@ -17,12 +17,11 @@ jobs:
         coverage: ['none']
         symfony-versions:
           - '6.4.*'
-          - '7.0.*'
-          - '7.3.*'
+          - '7.4.*'
         include:
           - description: 'Log Code Coverage'
             php: '8.3'
-            symfony-versions: '^7.0'
+            symfony-versions: '^7.4'
             doctrine-orm-versions: '^3.0'
             coverage: xdebug
 

composer.json

@@ -21,7 +21,7 @@
     "require-dev": {
         "phpstan/phpstan": "^1.10",
         "phpunit/phpunit": "^10.0",
-        "squizlabs/php_codesniffer": "3.7.*"
+        "squizlabs/php_codesniffer": "^3.13"
     },
     "config": {
         "allow-plugins": {

phpcs.xml.dist

@@ -18,12 +18,24 @@
     <rule ref="Squiz.PHP.LowercasePHPFunctions"/>
     <rule ref="Generic.PHP.RequireStrictTypes"/>
     <rule ref="Squiz.Arrays.ArrayBracketSpacing"/>
-    <rule ref="Generic.Arrays.DisallowLongArraySyntax.Found"></rule>
-    <rule ref="Squiz.Commenting.FunctionComment.SpacingAfterParamType"></rule>
+    <rule ref="Generic.Arrays.DisallowLongArraySyntax.Found"/>
+    <rule ref="Squiz.Commenting.FunctionComment.SpacingAfterParamType"/>
 
     <rule ref="Generic.PHP.ForbiddenFunctions">
         <properties>
-            <property name="forbiddenFunctions" type="array" value="eval=>NULL,dd=>NULL,die=>NULL,var_dump=>NULL,dump=>NULL,sizeof=>count,delete=>unset,print=>echo,echo=>NULL,print_r=>NULL,create_function=>NULL"/>
+            <property name="forbiddenFunctions" type="array">
+                <element key="eval" value="null"/>
+                <element key="dd" value="null"/>
+                <element key="die" value="null"/>
+                <element key="var_dump" value="null"/>
+                <element key="dump" value="null"/>
+                <element key="sizeof" value="count"/>
+                <element key="delete" value="unset"/>
+                <element key="print" value="echo"/>
+                <element key="echo" value="null"/>
+                <element key="print_r" value="null"/>
+                <element key="create_function" value="null"/>
+            </property>
         </properties>
     </rule>
     <rule ref="Squiz.WhiteSpace.FunctionSpacing">

src/Redis/SchemaAwareRedisAdapter.php

@@ -98,8 +98,6 @@ public function delete(string $key): bool
 
     public function reset(): void
     {
-        $schema = $this->resolver->getSchema();
-
-        $this->decorated->clear($schema === $this->resolver->getEnvironmentSchema() ? '' : $schema);
+        $this->decorated->reset();
     }
 }

tests/Redis/SchemaAwareRedisAdapterTest.php

@@ -141,4 +141,12 @@ public function testSaveAndCommitArePassedThrough(): void
         self::assertTrue($this->adapter->save($item));
         self::assertTrue($this->adapter->commit());
     }
+
+    public function testResetDelegatesToDecoratedAdapter(): void
+    {
+        $this->decorated->expects(self::once())
+            ->method('reset');
+
+        $this->adapter->reset();
+    }
 }