Merge pull request #184 from splitio/fix/strlen

Fix/strlen

Author: mmelograno

CHANGES.txt

@@ -1,3 +1,6 @@
+7.1.2 (May 24, 2022)
+ - Updated validations to comply with PHP8's stricter type validations.
+
 7.1.1 (March 28, 2022)
  - Removed unused logic for HTTP and requests dependency.
  - Removed all producer logic for Storages.

src/SplitIO/Component/Cache/Storage/Adapter/PRedis.php

@@ -279,7 +279,7 @@ public function getKeys($pattern = '*')
 
     private static function normalizePrefix($prefix)
     {
-        if ($prefix && strlen($prefix)) {
+        if ($prefix && is_string($prefix) && strlen($prefix)) {
             if ($prefix[strlen($prefix) - 1] == '.') {
                 return $prefix;
             } else {

src/SplitIO/Grammar/Condition/Matcher/ContainsString.php

@@ -17,8 +17,7 @@ public function __construct($data, $negate = false, $attribute = null)
 
     protected function evalKey($key)
     {
-        $keyLength = strlen($key);
-        if (!is_array($this->containsStringMatcherData) || !is_string($key) || $keyLength == 0) {
+        if (!is_array($this->containsStringMatcherData) || !is_string($key) || strlen($key) == 0) {
             return false;
         }
 

src/SplitIO/Grammar/Condition/Matcher/EndsWith.php

@@ -17,14 +17,12 @@ public function __construct($data, $negate = false, $attribute = null)
 
     protected function evalKey($key)
     {
-        $keyLength = strlen($key);
-        if (!is_array($this->endsWithMatcherData) || !is_string($key) || $keyLength == 0) {
+        if (!is_array($this->endsWithMatcherData) || !is_string($key) || strlen($key) == 0) {
             return false;
         }
 
         foreach ($this->endsWithMatcherData as $item) {
-            $itemLength = strlen($item);
-            if (is_string($item) && substr($key, -$itemLength) == $item) {
+            if (is_string($item) && substr($key, -strlen($item)) == $item) {
                 return true;
             }
         }

src/SplitIO/Version.php

@@ -3,5 +3,5 @@
 
 class Version
 {
-    const CURRENT = '7.1.1';
+    const CURRENT = '7.1.2';
 }

tests/Suite/Adapter/RedisAdapterTest.php

@@ -514,4 +514,30 @@ public function testRedisSSLWithSentinelFails()
             ),
         ));
     }
+
+    public function testRedisWithWrongPrefix()
+    {
+        $predis = new PRedis(array(
+            'parameters' => array(
+                'scheme' => 'tcp',
+                'host' => 'localhost',
+                'port' => 6379,
+                'timeout' => 881,
+                'database' => 0
+            ),
+            'options' => array(
+                'prefix' => array()
+            )
+        ));
+        $predisClient = new \Predis\Client([
+            'host' => REDIS_HOST,
+            'port' => REDIS_PORT,
+        ]);
+        $predisClient->set('{SPLITIO}.this_is_a_test_key', 'this-is-a-test-value');
+
+        $value = $predis->get('{SPLITIO}.this_is_a_test_key');
+        $this->assertEquals('this-is-a-test-value', $value);
+
+        $predisClient->del('{SPLITIO}.this_is_a_test_key');
+    }
 }

tests/Suite/Matchers/MatchersTest.php

@@ -94,6 +94,7 @@ public function testEndsWithMatcher()
         $this->assertEquals($matcher->evaluate('testJKL'), false);
         $this->assertEquals($matcher->evaluate(''), false);
         $this->assertEquals($matcher->evaluate(null), false);
+        $this->assertEquals($matcher->evaluate(array("some")), false);
     }
 
     public function testContainsStringMatcher()
@@ -118,6 +119,7 @@ public function testContainsStringMatcher()
         $this->assertEquals($matcher->evaluate('Curabitur'), false);
         $this->assertEquals($matcher->evaluate(''), false);
         $this->assertEquals($matcher->evaluate(null), false);
+        $this->assertEquals($matcher->evaluate(array("some")), false);
     }