Upgrade 1-11.38

vendor/symfony/cache/Traits/PhpArrayTrait.php

@@ -13,7 +13,6 @@ namespace Symfony\Component\Cache\Traits;
 
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
-use Symfony\Component\VarExporter\VarExporter;
 
 /**
  * @author Titouan Galopin <galopintitouan@gmail.com>
@@ -26,8 +25,8 @@ trait PhpArrayTrait
     use ProxyTrait;
 
     private $file;
-    private $keys;
     private $values;
+    private $zendDetectUnicode;
 
     private static $valuesCache = [];
 
@@ -40,81 +39,74 @@ trait PhpArrayTrait
     {
         if (file_exists($this->file)) {
             if (!is_file($this->file)) {
-                throw new InvalidArgumentException(sprintf('Cache path exists and is not a file: %s.', $this->file));
+                throw new InvalidArgumentException(sprintf('Cache path exists and is not a file: "%s".', $this->file));
             }
 
             if (!is_writable($this->file)) {
-                throw new InvalidArgumentException(sprintf('Cache file is not writable: %s.', $this->file));
+                throw new InvalidArgumentException(sprintf('Cache file is not writable: "%s".', $this->file));
             }
         } else {
             $directory = \dirname($this->file);
 
             if (!is_dir($directory) && !@mkdir($directory, 0777, true)) {
-                throw new InvalidArgumentException(sprintf('Cache directory does not exist and cannot be created: %s.', $directory));
+                throw new InvalidArgumentException(sprintf('Cache directory does not exist and cannot be created: "%s".', $directory));
             }
 
             if (!is_writable($directory)) {
-                throw new InvalidArgumentException(sprintf('Cache directory is not writable: %s.', $directory));
+                throw new InvalidArgumentException(sprintf('Cache directory is not writable: "%s".', $directory));
             }
         }
 
-        $dumpedValues = '';
-        $dumpedMap = [];
         $dump = <<<'EOF'
 <?php
 
 // This file has been auto-generated by the Symfony Cache Component.
 
-return [[
+return [
 
 
 EOF;
 
         foreach ($values as $key => $value) {
             CacheItem::validateKey(\is_int($key) ? (string) $key : $key);
-            $isStaticValue = true;
 
-            if (null === $value) {
-                $value = "'N;'";
-            } elseif (\is_object($value) || \is_array($value)) {
+            if (null === $value || \is_object($value)) {
                 try {
-                    $value = VarExporter::export($value, $isStaticValue);
+                    $value = serialize($value);
                 } catch (\Exception $e) {
-                    throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable %s value.', $key, \is_object($value) ? \get_class($value) : 'array'), 0, $e);
+                    throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable "%s" value.', $key, \get_class($value)), 0, $e);
+                }
+            } elseif (\is_array($value)) {
+                try {
+                    $serialized = serialize($value);
+                    $unserialized = unserialize($serialized);
+                } catch (\Exception $e) {
+                    throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable array value.', $key), 0, $e);
+                }
+                // Store arrays serialized if they contain any objects or references
+                if ($unserialized !== $value || (false !== strpos($serialized, ';R:') && preg_match('/;R:[1-9]/', $serialized))) {
+                    $value = $serialized;
                 }
             } elseif (\is_string($value)) {
-                // Wrap "N;" in a closure to not confuse it with an encoded `null`
-                if ('N;' === $value) {
-                    $isStaticValue = false;
+                // Serialize strings if they could be confused with serialized objects or arrays
+                if ('N;' === $value || (isset($value[2]) && ':' === $value[1])) {
+                    $value = serialize($value);
                 }
-                $value = var_export($value, true);
             } elseif (!is_scalar($value)) {
-                throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable %s value.', $key, \gettype($value)));
-            } else {
-                $value = var_export($value, true);
+                throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable "%s" value.', $key, \gettype($value)));
             }
 
-            if (!$isStaticValue) {
-                $value = str_replace("\n", "\n    ", $value);
-                $value = "static function () {\n    return {$value};\n}";
-            }
-            $hash = hash('md5', $value);
-
-            if (null === $id = $dumpedMap[$hash] ?? null) {
-                $id = $dumpedMap[$hash] = \count($dumpedMap);
-                $dumpedValues .= "{$id} => {$value},\n";
-            }
-
-            $dump .= var_export($key, true)." => {$id},\n";
+            $dump .= var_export($key, true).' => '.var_export($value, true).",\n";
         }
 
-        $dump .= "\n], [\n\n{$dumpedValues}\n]];\n";
+        $dump .= "\n];\n";
+        $dump = str_replace("' . \"\\0\" . '", "\0", $dump);
 
         $tmpFile = uniqid($this->file, true);
 
         file_put_contents($tmpFile, $dump);
         @chmod($tmpFile, 0666 & ~umask());
-        unset($serialized, $value, $dump);
+        unset($serialized, $unserialized, $value, $dump);
 
         @rename($tmpFile, $this->file);
         unset(self::$valuesCache[$this->file]);
@@ -127,7 +119,7 @@ EOF;
      */
     public function clear()
     {
-        $this->keys = $this->values = [];
+        $this->values = [];
 
         $cleared = @unlink($this->file) || !file_exists($this->file);
         unset(self::$valuesCache[$this->file]);
@@ -141,19 +133,20 @@ EOF;
     private function initialize()
     {
         if (isset(self::$valuesCache[$this->file])) {
-            $values = self::$valuesCache[$this->file];
-        } elseif (!file_exists($this->file)) {
-            $this->keys = $this->values = [];
+            $this->values = self::$valuesCache[$this->file];
 
             return;
-        } else {
-            $values = self::$valuesCache[$this->file] = (include $this->file) ?: [[], []];
         }
 
-        if (2 !== \count($values) || !isset($values[0], $values[1])) {
-            $this->keys = $this->values = [];
-        } else {
-            list($this->keys, $this->values) = $values;
+        if ($this->zendDetectUnicode) {
+            $zmb = ini_set('zend.detect_unicode', 0);
+        }
+        try {
+            $this->values = self::$valuesCache[$this->file] = file_exists($this->file) ? (include $this->file ?: []) : [];
+        } finally {
+            if ($this->zendDetectUnicode) {
+                ini_set('zend.detect_unicode', $zmb);
+            }
         }
     }
 }