Fixed possible bugs introduced by fixing PHP bug

- https://bugs.php.net/bug.php?id=67072 - doctrine/orm#1051
Kdyby · Jun 7, 2014 · c29d640 · c29d640
1 parent dd5af1d
commit c29d640
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/Kdyby/Doctrine/Mapping/ClassMetadata.php b/src/Kdyby/Doctrine/Mapping/ClassMetadata.php
@@ -51,11 +51,18 @@ public function getReflectionClass()
 	public function newInstance()
 	{
 		if ($this->_prototype === null) {
-			if (PHP_VERSION_ID >= 50400) {
-				$this->_prototype = $this->getReflectionClass()->newInstanceWithoutConstructor();
+			if (PHP_VERSION_ID === 50429 || PHP_VERSION_ID === 50513) {
+				if ($this->getReflectionClass()->implementsInterface('Serializable')) {
+					$this->_prototype = @unserialize(sprintf('C:%d:"%s":0:{}', strlen($this->name), $this->name));
+				}
+			}
+
+			if (!$this->_prototype) {
+				$this->_prototype = @unserialize(sprintf('O:%d:"%s":0:{}', strlen($this->name), $this->name));
+			}
 
-			} else {
-				$this->_prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($this->name), $this->name));
+			if (!$this->_prototype) {
+				throw new Kdyby\Doctrine\UnexpectedValueException("Prototype of class {$this->name} cannot be created, probably due to some PHP bug.");
 			}
 		}