RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-22 15:13:13 +03:00
Code Issues Projects Releases Wiki Activity

DDC-3120 - using Doctrine\Instantiator when building new instances

Browse Source
This commit is contained in:
Marco Pivetta 2014-08-14 15:51:48 +02:00
parent f8a8437c95
commit 361ec2a474
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
View File

@ -20,6 +20,7 @@
namespace Doctrine\ORM\Mapping; namespace Doctrine\ORM\Mapping;
use BadMethodCallException; use BadMethodCallException;
use Doctrine\Instantiator\Instantiator;
use InvalidArgumentException; use InvalidArgumentException;
use RuntimeException; use RuntimeException;
use Doctrine\DBAL\Types\Type; use Doctrine\DBAL\Types\Type;
@ -643,11 +644,9 @@ class ClassMetadataInfo implements ClassMetadata
public $reflFields = array(); public $reflFields = array();
/** /**
* The prototype from which new instances of the mapped class are created. * @var \Doctrine\Instantiator\InstantiatorInterface|null
*
* @var object
*/ */
private $_prototype; private $instantiator;
/** /**
* Initializes a new ClassMetadata instance that will hold the object-relational mapping * Initializes a new ClassMetadata instance that will hold the object-relational mapping
@ -661,6 +660,7 @@ class ClassMetadataInfo implements ClassMetadata
$this->name = $entityName; $this->name = $entityName;
$this->rootEntityName = $entityName; $this->rootEntityName = $entityName;
$this->namingStrategy = $namingStrategy ?: new DefaultNamingStrategy(); $this->namingStrategy = $namingStrategy ?: new DefaultNamingStrategy();
$this->instantiator = new Instantiator();
} }
/** /**
@ -907,15 +907,7 @@ class ClassMetadataInfo implements ClassMetadata
*/ */
public function newInstance() public function newInstance()
{ {
if ($this->_prototype === null) { return $this->instantiator->instantiate($this->name);
if (PHP_VERSION_ID === 50429 || PHP_VERSION_ID === 50513) {
$this->_prototype = $this->reflClass->newInstanceWithoutConstructor();
} else {
$this->_prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($this->name), $this->name));
}
}
return clone $this->_prototype;
} }
/** /**
@ -928,7 +920,8 @@ class ClassMetadataInfo implements ClassMetadata
public function wakeupReflection($reflService) public function wakeupReflection($reflService)
{ {
// Restore ReflectionClass and properties // Restore ReflectionClass and properties
$this->reflClass = $reflService->getClass($this->name); $this->reflClass = $reflService->getClass($this->name);
$this->instantiator = $this->instantiator ?: new Instantiator();
foreach ($this->fieldMappings as $field => $mapping) { foreach ($this->fieldMappings as $field => $mapping) {
if (isset($mapping['declaredField'])) { if (isset($mapping['declaredField'])) {