[Form] Add context to FormFactory deprecations

nicolas-grekas · nicolas-grekas · commit e2010d2fc10d · 2015-12-02T14:02:29.000+01:00
diff --git a/src/Symfony/Component/Form/FormFactory.php b/src/Symfony/Component/Form/FormFactory.php
@@ -101,12 +101,12 @@ public function createNamedBuilder($name, $type = 'Symfony\Component\Form\Extens
         }
 
         if ($type instanceof FormTypeInterface) {
-            @trigger_error('Passing type instances to FormBuilder::add(), Form::add() or the FormFactory is deprecated since version 2.8 and will not be supported in 3.0. Use the fully-qualified type class name instead.', E_USER_DEPRECATED);
+            @trigger_error(sprintf('Passing type instances to FormBuilder::add(), Form::add() or the FormFactory is deprecated since version 2.8 and will not be supported in 3.0. Use the fully-qualified type class name instead (%s).', get_class($type)), E_USER_DEPRECATED);
             $type = $this->resolveType($type);
         } elseif (is_string($type)) {
             $type = $this->registry->getType($type);
         } elseif ($type instanceof ResolvedFormTypeInterface) {
-            @trigger_error('Passing type instances to FormBuilder::add(), Form::add() or the FormFactory is deprecated since version 2.8 and will not be supported in 3.0. Use the fully-qualified type class name instead.', E_USER_DEPRECATED);
+            @trigger_error(sprintf('Passing type instances to FormBuilder::add(), Form::add() or the FormFactory is deprecated since version 2.8 and will not be supported in 3.0. Use the fully-qualified type class name instead (%s).', get_class($type->getInnerType())), E_USER_DEPRECATED);
         } else {
             throw new UnexpectedTypeException($type, 'string, Symfony\Component\Form\ResolvedFormTypeInterface or Symfony\Component\Form\FormTypeInterface');
         }

Original file line number	Diff line number	Diff line change
`@@ -101,12 +101,12 @@ public function createNamedBuilder($name, $type = 'Symfony\Component\Form\Extens`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`if ($type instanceof FormTypeInterface) {`
`104`		`- @trigger_error('Passing type instances to FormBuilder::add(), Form::add() or the FormFactory is deprecated since version 2.8 and will not be supported in 3.0. Use the fully-qualified type class name instead.', E_USER_DEPRECATED);`
	`104`	`+ @trigger_error(sprintf('Passing type instances to FormBuilder::add(), Form::add() or the FormFactory is deprecated since version 2.8 and will not be supported in 3.0. Use the fully-qualified type class name instead (%s).', get_class($type)), E_USER_DEPRECATED);`
`105`	`105`	`$type = $this->resolveType($type);`
`106`	`106`	`} elseif (is_string($type)) {`
`107`	`107`	`$type = $this->registry->getType($type);`
`108`	`108`	`} elseif ($type instanceof ResolvedFormTypeInterface) {`
`109`		`- @trigger_error('Passing type instances to FormBuilder::add(), Form::add() or the FormFactory is deprecated since version 2.8 and will not be supported in 3.0. Use the fully-qualified type class name instead.', E_USER_DEPRECATED);`
	`109`	`+ @trigger_error(sprintf('Passing type instances to FormBuilder::add(), Form::add() or the FormFactory is deprecated since version 2.8 and will not be supported in 3.0. Use the fully-qualified type class name instead (%s).', get_class($type->getInnerType())), E_USER_DEPRECATED);`
`110`	`110`	`} else {`
`111`	`111`	`throw new UnexpectedTypeException($type, 'string, Symfony\Component\Form\ResolvedFormTypeInterface or Symfony\Component\Form\FormTypeInterface');`
`112`	`112`	`}`