[DoctrineBridge] normalized class names in the ORM type guesser

fabpot · fabpot · commit a1b9c2ed6098 · 2013-11-29T15:03:45.000+01:00
diff --git a/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php b/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php
@@ -19,6 +19,7 @@
 use Symfony\Component\Form\Guess\Guess;
 use Symfony\Component\Form\Guess\TypeGuess;
 use Symfony\Component\Form\Guess\ValueGuess;
+use Doctrine\Common\Util\ClassUtils;
 
 class DoctrineOrmTypeGuesser implements FormTypeGuesserInterface
 {
@@ -161,6 +162,9 @@ public function guessPattern($class, $property)
 
     protected function getMetadata($class)
     {
+        // normalize class name
+        $class = ClassUtils::getRealClass(ltrim($class, '\\'));
+
         if (array_key_exists($class, $this->cache)) {
             return $this->cache[$class];
         }

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`use Symfony\Component\Form\Guess\Guess;`
`20`	`20`	`use Symfony\Component\Form\Guess\TypeGuess;`
`21`	`21`	`use Symfony\Component\Form\Guess\ValueGuess;`
	`22`	`+use Doctrine\Common\Util\ClassUtils;`
`22`	`23`
`23`	`24`	`class DoctrineOrmTypeGuesser implements FormTypeGuesserInterface`
`24`	`25`	`{`
`@@ -161,6 +162,9 @@ public function guessPattern($class, $property)`
`161`	`162`
`162`	`163`	`protected function getMetadata($class)`
`163`	`164`	`{`
	`165`	`+ // normalize class name`
	`166`	`+ $class = ClassUtils::getRealClass(ltrim($class, '\\'));`
	`167`	`+`
`164`	`168`	`if (array_key_exists($class, $this->cache)) {`
`165`	`169`	`return $this->cache[$class];`
`166`	`170`	`}`