Conditionally add options to unserialize in PHP 7.0+.

Denis Brumann · Denis Brumann · commit b4201810b951 · 2016-12-29T19:41:55.000+01:00
diff --git a/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php b/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php
@@ -93,7 +93,11 @@ public function getHtmlCallGraph()
     public function getProfile()
     {
         if (null === $this->profile) {
-            $this->profile = unserialize($this->data['profile']);
+            if (PHP_VERSION_ID >= 70000) {
+                $this->profile = unserialize($this->data['profile'], array('allowed_classes' => array('Twig_Profiler_Profile')));
+            } else {
+                $this->profile = unserialize($this->data['profile']);
+            }
         }
 
         return $this->profile;
diff --git a/src/Symfony/Component/DependencyInjection/Config/AutowireServiceResource.php b/src/Symfony/Component/DependencyInjection/Config/AutowireServiceResource.php
@@ -60,7 +60,11 @@ public function serialize()
 
     public function unserialize($serialized)
     {
-        list($this->class, $this->filePath, $this->autowiringMetadata) = unserialize($serialized);
+        if (PHP_VERSION_ID >= 70000) {
+            list($this->class, $this->filePath, $this->autowiringMetadata) = unserialize($serialized, array('allowed_classes' => false));
+        } else {
+            list($this->class, $this->filePath, $this->autowiringMetadata) = unserialize($serialized);
+        }
     }
 
     /**
diff --git a/src/Symfony/Component/Form/FormError.php b/src/Symfony/Component/Form/FormError.php
@@ -185,6 +185,10 @@ public function serialize()
      */
     public function unserialize($serialized)
     {
-        list($this->message, $this->messageTemplate, $this->messageParameters, $this->messagePluralization, $this->cause) = unserialize($serialized);
+        if (PHP_VERSION_ID >= 70000) {
+            list($this->message, $this->messageTemplate, $this->messageParameters, $this->messagePluralization, $this->cause) = unserialize($serialized, array('allowed_classes' => false));
+        } else {
+            list($this->message, $this->messageTemplate, $this->messageParameters, $this->messagePluralization, $this->cause) = unserialize($serialized);
+        }
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Config/EnvParametersResource.php b/src/Symfony/Component/HttpKernel/Config/EnvParametersResource.php
@@ -72,7 +72,11 @@ public function serialize()
 
     public function unserialize($serialized)
     {
-        $unserialized = unserialize($serialized);
+        if (PHP_VERSION_ID >= 70000) {
+            $unserialized = unserialize($serialized, array('allowed_classes' => false));
+        } else {
+            $unserialized = unserialize($serialized);
+        }
 
         $this->prefix = $unserialized['prefix'];
         $this->variables = $unserialized['variables'];
diff --git a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php
@@ -63,7 +63,11 @@ public function serialize()
 
     public function unserialize($serialized)
     {
-        $this->fileLinkFormat = unserialize($serialized);
+        if (PHP_VERSION_ID >= 70000) {
+            $this->fileLinkFormat = unserialize($serialized, array('allowed_classes' => false));
+        } else {
+            $this->fileLinkFormat = unserialize($serialized);
+        }
     }
 
     private function getFileLinkFormat()
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -734,7 +734,11 @@ public function serialize()
 
     public function unserialize($data)
     {
-        list($environment, $debug) = unserialize($data);
+        if (PHP_VERSION_ID >= 70000) {
+            list($environment, $debug) = unserialize($data, array('allowed_classes' => false));
+        } else {
+            list($environment, $debug) = unserialize($data);
+        }
 
         $this->__construct($environment, $debug);
     }
diff --git a/src/Symfony/Component/Routing/CompiledRoute.php b/src/Symfony/Component/Routing/CompiledRoute.php
@@ -73,7 +73,12 @@ public function serialize()
      */
     public function unserialize($serialized)
     {
-        $data = unserialize($serialized);
+        if (PHP_VERSION_ID >= 70000) {
+            $data = unserialize($serialized, array('allowed_classes' => false));
+        } else {
+            $data = unserialize($serialized);
+        }
+
         $this->variables = $data['vars'];
         $this->staticPrefix = $data['path_prefix'];
         $this->regex = $data['path_regex'];
diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php
@@ -116,7 +116,11 @@ public function serialize()
      */
     public function unserialize($serialized)
     {
-        $data = unserialize($serialized);
+        if (PHP_VERSION_ID >= 70000) {
+            $data = unserialize($serialized, array('allowed_classes' => array(CompiledRoute::class)));
+        } else {
+            $data = unserialize($serialized);
+        }
         $this->path = $data['path'];
         $this->host = $data['host'];
         $this->defaults = $data['defaults'];

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,11 @@ public function getHtmlCallGraph()`
`93`	`93`	`public function getProfile()`
`94`	`94`	`{`
`95`	`95`	`if (null === $this->profile) {`
`96`		`- $this->profile = unserialize($this->data['profile']);`
	`96`	`+ if (PHP_VERSION_ID >= 70000) {`
	`97`	`+ $this->profile = unserialize($this->data['profile'], array('allowed_classes' => array('Twig_Profiler_Profile')));`
	`98`	`+ } else {`
	`99`	`+ $this->profile = unserialize($this->data['profile']);`
	`100`	`+ }`
`97`	`101`	`}`
`98`	`102`
`99`	`103`	`return $this->profile;`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,11 @@ public function serialize()`
`60`	`60`
`61`	`61`	`public function unserialize($serialized)`
`62`	`62`	`{`
`63`		`- list($this->class, $this->filePath, $this->autowiringMetadata) = unserialize($serialized);`
	`63`	`+ if (PHP_VERSION_ID >= 70000) {`
	`64`	`+ list($this->class, $this->filePath, $this->autowiringMetadata) = unserialize($serialized, array('allowed_classes' => false));`
	`65`	`+ } else {`
	`66`	`+ list($this->class, $this->filePath, $this->autowiringMetadata) = unserialize($serialized);`
	`67`	`+ }`
`64`	`68`	`}`
`65`	`69`
`66`	`70`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,10 @@ public function serialize()`
`185`	`185`	`*/`
`186`	`186`	`public function unserialize($serialized)`
`187`	`187`	`{`
`188`		`- list($this->message, $this->messageTemplate, $this->messageParameters, $this->messagePluralization, $this->cause) = unserialize($serialized);`
	`188`	`+ if (PHP_VERSION_ID >= 70000) {`
	`189`	`+ list($this->message, $this->messageTemplate, $this->messageParameters, $this->messagePluralization, $this->cause) = unserialize($serialized, array('allowed_classes' => false));`
	`190`	`+ } else {`
	`191`	`+ list($this->message, $this->messageTemplate, $this->messageParameters, $this->messagePluralization, $this->cause) = unserialize($serialized);`
	`192`	`+ }`
`189`	`193`	`}`
`190`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,11 @@ public function serialize()`
`63`	`63`
`64`	`64`	`public function unserialize($serialized)`
`65`	`65`	`{`
`66`		`- $this->fileLinkFormat = unserialize($serialized);`
	`66`	`+ if (PHP_VERSION_ID >= 70000) {`
	`67`	`+ $this->fileLinkFormat = unserialize($serialized, array('allowed_classes' => false));`
	`68`	`+ } else {`
	`69`	`+ $this->fileLinkFormat = unserialize($serialized);`
	`70`	`+ }`
`67`	`71`	`}`
`68`	`72`
`69`	`73`	`private function getFileLinkFormat()`
Original file line number	Diff line number	Diff line change
`@@ -734,7 +734,11 @@ public function serialize()`
`734`	`734`
`735`	`735`	`public function unserialize($data)`
`736`	`736`	`{`
`737`		`- list($environment, $debug) = unserialize($data);`
	`737`	`+ if (PHP_VERSION_ID >= 70000) {`
	`738`	`+ list($environment, $debug) = unserialize($data, array('allowed_classes' => false));`
	`739`	`+ } else {`
	`740`	`+ list($environment, $debug) = unserialize($data);`
	`741`	`+ }`
`738`	`742`
`739`	`743`	`$this->__construct($environment, $debug);`
`740`	`744`	`}`