Skip to content

fix type assignement #16615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rande wants to merge 2 commits into from
Closed

fix type assignement #16615

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1bd307a
fix type assignement
rande Nov 20, 2015
6d22d5c
fix rename resolve type function
rande Nov 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/Symfony/Component/Form/FormRegistry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public function getType($name)
}
}

$this->resolveAndAddType($type);
$this->types[$name] = $this->resolveType($type);
}

return $this->types[$name];
Expand All @@ -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();
Expand All @@ -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;
}

/**
Expand Down