bug #16615 fix type assignement (rande)

fabpot · fabpot · commit cd0ffc9a4148 · 2015-11-25T16:48:43.000+01:00
This PR was squashed before being merged into the 3.0-dev branch (closes #16615). Discussion ---------- fix type assignement | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - This PR make sure the original key is used when the type is resolved. Also the code now respect the PHPDoc. Commits ------- cc26454 fix type assignement
diff --git a/src/Symfony/Component/Form/FormRegistry.php b/src/Symfony/Component/Form/FormRegistry.php
@@ -88,7 +88,7 @@ public function getType($name)
                 }
             }
 
-            $this->resolveAndAddType($type);
+            $this->types[$name] = $this->resolveType($type);
         }
 
         return $this->types[$name];
@@ -102,7 +102,7 @@ public function getType($name)
      *
      * @return ResolvedFormTypeInterface The resolved type.
      */
-    private function resolveAndAddType(FormTypeInterface $type)
+    private function resolveType(FormTypeInterface $type)
     {
         $typeExtensions = array();
         $parentType = $type->getParent();
@@ -115,13 +115,11 @@ private function resolveAndAddType(FormTypeInterface $type)
             );
         }
 
-        $resolvedType = $this->resolvedTypeFactory->createResolvedType(
+        return $this->resolvedTypeFactory->createResolvedType(
             $type,
             $typeExtensions,
             $parentType ? $this->getType($parentType) : null
         );
-
-        $this->types[$fqcn] = $resolvedType;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public function getType($name)`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`
`91`		`- $this->resolveAndAddType($type);`
	`91`	`+ $this->types[$name] = $this->resolveType($type);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`return $this->types[$name];`
`@@ -102,7 +102,7 @@ public function getType($name)`
`102`	`102`	`*`
`103`	`103`	`* @return ResolvedFormTypeInterface The resolved type.`
`104`	`104`	`*/`
`105`		`- private function resolveAndAddType(FormTypeInterface $type)`
	`105`	`+ private function resolveType(FormTypeInterface $type)`
`106`	`106`	`{`
`107`	`107`	`$typeExtensions = array();`
`108`	`108`	`$parentType = $type->getParent();`
`@@ -115,13 +115,11 @@ private function resolveAndAddType(FormTypeInterface $type)`
`115`	`115`	`);`
`116`	`116`	`}`
`117`	`117`
`118`		`- $resolvedType = $this->resolvedTypeFactory->createResolvedType(`
	`118`	`+ return $this->resolvedTypeFactory->createResolvedType(`
`119`	`119`	`$type,`
`120`	`120`	`$typeExtensions,`
`121`	`121`	`$parentType ? $this->getType($parentType) : null`
`122`	`122`	`);`
`123`		`-`
`124`		`- $this->types[$fqcn] = $resolvedType;`
`125`	`123`	`}`
`126`	`124`
`127`	`125`	`/**`