Merge pull request doctrine#1045 from marmotz/master

guilhermeblanco · guilhermeblanco · commit a851dd68fbb5 · 2014-05-30T09:11:34.000-04:00
Fix the "Erroneous data format for unserializing" error message
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -908,7 +908,12 @@ public function __sleep()
     public function newInstance()
     {
         if ($this->_prototype === null) {
-            $this->_prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($this->name), $this->name));
+            if (version_compare(PHP_VERSION, '5.4') >= 0) {
+                $rc = new \ReflectionClass($this->name);
+                $this->_prototype = $rc->newInstanceWithoutConstructor();
+            } else {
+                $this->_prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($this->name), $this->name));
+            }
         }
 
         return clone $this->_prototype;

Original file line number	Diff line number	Diff line change
`@@ -908,7 +908,12 @@ public function __sleep()`
`908`	`908`	`public function newInstance()`
`909`	`909`	`{`
`910`	`910`	`if ($this->_prototype === null) {`
`911`		`- $this->_prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($this->name), $this->name));`
	`911`	`+ if (version_compare(PHP_VERSION, '5.4') >= 0) {`
	`912`	`+ $rc = new \ReflectionClass($this->name);`
	`913`	`+ $this->_prototype = $rc->newInstanceWithoutConstructor();`
	`914`	`+ } else {`
	`915`	`+ $this->_prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($this->name), $this->name));`
	`916`	`+ }`
`912`	`917`	`}`
`913`	`918`
`914`	`919`	`return clone $this->_prototype;`