symfony#17993 - missing space after elseif / don't deprecate the whole method

hamza · hamza · commit 96e2921b5a4e · 2016-03-05T14:24:49.000+01:00
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php b/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php
@@ -80,15 +80,13 @@ public function getDecoratedFactory()
      * @param null|callable|string|PropertyPath $value   The callable or path for
      *                                                   generating the choice values
      *
-     * @deprecated We should not treat callable strings as callable
-     *
      * @return ChoiceListInterface The choice list
      */
     public function createListFromChoices($choices, $value = null)
     {
         if (is_string($value) && !is_callable($value)) {
             $value = new PropertyPath($value);
-        } elseif(is_string($value) && is_callable($value)) {
+        } elseif (is_string($value) && is_callable($value)) {
             @trigger_error('createListFromChoices() treats callable strings as callable and is deprecated since version 3.0.', E_USER_DEPRECATED);
         }
 
@@ -115,15 +113,13 @@ public function createListFromChoices($choices, $value = null)
      * @param null|callable|string|PropertyPath $value  The callable or path for
      *                                                  generating the choice values
      *
-     * @deprecated We should not treat callable strings as callable
-     *
      * @return ChoiceListInterface The choice list
      */
     public function createListFromLoader(ChoiceLoaderInterface $loader, $value = null)
     {
         if (is_string($value) && !is_callable($value)) {
             $value = new PropertyPath($value);
-        } elseif(is_string($value) && is_callable($value)) {
+        } elseif (is_string($value) && is_callable($value)) {
             @trigger_error('createListFromLoader() treats callable strings as callable and is deprecated since version 3.0.', E_USER_DEPRECATED);
         }
 
@@ -153,8 +149,6 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, $value = nul
      * @param null|callable|string|PropertyPath       $groupBy          The callable or path generating the group names
      * @param null|array|callable|string|PropertyPath $attr             The callable or path generating the HTML attributes
      *
-     * @deprecated We should not treat callable strings as callable
-     *
      * @return ChoiceListView The choice list view
      */
     public function createView(ChoiceListInterface $list, $preferredChoices = null, $label = null, $index = null, $groupBy = null, $attr = null)
@@ -175,7 +169,7 @@ 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)) {
+        } elseif (is_string($preferredChoices) && is_callable($preferredChoices)) {
             @trigger_error('createView() - $preferredChoices - treats callable strings as callable and is deprecated since version 3.0.', E_USER_DEPRECATED);
         }
 
