fix rename resolve type function

rande · rande · commit 6d22d5cd16fe · 2015-11-23T18:54:21.000+01:00
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->types[$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();

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->types[$name] = $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();`