#17993 - Change message and adding empty line

hamza · hamza · commit 9255f7526caa · 2016-03-06T00:12:58.000+01:00
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php b/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php
@@ -164,7 +164,8 @@ public function createView(ChoiceListInterface $list, $preferredChoices = null,
         if (is_string($label) && !is_callable($label)) {
             $label = new PropertyPath($label);
         }  elseif (is_string($label) && is_callable($label)) {
-            @trigger_error('createView() - $label - treats callable strings as callable and is deprecated since version 3.1.', E_USER_DEPRECATED);
+            @trigger_error('createView() - $label - Treating strings as callable is deprecated since version 3.1 and will throw an error in 4.0. You should use a "\Closure" instead', E_USER_DEPRECATED);
+
             $label = function ($choice) use ($label) {
                 return $label($choice);
             };
@@ -179,7 +180,8 @@ public function createView(ChoiceListInterface $list, $preferredChoices = null,
         if (is_string($preferredChoices) && !is_callable($preferredChoices)) {
             $preferredChoices = new PropertyPath($preferredChoices);
         } elseif (is_string($preferredChoices) && is_callable($preferredChoices)) {
-            @trigger_error('createView() - $preferredChoices - treats callable strings as callable and is deprecated since version 3.1.', E_USER_DEPRECATED);
+            @trigger_error('createView() - $preferredChoices - Treating strings as callable is deprecated since version 3.1 and will throw an error in 4.0. You should use a "\Closure" instead', E_USER_DEPRECATED);
+
             $preferredChoices = function ($choice) use ($preferredChoices) {
                 return $preferredChoices($choice);
             };
@@ -199,7 +201,8 @@ public function createView(ChoiceListInterface $list, $preferredChoices = null,
         if (is_string($index) && !is_callable($index)) {
             $index = new PropertyPath($index);
         } elseif (is_string($index) && is_callable($index)) {
-            @trigger_error('createView() - $index - treats callable strings as callable and is deprecated since version 3.1.', E_USER_DEPRECATED);
+            @trigger_error('createView() - $index - Treating strings as callable is deprecated since version 3.1 and will throw an error in 4.0. You should use a "\Closure" instead', E_USER_DEPRECATED);
+
             $index = function ($choice) use ($index) {
                 return $index($choice);
             };
@@ -214,7 +217,8 @@ public function createView(ChoiceListInterface $list, $preferredChoices = null,
         if (is_string($groupBy) && !is_callable($groupBy)) {
             $groupBy = new PropertyPath($groupBy);
         } elseif (is_string($groupBy) && is_callable($groupBy)) {
-            @trigger_error('createView() - $groupBy - treats callable strings as callable and is deprecated since version 3.1.', E_USER_DEPRECATED);
+            @trigger_error('createView() - $groupBy - Treating strings as callable is deprecated since version 3.1 and will throw an error in 4.0. You should use a "\Closure" instead', E_USER_DEPRECATED);
+
             $groupBy = function ($choice) use ($groupBy) {
                 return $groupBy($choice);
             };
@@ -233,7 +237,8 @@ public function createView(ChoiceListInterface $list, $preferredChoices = null,
         if (is_string($attr) && !is_callable($attr)) {
             $attr = new PropertyPath($attr);
         } elseif (is_string($attr) && is_callable($attr)) {
-            @trigger_error('createView() - $attr - treats callable strings as callable and is deprecated since version 3.1.', E_USER_DEPRECATED);
+            @trigger_error('createView() - $attr - Treating strings as callable is deprecated since version 3.1 and will throw an error in 4.0. You should use a "\Closure" instead', E_USER_DEPRECATED);
+
             $attr = function ($choice) use ($attr) {
                 return $attr($choice);
             };
