From 1846f5845cc803f6ecda8e0ddad02d73951be3f8 Mon Sep 17 00:00:00 2001
From: MDrollette <matt@drollette.com>
Date: Fri, 1 Mar 2013 11:58:51 -0600
Subject: [PATCH] alias the proxy class on import to avoid "already exists"
 error

---
 lib/Doctrine/ORM/Proxy/ProxyFactory.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Doctrine/ORM/Proxy/ProxyFactory.php b/lib/Doctrine/ORM/Proxy/ProxyFactory.php
index f23b1063f11..c8964804e58 100644
--- a/lib/Doctrine/ORM/Proxy/ProxyFactory.php
+++ b/lib/Doctrine/ORM/Proxy/ProxyFactory.php
@@ -23,7 +23,7 @@
 use Doctrine\Common\Proxy\AbstractProxyFactory;
 use Doctrine\Common\Proxy\ProxyDefinition;
 use Doctrine\Common\Util\ClassUtils;
-use Doctrine\Common\Proxy\Proxy;
+use Doctrine\Common\Proxy\Proxy as BaseProxy;
 use Doctrine\Common\Proxy\ProxyGenerator;
 use Doctrine\ORM\ORMInvalidArgumentException;
 use Doctrine\ORM\Persisters\BasicEntityPersister;
@@ -116,7 +116,7 @@ protected function createProxyDefinition($className)
     private function createInitializer(ClassMetadata $classMetadata, BasicEntityPersister $entityPersister)
     {
         if ($classMetadata->getReflectionClass()->hasMethod('__wakeup')) {
-            return function (Proxy $proxy) use ($entityPersister, $classMetadata) {
+            return function (BaseProxy $proxy) use ($entityPersister, $classMetadata) {
                 $proxy->__setInitializer(null);
                 $proxy->__setCloner(null);
 
@@ -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->__setCloner(null);
 
@@ -177,7 +177,7 @@ private function createInitializer(ClassMetadata $classMetadata, BasicEntityPers
      */
     private function createCloner(ClassMetadata $classMetadata, BasicEntityPersister $entityPersister)
     {
-        return function (Proxy $proxy) use ($entityPersister, $classMetadata) {
+        return function (BaseProxy $proxy) use ($entityPersister, $classMetadata) {
             if ($proxy->__isInitialized()) {
                 return;
             }