Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use the extended proxy interface in the same namespace #597

Merged
merged 1 commit into from Mar 3, 2013
Merged

use the extended proxy interface in the same namespace #597

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/Doctrine/ORM/Proxy/ProxyFactory.php
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@
use Doctrine\Common\Proxy\AbstractProxyFactory; use Doctrine\Common\Proxy\AbstractProxyFactory;
use Doctrine\Common\Proxy\ProxyDefinition; use Doctrine\Common\Proxy\ProxyDefinition;
use Doctrine\Common\Util\ClassUtils; use Doctrine\Common\Util\ClassUtils;
use Doctrine\Common\Proxy\Proxy; use Doctrine\Common\Proxy\Proxy as BaseProxy;
use Doctrine\Common\Proxy\ProxyGenerator; use Doctrine\Common\Proxy\ProxyGenerator;
use Doctrine\ORM\ORMInvalidArgumentException; use Doctrine\ORM\ORMInvalidArgumentException;
use Doctrine\ORM\Persisters\BasicEntityPersister; use Doctrine\ORM\Persisters\BasicEntityPersister;
Expand Down Expand Up @@ -116,7 +116,7 @@ protected function createProxyDefinition($className)
private function createInitializer(ClassMetadata $classMetadata, BasicEntityPersister $entityPersister) private function createInitializer(ClassMetadata $classMetadata, BasicEntityPersister $entityPersister)
{ {
if ($classMetadata->getReflectionClass()->hasMethod('__wakeup')) { if ($classMetadata->getReflectionClass()->hasMethod('__wakeup')) {
return function (Proxy $proxy) use ($entityPersister, $classMetadata) { return function (BaseProxy $proxy) use ($entityPersister, $classMetadata) {
$proxy->__setInitializer(null); $proxy->__setInitializer(null);
$proxy->__setCloner(null); $proxy->__setCloner(null);


Expand All @@ -141,7 +141,7 @@ private function createInitializer(ClassMetadata $classMetadata, BasicEntityPers
}; };
} }


return function (Proxy $proxy) use ($entityPersister, $classMetadata) { return function (BaseProxy $proxy) use ($entityPersister, $classMetadata) {
$proxy->__setInitializer(null); $proxy->__setInitializer(null);
$proxy->__setCloner(null); $proxy->__setCloner(null);


Expand Down Expand Up @@ -177,7 +177,7 @@ private function createInitializer(ClassMetadata $classMetadata, BasicEntityPers
*/ */
private function createCloner(ClassMetadata $classMetadata, BasicEntityPersister $entityPersister) private function createCloner(ClassMetadata $classMetadata, BasicEntityPersister $entityPersister)
{ {
return function (Proxy $proxy) use ($entityPersister, $classMetadata) { return function (BaseProxy $proxy) use ($entityPersister, $classMetadata) {
if ($proxy->__isInitialized()) { if ($proxy->__isInitialized()) {
return; return;
} }
Expand Down