symfony
diff --git a/‎src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php
+40Lines changed: 40 additions & 0 deletions b/‎src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php
+40Lines changed: 40 additions & 0 deletions
@@ -86,6 +86,11 @@ public function createListFromChoices($choices, $value = null)
     {
         if (is_string($value) && !is_callable($value)) {
             $value = new PropertyPath($value);
+        } elseif (is_string($value) && is_callable($value)) {
+            @trigger_error('createListFromChoices() treats callable strings as callable and is deprecated since version 3.1.', E_USER_DEPRECATED);
+            $value = function ($choice) use ($value) {
+                return $value($choice);
+            };
         }
 
         if ($value instanceof PropertyPath) {
@@ -117,6 +122,11 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, $value = nul
     {
         if (is_string($value) && !is_callable($value)) {
             $value = new PropertyPath($value);
+        } elseif (is_string($value) && is_callable($value)) {
+            @trigger_error('createListFromLoader() treats callable strings as callable and is deprecated since version 3.1.', E_USER_DEPRECATED);
+            $value = function ($choice) use ($value) {
+                return $value($choice);
+            };
         }
 
         if ($value instanceof PropertyPath) {
@@ -153,6 +163,12 @@ 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 - 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);
+            };
         }
 
         if ($label instanceof PropertyPath) {
@@ -163,6 +179,12 @@ 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 - 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);
+            };
         }
 
         if ($preferredChoices instanceof PropertyPath) {
@@ -178,6 +200,12 @@ 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 - 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);
+            };
         }
 
         if ($index instanceof PropertyPath) {
@@ -188,6 +216,12 @@ 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 - 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);
+            };
         }
 
         if ($groupBy instanceof PropertyPath) {
@@ -202,6 +236,12 @@ 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 - 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);
+            };
         }
 
         if ($attr instanceof PropertyPath) {