Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[Form] Enhance some FormRegistry deprecation messages
  • Loading branch information
nicolas-grekas committed Nov 17, 2015
1 parent fef28b2 commit 02d2148
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
Expand Up @@ -67,7 +67,7 @@ public function process(ContainerBuilder $container)
@trigger_error('The alias option of the form.type_extension tag is deprecated since version 2.8 and will be removed in 3.0. Use the extended_type option instead.', E_USER_DEPRECATED);
$extendedType = $tag[0]['alias'];
} else {
@trigger_error('The extended_type option of the form.type_extension tag is required since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
@trigger_error('The extended_type option of the form.type_extension tag is required since version 2.8.', E_USER_DEPRECATED);
$extendedType = $serviceId;
}

Expand Down
13 changes: 5 additions & 8 deletions src/Symfony/Component/Form/FormRegistry.php
Expand Up @@ -120,22 +120,19 @@ private function resolveAndAddType(FormTypeInterface $type)
$hasCustomName = $name !== $fqcn;

if ($parentType instanceof FormTypeInterface) {
@trigger_error('Returning a FormTypeInterface from FormTypeInterface::getParent() is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
@trigger_error(sprintf('Returning a FormTypeInterface from %s::getParent() is deprecated since version 2.8 and will be removed in 3.0. Return the fully-qualified type class name instead.', $fqcn), E_USER_DEPRECATED);

$this->resolveAndAddType($parentType);
$parentType = $parentType->getName();
}

if ($hasCustomName) {
foreach ($this->extensions as $extension) {
$typeExtensions = array_merge(
$typeExtensions,
$extension->getTypeExtensions($name)
);
}
if ($x = $extension->getTypeExtensions($name)) {
@trigger_error(sprintf('Returning a type name from %s::getExtendedType() is deprecated since version 2.8 and will be removed in 3.0. Return the fully-qualified type class name instead.', get_class($x[0])), E_USER_DEPRECATED);

if ($typeExtensions) {
@trigger_error('Returning a type name from FormTypeExtensionInterface::getExtendedType() is deprecated since version 2.8 and will be removed in 3.0. Return the fully-qualified type class name instead.', E_USER_DEPRECATED);
$typeExtensions = array_merge($typeExtensions, $x);
}
}
}

Expand Down

0 comments on commit 02d2148

Please sign in to comment.