symfony
diff --git a/‎.travis.yml
Lines changed: 1 addition & 0 deletions b/‎.travis.yml
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
Lines changed: 5 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
Lines changed: 5 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
Lines changed: 7 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
Lines changed: 7 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Cache/Adapter/FilesystemAdapter.php
Lines changed: 4 additions & 1 deletion b/‎src/Symfony/Component/Cache/Adapter/FilesystemAdapter.php
Lines changed: 4 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
Lines changed: 3 additions & 2 deletions b/‎src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
Lines changed: 3 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Cache/Adapter/PdoAdapter.php
Lines changed: 3 additions & 2 deletions b/‎src/Symfony/Component/Cache/Adapter/PdoAdapter.php
Lines changed: 3 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
Lines changed: 14 additions & 6 deletions b/‎src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
Lines changed: 14 additions & 6 deletions
diff --git a/‎src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Cache/Adapter/RedisAdapter.php
Lines changed: 3 additions & 2 deletions b/‎src/Symfony/Component/Cache/Adapter/RedisAdapter.php
Lines changed: 3 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Cache/CHANGELOG.md
Lines changed: 2 additions & 0 deletions b/‎src/Symfony/Component/Cache/CHANGELOG.md
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php
Lines changed: 99 additions & 0 deletions b/‎src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php
Lines changed: 99 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Cache/Marshaller/MarshallerInterface.php
Lines changed: 40 additions & 0 deletions b/‎src/Symfony/Component/Cache/Marshaller/MarshallerInterface.php
Lines changed: 40 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Cache/Simple/FilesystemCache.php
Lines changed: 4 additions & 1 deletion b/‎src/Symfony/Component/Cache/Simple/FilesystemCache.php
Lines changed: 4 additions & 1 deletion
@@ -151,6 +151,7 @@ before_install:
           tfold ext.libsodium tpecl libsodium sodium.so $INI
           tfold ext.mongodb tpecl mongodb-1.5.0 mongodb.so $INI
           tfold ext.amqp tpecl amqp-1.9.3 amqp.so $INI
+          tfold ext.igbinary tpecl igbinary-2.0.6 igbinary.so $INI
       fi
 
     - |
 
@@ -24,6 +24,7 @@
 use Symfony\Component\Cache\Adapter\AdapterInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Cache\Adapter\TagAwareAdapter;
+use Symfony\Component\Cache\Marshaller\DefaultMarshaller;
 use Symfony\Component\Cache\ResettableInterface;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\LoaderInterface;
@@ -1542,6 +1543,10 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
 
     private function registerCacheConfiguration(array $config, ContainerBuilder $container)
     {
+        if (!class_exists(DefaultMarshaller::class)) {
+            $container->removeDefinition('cache.default_marshaller');
+        }
+
         $version = new Parameter('container.build_id');
         $container->getDefinition('cache.adapter.apcu')->replaceArgument(2, $version);
         $container->getDefinition('cache.adapter.filesystem')->replaceArgument(2, $config['directory']);
 
@@ -75,6 +75,7 @@
             <argument /> <!-- namespace -->
             <argument>0</argument> <!-- default lifetime -->
             <argument>%kernel.cache_dir%/pools</argument>
+            <argument type="service" id="cache.default_marshaller" on-invalid="ignore" />
             <call method="setLogger">
                 <argument type="service" id="logger" on-invalid="ignore" />
             </call>
@@ -93,6 +94,7 @@
             <argument /> <!-- Redis connection service -->
             <argument /> <!-- namespace -->
             <argument>0</argument> <!-- default lifetime -->
+            <argument type="service" id="cache.default_marshaller" on-invalid="ignore" />
             <call method="setLogger">
                 <argument type="service" id="logger" on-invalid="ignore" />
             </call>
@@ -104,6 +106,7 @@
             <argument /> <!-- Memcached connection service -->
             <argument /> <!-- namespace -->
             <argument>0</argument> <!-- default lifetime -->
+            <argument type="service" id="cache.default_marshaller" on-invalid="ignore" />
             <call method="setLogger">
                 <argument type="service" id="logger" on-invalid="ignore" />
             </call>
@@ -131,6 +134,10 @@
             </call>
         </service>
 
+        <service id="cache.default_marshaller" class="Symfony\Component\Cache\Marshaller\DefaultMarshaller">
+            <argument>null</argument> <!-- use igbinary_serialize() when available -->
+        </service>
+
         <service id="cache.default_clearer" class="Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer">
             <argument type="collection" />
         </service>
 
@@ -81,7 +81,7 @@ function ($deferred, $namespace, &$expiredIds) use ($getId) {
                     if (isset(($metadata = $item->newMetadata)[CacheItem::METADATA_TAGS])) {
                         unset($metadata[CacheItem::METADATA_TAGS]);
                     }
-                    // For compactness, expiry and creation duration are packed in the key of a array, using magic numbers as separators
+                    // For compactness, expiry and creation duration are packed in the key of an array, using magic numbers as separators
                     $byLifetime[$ttl][$getId($key)] = $metadata ? array("\x9D".pack('VN', (int) $metadata[CacheItem::METADATA_EXPIRY] - CacheItem::METADATA_EXPIRY_OFFSET, $metadata[CacheItem::METADATA_CTIME])."\x5F" => $item->value) : $item->value;
                 }
 
 
@@ -11,15 +11,18 @@
 
 namespace Symfony\Component\Cache\Adapter;
 
+use Symfony\Component\Cache\Marshaller\DefaultMarshaller;
+use Symfony\Component\Cache\Marshaller\MarshallerInterface;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\Traits\FilesystemTrait;
 
 class FilesystemAdapter extends AbstractAdapter implements PruneableInterface
 {
     use FilesystemTrait;
 
-    public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null)
+    public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null, MarshallerInterface $marshaller = null)
     {
+        $this->marshaller = $marshaller ?? new DefaultMarshaller();
         parent::__construct('', $defaultLifetime);
         $this->init($namespace, $directory);
     }
 
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Cache\Adapter;
 
+use Symfony\Component\Cache\Marshaller\MarshallerInterface;
 use Symfony\Component\Cache\Traits\MemcachedTrait;
 
 class MemcachedAdapter extends AbstractAdapter
@@ -29,8 +30,8 @@ class MemcachedAdapter extends AbstractAdapter
      *
      * Using a MemcachedAdapter as a pure items store is fine.
      */
-    public function __construct(\Memcached $client, string $namespace = '', int $defaultLifetime = 0)
+    public function __construct(\Memcached $client, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
     {
-        $this->init($client, $namespace, $defaultLifetime);
+        $this->init($client, $namespace, $defaultLifetime, $marshaller);
     }
 }
@@ -13,6 +13,7 @@
 
 use Doctrine\DBAL\Connection;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
+use Symfony\Component\Cache\Marshaller\MarshallerInterface;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\Traits\PdoTrait;
 
@@ -46,8 +47,8 @@ class PdoAdapter extends AbstractAdapter implements PruneableInterface
      * @throws InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION
      * @throws InvalidArgumentException When namespace contains invalid characters
      */
-    public function __construct($connOrDsn, string $namespace = '', int $defaultLifetime = 0, array $options = array())
+    public function __construct($connOrDsn, string $namespace = '', int $defaultLifetime = 0, array $options = array(), MarshallerInterface $marshaller = null)
     {
-        $this->init($connOrDsn, $namespace, $defaultLifetime, $options);
+        $this->init($connOrDsn, $namespace, $defaultLifetime, $options, $marshaller);
     }
 }
@@ -16,6 +16,7 @@
 use Symfony\Component\Cache\CacheInterface;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
+use Symfony\Component\Cache\Marshaller\DefaultMarshaller;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\ResettableInterface;
 use Symfony\Component\Cache\Traits\GetTrait;
@@ -34,6 +35,7 @@ class PhpArrayAdapter implements AdapterInterface, CacheInterface, PruneableInte
     use GetTrait;
 
     private $createCacheItem;
+    private $marshaller;
 
     /**
      * @param string           $file         The PHP file were values are cached
@@ -88,6 +90,7 @@ public function get(string $key, callable $callback, float $beta = null)
             $this->initialize();
         }
         if (!isset($this->keys[$key])) {
+            get_from_pool:
             if ($this->pool instanceof CacheInterface) {
                 return $this->pool->get($key, $callback, $beta);
             }
@@ -99,11 +102,16 @@ public function get(string $key, callable $callback, float $beta = null)
         if ('N;' === $value) {
             return null;
         }
-        if ($value instanceof \Closure) {
-            return $value();
-        }
-        if (\is_string($value) && isset($value[2]) && ':' === $value[1]) {
-            return unserialize($value);
+        try {
+            if ($value instanceof \Closure) {
+                return $value();
+            }
+            if (\is_string($value) && isset($value[2]) && ':' === $value[1]) {
+                return ($this->marshaller ?? $this->marshaller = new DefaultMarshaller())->unmarshall($value);
+            }
+        } catch (\Throwable $e) {
+            unset($this->keys[$key]);
+            goto get_from_pool;
         }
 
         return $value;
@@ -278,7 +286,7 @@ private function generateItems(array $keys): \Generator
                     }
                 } elseif (\is_string($value) && isset($value[2]) && ':' === $value[1]) {
                     try {
-                        yield $key => $f($key, unserialize($value), true);
+                        yield $key => $f($key, $this->unserializeValue($value), true);
                     } catch (\Throwable $e) {
                         yield $key => $f($key, null, false);
                     }
 
@@ -69,15 +69,15 @@ function ($key, $innerItem) use ($defaultLifetime, $poolHash) {
         );
         $this->setInnerItem = \Closure::bind(
             /**
-             * @param array $item A CacheItem cast to (array); accessing protected properties requires adding the \0*\0" PHP prefix
+             * @param array $item A CacheItem cast to (array); accessing protected properties requires adding the "\0*\0" PHP prefix
              */
             function (CacheItemInterface $innerItem, array $item) {
                 // Tags are stored separately, no need to account for them when considering this item's newly set metadata
                 if (isset(($metadata = $item["\0*\0newMetadata"])[CacheItem::METADATA_TAGS])) {
                     unset($metadata[CacheItem::METADATA_TAGS]);
                 }
                 if ($metadata) {
-                    // For compactness, expiry and creation duration are packed in the key of a array, using magic numbers as separators
+                    // For compactness, expiry and creation duration are packed in the key of an array, using magic numbers as separators
                     $item["\0*\0value"] = array("\x9D".pack('VN', (int) $metadata[CacheItem::METADATA_EXPIRY] - CacheItem::METADATA_EXPIRY_OFFSET, $metadata[CacheItem::METADATA_CTIME])."\x5F" => $item["\0*\0value"]);
                 }
                 $innerItem->set($item["\0*\0value"]);
 
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Cache\Adapter;
 
+use Symfony\Component\Cache\Marshaller\MarshallerInterface;
 use Symfony\Component\Cache\Traits\RedisTrait;
 
 class RedisAdapter extends AbstractAdapter
@@ -22,8 +23,8 @@ class RedisAdapter extends AbstractAdapter
      * @param string                                          $namespace       The default namespace
      * @param int                                             $defaultLifetime The default lifetime
      */
-    public function __construct($redisClient, string $namespace = '', int $defaultLifetime = 0)
+    public function __construct($redisClient, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
     {
-        $this->init($redisClient, $namespace, $defaultLifetime);
+        $this->init($redisClient, $namespace, $defaultLifetime, $marshaller);
     }
 }
@@ -4,13 +4,15 @@ CHANGELOG
 4.2.0
 -----
 
+ * added `MarshallerInterface` and `DefaultMarshaller` to allow changing the serializer and provide one that automatically uses igbinary when available
  * added `CacheInterface`, which provides stampede protection via probabilistic early expiration and should become the preferred way to use a cache
  * added sub-second expiry accuracy for backends that support it
  * added support for phpredis 4 `compression` and `tcp_keepalive` options
  * added automatic table creation when using Doctrine DBAL with PDO-based backends
  * throw `LogicException` when `CacheItem::tag()` is called on an item coming from a non tag-aware pool
  * deprecated `CacheItem::getPreviousTags()`, use `CacheItem::getMetadata()` instead
  * deprecated the `AbstractAdapter::createSystemCache()` method
+ * deprecated the `AbstractAdapter::unserialize()` and `AbstractCache::unserialize()` methods
 
 3.4.0
 -----
 
@@ -0,0 +1,99 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Marshaller;
+
+use Symfony\Component\Cache\Exception\CacheException;
+
+/**
+ * Serializes/unserializes values using igbinary_serialize() if available, serialize() otherwise.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class DefaultMarshaller implements MarshallerInterface
+{
+    private $useIgbinarySerialize = true;
+
+    public function __construct(bool $useIgbinarySerialize = null)
+    {
+        if (null === $useIgbinarySerialize) {
+            $useIgbinarySerialize = \extension_loaded('igbinary');
+        } elseif ($useIgbinarySerialize && !\extension_loaded('igbinary')) {
+            throw new CacheException('The "igbinary" PHP extension is not loaded.');
+        }
+        $this->useIgbinarySerialize = $useIgbinarySerialize;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function marshall(array $values, ?array &$failed): array
+    {
+        $serialized = $failed = array();
+
+        foreach ($values as $id => $value) {
+            try {
+                if ($this->useIgbinarySerialize) {
+                    $serialized[$id] = igbinary_serialize($value);
+                } else {
+                    $serialized[$id] = serialize($value);
+                }
+            } catch (\Exception $e) {
+                $failed[] = $id;
+            }
+        }
+
+        return $serialized;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function unmarshall(string $value)
+    {
+        if ('b:0;' === $value) {
+            return false;
+        }
+        if ('N;' === $value) {
+            return null;
+        }
+        static $igbinaryNull;
+        if ($value === ($igbinaryNull ?? $igbinaryNull = \extension_loaded('igbinary') ? igbinary_serialize(null) : false)) {
+            return null;
+        }
+        $unserializeCallbackHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback');
+        try {
+            if (':' === ($value[1] ?? ':')) {
+                if (false !== $value = unserialize($value)) {
+                    return $value;
+                }
+            } elseif (false === $igbinaryNull) {
+                throw new \RuntimeException('Failed to unserialize cached value, did you forget to install the "igbinary" extension?');
+            } elseif (null !== $value = igbinary_unserialize($value)) {
+                return $value;
+            }
+
+            throw new \DomainException(error_get_last() ? error_get_last()['message'] : 'Failed to unserialize cached value');
+        } catch (\Error $e) {
+            throw new \ErrorException($e->getMessage(), $e->getCode(), E_ERROR, $e->getFile(), $e->getLine());
+        } finally {
+            ini_set('unserialize_callback_func', $unserializeCallbackHandler);
+        }
+    }
+
+    /**
+     * @internal
+     */
+    public static function handleUnserializeCallback($class)
+    {
+        throw new \DomainException('Class not found: '.$class);
+    }
+}
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Marshaller;
+
+/**
+ * Serializes/unserializes PHP values.
+ *
+ * Implementations of this interface MUST deal with errors carefuly. They MUST
+ * also deal with forward and backward compatibility at the storage format level.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+interface MarshallerInterface
+{
+    /**
+     * Serializes a list of values.
+     *
+     * When serialization fails for a specific value, no exception should be
+     * thrown. Instead, its key should be listed in $failed.
+     */
+    public function marshall(array $values, ?array &$failed): array;
+
+    /**
+     * Unserializes a single value and throws an exception if anything goes wrong.
+     *
+     * @return mixed
+     *
+     * @throws \Exception Whenever unserialization fails
+     */
+    public function unmarshall(string $value);
+}
@@ -11,15 +11,18 @@
 
 namespace Symfony\Component\Cache\Simple;
 
+use Symfony\Component\Cache\Marshaller\DefaultMarshaller;
+use Symfony\Component\Cache\Marshaller\MarshallerInterface;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\Traits\FilesystemTrait;
 
 class FilesystemCache extends AbstractCache implements PruneableInterface
 {
     use FilesystemTrait;
 
-    public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null)
+    public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null, MarshallerInterface $marshaller = null)
     {
+        $this->marshaller = $marshaller ?? new DefaultMarshaller();
         parent::__construct('', $defaultLifetime);
         $this->init($namespace, $directory);
     }