[Form] improve deprecation messages for the "empty_value" and "choice_list" options in the ChoiceType class.

Hugo Hamon · Hugo Hamon · commit 88e13a00eec6 · 2015-12-27T12:45:54.000Z
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -292,9 +292,11 @@ public function configureOptions(OptionsResolver $resolver)
             return;
         };
 
-        $choiceListNormalizer = function (Options $options, $choiceList) use ($choiceListFactory) {
+        // Hack to use the $this variable inside a Closure with PHP 5.3.
+        $that = $this;
+        $choiceListNormalizer = function (Options $options, $choiceList) use ($choiceListFactory, $that) {
             if ($choiceList) {
-                @trigger_error('The "choice_list" option is deprecated since version 2.7 and will be removed in 3.0. Use "choice_loader" instead.', E_USER_DEPRECATED);
+                @trigger_error(sprintf('The "choice_list" option of the "%s" form type (%s) is deprecated since version 2.7 and will be removed in 3.0. Use "choice_loader" instead.', $that->getName(), __CLASS__), E_USER_DEPRECATED);
 
                 if ($choiceList instanceof LegacyChoiceListInterface) {
                     return new LegacyChoiceListAdapter($choiceList);
@@ -321,9 +323,11 @@ public function configureOptions(OptionsResolver $resolver)
             return $choiceListFactory->createListFromChoices($choices, $options['choice_value']);
         };
 
-        $placeholderNormalizer = function (Options $options, $placeholder) {
+        // See $that = $this; statement above for the "choice_list" option deprecation.
+        // It allows to use the $this variable inside a Closure with PHP 5.3.
+        $placeholderNormalizer = function (Options $options, $placeholder) use ($that) {
             if (!is_object($options['empty_value']) || !$options['empty_value'] instanceof \Exception) {
-                @trigger_error('The form option "empty_value" is deprecated since version 2.6 and will be removed in 3.0. Use "placeholder" instead.', E_USER_DEPRECATED);
+                @trigger_error(sprintf('The form option "empty_value" of the "%s" form type (%s) is deprecated since version 2.6 and will be removed in 3.0. Use "placeholder" instead.', $that->getName(), __CLASS__), E_USER_DEPRECATED);
 
                 $placeholder = $options['empty_value'];
             }
