Upgrade 1-11.38

vendor/symfony/cache/Traits/FilesystemTrait.php

@@ -23,8 +23,6 @@ trait FilesystemTrait
 {
     use FilesystemCommonTrait;
 
-    private $marshaller;
-
     /**
      * @return bool
      */
@@ -70,7 +68,7 @@ trait FilesystemTrait
                 $value = stream_get_contents($h);
                 fclose($h);
                 if ($i === $id) {
-                    $values[$id] = $this->marshaller->unmarshall($value);
+                    $values[$id] = parent::unserialize($value);
                 }
             }
         }
@@ -93,19 +91,17 @@ trait FilesystemTrait
      */
     protected function doSave(array $values, $lifetime)
     {
+        $ok = true;
         $expiresAt = $lifetime ? (time() + $lifetime) : 0;
-        $values = $this->marshaller->marshall($values, $failed);
 
         foreach ($values as $id => $value) {
-            if (!$this->write($this->getFile($id, true), $expiresAt."\n".rawurlencode($id)."\n".$value, $expiresAt)) {
-                $failed[] = $id;
-            }
+            $ok = $this->write($this->getFile($id, true), $expiresAt."\n".rawurlencode($id)."\n".serialize($value), $expiresAt) && $ok;
         }
 
-        if ($failed && !is_writable($this->directory)) {
-            throw new CacheException(sprintf('Cache directory is not writable (%s)', $this->directory));
+        if (!$ok && !is_writable($this->directory)) {
+            throw new CacheException(sprintf('Cache directory is not writable (%s).', $this->directory));
         }
 
-        return $failed;
+        return $ok;
     }
 }