[DoctrineBundle] renamed RegistryInterface::getEntityManagerForObject() to getEntityManagerForClass()

fabpot · fabpot · commit d3a69e353116 · 2011-07-19T19:24:57.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/RegistryInterface.php b/src/Symfony/Bridge/Doctrine/RegistryInterface.php
@@ -125,11 +125,11 @@ function getEntityManagerNames();
     function getRepository($entityName, $entityManagerName = null);
 
     /**
-     * Gets the entity manager associated with a given object.
+     * Gets the entity manager associated with a given class.
      *
-     * @param object $object A Doctrine Entity
+     * @param string $class A Doctrine Entity class name
      *
      * @return EntityManager|null
      */
-    function getEntityManagerForObject($object);
+    function getEntityManagerForClass($class);
 }
diff --git a/src/Symfony/Bridge/Doctrine/Validator/EntityInitializer.php b/src/Symfony/Bridge/Doctrine/Validator/EntityInitializer.php
@@ -32,7 +32,7 @@ public function __construct(RegistryInterface $registry)
     public function initialize($object)
     {
         if ($object instanceof Proxy) {
-            $this->registry->getEntityManagerForObject($object)->getUnitOfWork()->initializeObject($object);
+            $this->registry->getEntityManagerForClass(get_class($object))->getUnitOfWork()->initializeObject($object);
         }
     }
 }
diff --git a/src/Symfony/Bundle/DoctrineBundle/Registry.php b/src/Symfony/Bundle/DoctrineBundle/Registry.php
@@ -16,7 +16,6 @@
 use Doctrine\DBAL\Connection;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\ORMException;
-use Doctrine\ORM\Proxy\Proxy;
 
 /**
  * References all Doctrine connections and entity managers in a given Container.
@@ -219,19 +218,17 @@ public function getRepository($entityName, $entityManagerName = null)
     }
 
     /**
-     * Gets the entity manager associated with a given object.
+     * Gets the entity manager associated with a given class.
      *
-     * @param object $object A Doctrine Entity
+     * @param string $class A Doctrine Entity class name
      *
      * @return EntityManager|null
      */
-    public function getEntityManagerForObject($object)
+    public function getEntityManagerForClass($class)
     {
-        if ($object instanceof Proxy) {
-            $proxyClass = new \ReflectionClass($object);
+        $proxyClass = new \ReflectionClass($class);
+        if ($proxyClass->implementsInterface('Doctrine\ORM\Proxy\Proxy')) {
             $class = $proxyClass->getParentClass()->getName();
-        } else {
-            $class = get_class($object);
         }
 
         foreach ($this->entityManagers as $id) {

Original file line number	Diff line number	Diff line change
`@@ -125,11 +125,11 @@ function getEntityManagerNames();`
`125`	`125`	`function getRepository($entityName, $entityManagerName = null);`
`126`	`126`
`127`	`127`	`/**`
`128`		`- * Gets the entity manager associated with a given object.`
	`128`	`+ * Gets the entity manager associated with a given class.`
`129`	`129`	`*`
`130`		`- * @param object $object A Doctrine Entity`
	`130`	`+ * @param string $class A Doctrine Entity class name`
`131`	`131`	`*`
`132`	`132`	`* @return EntityManager\|null`
`133`	`133`	`*/`
`134`		`- function getEntityManagerForObject($object);`
	`134`	`+ function getEntityManagerForClass($class);`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function __construct(RegistryInterface $registry)`
`32`	`32`	`public function initialize($object)`
`33`	`33`	`{`
`34`	`34`	`if ($object instanceof Proxy) {`
`35`		`- $this->registry->getEntityManagerForObject($object)->getUnitOfWork()->initializeObject($object);`
	`35`	`+ $this->registry->getEntityManagerForClass(get_class($object))->getUnitOfWork()->initializeObject($object);`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`	`use Doctrine\DBAL\Connection;`
`17`	`17`	`use Doctrine\ORM\Configuration;`
`18`	`18`	`use Doctrine\ORM\ORMException;`
`19`		`-use Doctrine\ORM\Proxy\Proxy;`
`20`	`19`
`21`	`20`	`/**`
`22`	`21`	`* References all Doctrine connections and entity managers in a given Container.`
`@@ -219,19 +218,17 @@ public function getRepository($entityName, $entityManagerName = null)`
`219`	`218`	`}`
`220`	`219`
`221`	`220`	`/**`
`222`		`- * Gets the entity manager associated with a given object.`
	`221`	`+ * Gets the entity manager associated with a given class.`
`223`	`222`	`*`
`224`		`- * @param object $object A Doctrine Entity`
	`223`	`+ * @param string $class A Doctrine Entity class name`
`225`	`224`	`*`
`226`	`225`	`* @return EntityManager\|null`
`227`	`226`	`*/`
`228`		`- public function getEntityManagerForObject($object)`
	`227`	`+ public function getEntityManagerForClass($class)`
`229`	`228`	`{`
`230`		`- if ($object instanceof Proxy) {`
`231`		`- $proxyClass = new \ReflectionClass($object);`
	`229`	`+ $proxyClass = new \ReflectionClass($class);`
	`230`	`+ if ($proxyClass->implementsInterface('Doctrine\ORM\Proxy\Proxy')) {`
`232`	`231`	`$class = $proxyClass->getParentClass()->getName();`
`233`		`- } else {`
`234`		`- $class = get_class($object);`
`235`	`232`	`}`
`236`	`233`
`237`	`234`	`foreach ($this->entityManagers as $id) {`