Merge pull request #1154 from Ocramius/hotfix/PHP-5.6-serialization-fix

deeky666 · deeky666 · commit d46fa4adeb86 · 2014-10-06T15:08:37.000+02:00
DDC-3120 - PHP 5.6 internal classes/Serializable serialization fix
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ php:
   - 5.3
   - 5.4
   - 5.5
+  - 5.6
 
 env:
   - DB=mysql
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -866,7 +866,7 @@ public function __sleep()
     public function newInstance()
     {
         if ($this->_prototype === null) {
-            if (PHP_VERSION_ID === 50429 || PHP_VERSION_ID === 50513) {
+            if (PHP_VERSION_ID === 50429 || PHP_VERSION_ID === 50513 || PHP_VERSION_ID >= 50600) {
                 $this->_prototype = $this->reflClass->newInstanceWithoutConstructor();
             } else {
                 $this->_prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($this->name), $this->name));
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
@@ -1101,6 +1101,31 @@ public function testIsIdentifierMappedSuperClass()
 
         $this->assertFalse($class->isIdentifier('foo'));
     }
+
+    /**
+     * @group DDC-3120
+     */
+    public function testCanInstantiateInternalPhpClassSubclass()
+    {
+        $classMetadata = new ClassMetadata(__NAMESPACE__ . '\\MyArrayObjectEntity');
+
+        $classMetadata->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
+        $this->assertInstanceOf(__NAMESPACE__ . '\\MyArrayObjectEntity', $classMetadata->newInstance());
+    }
+
+    /**
+     * @group DDC-3120
+     */
+    public function testCanInstantiateInternalPhpClassSubclassFromUnserializedMetadata()
+    {
+        /* @var $classMetadata ClassMetadata */
+        $classMetadata = unserialize(serialize(new ClassMetadata(__NAMESPACE__ . '\\MyArrayObjectEntity')));
+
+        $classMetadata->wakeupReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
+
+        $this->assertInstanceOf(__NAMESPACE__ . '\\MyArrayObjectEntity', $classMetadata->newInstance());
+    }
 }
 
 /**
@@ -1137,3 +1162,7 @@ public function propertyToColumnName($propertyName, $className = null)
         return strtolower($this->classToTableName($className)) . '_' . $propertyName;
     }
 }
+
+class MyArrayObjectEntity extends \ArrayObject
+{
+}

-Original file line number
+Diff line change
   - 5.3
   - 5.4
   - 5.5
 +  - 5.6
 env:
   - DB=mysql
Original file line number	Diff line number	Diff line change
`@@ -866,7 +866,7 @@ public function __sleep()`
`866`	`866`	`public function newInstance()`
`867`	`867`	`{`
`868`	`868`	`if ($this->_prototype === null) {`
`869`		`- if (PHP_VERSION_ID === 50429 \|\| PHP_VERSION_ID === 50513) {`
	`869`	`+ if (PHP_VERSION_ID === 50429 \|\| PHP_VERSION_ID === 50513 \|\| PHP_VERSION_ID >= 50600) {`
`870`	`870`	`$this->_prototype = $this->reflClass->newInstanceWithoutConstructor();`
`871`	`871`	`} else {`
`872`	`872`	`$this->_prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($this->name), $this->name));`