minor #16568 [Form] Enhance some FormRegistry deprecation messages (nicolas-grekas)

Tobion · Tobion · commit 17608389f141 · 2015-11-17T12:52:32.000+01:00
This PR was merged into the 2.8 branch. Discussion ---------- [Form] Enhance some FormRegistry deprecation messages | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 02d2148 [Form] Enhance some FormRegistry deprecation messages
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FormPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FormPass.php
@@ -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;
             }
 
diff --git a/src/Symfony/Component/Form/FormRegistry.php b/src/Symfony/Component/Form/FormRegistry.php
@@ -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);
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public function process(ContainerBuilder $container)`
`67`	`67`	`@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);`
`68`	`68`	`$extendedType = $tag[0]['alias'];`
`69`	`69`	`} else {`
`70`		`- @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);`
	`70`	`+ @trigger_error('The extended_type option of the form.type_extension tag is required since version 2.8.', E_USER_DEPRECATED);`
`71`	`71`	`$extendedType = $serviceId;`
`72`	`72`	`}`
`73`	`73`