Prevent unintended serialization and compression

Author: JeppeKnockaert

src/Illuminate/Cache/RedisStore.php

@@ -432,6 +432,10 @@ public function setPrefix($prefix)
     protected function pack($value, $connection)
     {
         if ($connection instanceof PhpRedisConnection) {
+            if ($this->storePlainValue($value)) {
+                return $value;
+            }
+
             if ($connection->serialized()) {
                 return $connection->pack([$value])[0];
             }
@@ -444,6 +448,17 @@ protected function pack($value, $connection)
         return $this->serialize($value);
     }
 
+    /**
+     * Determine if the given value should be stored as plain value or be serialized/compressed instead.
+     *
+     * @param  mixed  $value
+     * @return bool
+     */
+    protected function storePlainValue($value): bool
+    {
+        return is_numeric($value) && ! in_array($value, [INF, -INF]) && ! is_nan($value);
+    }
+
     /**
      * Serialize the value.
      *
@@ -452,7 +467,7 @@ protected function pack($value, $connection)
      */
     protected function serialize($value)
     {
-        return is_numeric($value) && ! in_array($value, [INF, -INF]) && ! is_nan($value) ? $value : serialize($value);
+        return $this->storePlainValue($value) ? $value : serialize($value);
     }
 
     /**

tests/Integration/Cache/RedisStoreTest.php

@@ -249,4 +249,20 @@ public function testPutManyCallsPutWhenClustered()
             'fizz' => 'buz',
         ], 10);
     }
+
+    public function testIncrementWithSerializationEnabled()
+    {
+        /** @var \Illuminate\Cache\RedisStore $store */
+        $store = Cache::store('redis');
+        /** @var \Redis $client */
+        $client = $store->connection()->client();
+        $client->setOption(\Redis::OPT_SERIALIZER, \Redis::SERIALIZER_PHP);
+
+        $store->flush();
+        $store->add('foo', 1, 10);
+        $this->assertEquals(1, $store->get('foo'));
+
+        $store->increment('foo');
+        $this->assertEquals(2, $store->get('foo'));
+    }
 }