[Form] Remove deprecation layer for duplicated preferred choices

symfony · Oct 14, 2023 · 8945228 · 8945228
1 parent 04724ca
commit 8945228
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 16 deletions.
diff --git a/UPGRADE-7.0.md b/UPGRADE-7.0.md
@@ -177,6 +177,7 @@ Form
  * Require explicit argument when calling `Button/Form::setParent()`, `ButtonBuilder/FormConfigBuilder::setDataMapper()`, `TransformationFailedException::setInvalidMessage()`
  * `PostSetDataEvent::setData()` throws an exception, use `PreSetDataEvent::setData()` instead
  * `PostSubmitEvent::setData()` throws an exception, use `PreSubmitDataEvent::setData()` or `SubmitDataEvent::setData()` instead
+ * Add `$duplicatePreferredChoices` parameter to `ChoiceListFactoryInterface::createView()`
 
 FrameworkBundle
 ---------------

diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php b/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php
@@ -145,12 +145,8 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, mixed $value
         return $this->lists[$hash];
     }
 
-    /**
-     * @param bool $duplicatePreferredChoices
-     */
-    public function createView(ChoiceListInterface $list, mixed $preferredChoices = null, mixed $label = null, mixed $index = null, mixed $groupBy = null, mixed $attr = null, mixed $labelTranslationParameters = []/* , bool $duplicatePreferredChoices = true */): ChoiceListView
+    public function createView(ChoiceListInterface $list, mixed $preferredChoices = null, mixed $label = null, mixed $index = null, mixed $groupBy = null, mixed $attr = null, mixed $labelTranslationParameters = [], bool $duplicatePreferredChoices = true): ChoiceListView
     {
-        $duplicatePreferredChoices = \func_num_args() > 7 ? func_get_arg(7) : true;
         $cache = true;
 
         if ($preferredChoices instanceof Cache\PreferredChoice) {

diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/ChoiceListFactoryInterface.php b/src/Symfony/Component/Form/ChoiceList/Factory/ChoiceListFactoryInterface.php
@@ -81,5 +81,5 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, callable $va
      *                                                        on top of the list and in their original position
      *                                                        or only in the top of the list
      */
-    public function createView(ChoiceListInterface $list, array|callable $preferredChoices = null, callable|false $label = null, callable $index = null, callable $groupBy = null, array|callable $attr = null, array|callable $labelTranslationParameters = []/* , bool $duplicatePreferredChoices = true */): ChoiceListView;
+    public function createView(ChoiceListInterface $list, array|callable $preferredChoices = null, callable|false $label = null, callable $index = null, callable $groupBy = null, array|callable $attr = null, array|callable $labelTranslationParameters = [], bool $duplicatePreferredChoices = true): ChoiceListView;
 }
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php b/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
@@ -52,12 +52,8 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, callable $va
         return new LazyChoiceList($loader, $value);
     }
 
-    /**
-     * @param bool $duplicatePreferredChoices
-     */
-    public function createView(ChoiceListInterface $list, array|callable $preferredChoices = null, callable|false $label = null, callable $index = null, callable $groupBy = null, array|callable $attr = null, array|callable $labelTranslationParameters = []/* , bool $duplicatePreferredChoices = true */): ChoiceListView
+    public function createView(ChoiceListInterface $list, array|callable $preferredChoices = null, callable|false $label = null, callable $index = null, callable $groupBy = null, array|callable $attr = null, array|callable $labelTranslationParameters = [], bool $duplicatePreferredChoices = true): ChoiceListView
     {
-        $duplicatePreferredChoices = \func_num_args() > 7 ? func_get_arg(7) : true;
         $preferredViews = [];
         $preferredViewsOrder = [];
         $otherViews = [];

diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php b/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php
@@ -109,12 +109,8 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, mixed $value
         return $this->decoratedFactory->createListFromLoader($loader, $value, $filter);
     }
 
-    /**
-     * @param bool $duplicatePreferredChoices
-     */
-    public function createView(ChoiceListInterface $list, mixed $preferredChoices = null, mixed $label = null, mixed $index = null, mixed $groupBy = null, mixed $attr = null, mixed $labelTranslationParameters = []/* , bool $duplicatePreferredChoices = true */): ChoiceListView
+    public function createView(ChoiceListInterface $list, mixed $preferredChoices = null, mixed $label = null, mixed $index = null, mixed $groupBy = null, mixed $attr = null, mixed $labelTranslationParameters = [], bool $duplicatePreferredChoices = true): ChoiceListView
     {
-        $duplicatePreferredChoices = \func_num_args() > 7 ? func_get_arg(7) : true;
         $accessor = $this->propertyAccessor;
 
         if (\is_string($label)) {