RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

[2.0] Fixed proxy classes to not invoke parent class constructors. We never call constructors to reconstitute persistent entities and proxies always represent persistent entities.

Browse source
This commit is contained in:
romanb 2010-02-11 09:48:57 +00:00
parent 962ecab75e
commit 86c12a07e5
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/Doctrine/ORM/Proxy/ProxyFactory.php
View file

@ -121,19 +121,16 @@ class ProxyFactory
* @param $originalClassName * @param $originalClassName
* @param $proxyClassName * @param $proxyClassName
* @param $file The path of the file to write to. * @param $file The path of the file to write to.
* @return void
*/ */
private function _generateProxyClass($class, $proxyClassName, $fileName, $file) private function _generateProxyClass($class, $proxyClassName, $fileName, $file)
{ {
$methods = $this->_generateMethods($class); $methods = $this->_generateMethods($class);
$sleepImpl = $this->_generateSleep($class); $sleepImpl = $this->_generateSleep($class);
$constructorInv = $class->reflClass->hasMethod('__construct') ? 'parent::__construct();' : '';
$placeholders = array( $placeholders = array(
'<namespace>', '<namespace>',
'<proxyClassName>', '<className>', '<proxyClassName>', '<className>',
'<methods>', '<sleepImpl>', '<methods>', '<sleepImpl>'
'<constructorInvocation>'
); );
if(substr($class->name, 0, 1) == "\\") { if(substr($class->name, 0, 1) == "\\") {
@ -145,8 +142,7 @@ class ProxyFactory
$replacements = array( $replacements = array(
$this->_proxyNamespace, $this->_proxyNamespace,
$proxyClassName, $className, $proxyClassName, $className,
$methods, $sleepImpl, $methods, $sleepImpl
$constructorInv
); );
$file = str_replace($placeholders, $replacements, $file); $file = str_replace($placeholders, $replacements, $file);
@ -258,7 +254,6 @@ namespace <namespace> {
public function __construct($entityPersister, $identifier) { public function __construct($entityPersister, $identifier) {
$this->_entityPersister = $entityPersister; $this->_entityPersister = $entityPersister;
$this->_identifier = $identifier; $this->_identifier = $identifier;
<constructorInvocation>
} }
private function _load() { private function _load() {
if (!$this->__isInitialized__) { if (!$this->__isInitialized__) {