minor #52060 [Form] Remove deprecation layer for duplicated preferred choices (HeahDude)

fabpot · fabpot · commit 5bc27f4066f1 · 2023-10-16T22:13:36.000+02:00
This PR was merged into the 7.0 branch. Discussion ---------- [Form] Remove deprecation layer for duplicated preferred choices | Q | A | ------------- | --- | Branch? | 7.0 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | ~ | License | MIT Follows #50934. Commits ------- 8945228 [Form] Remove deprecation layer for duplicated preferred choices
diff --git a/UPGRADE-7.0.md b/UPGRADE-7.0.md
@@ -219,6 +219,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)) {

Original file line number	Diff line number	Diff line change
`@@ -145,12 +145,8 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, mixed $value`
`145`	`145`	`return $this->lists[$hash];`
`146`	`146`	`}`
`147`	`147`
`148`		`- /**`
`149`		`- * @param bool $duplicatePreferredChoices`
`150`		`- */`
`151`		`- 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`
	`148`	`+ 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`
`152`	`149`	`{`
`153`		`- $duplicatePreferredChoices = \func_num_args() > 7 ? func_get_arg(7) : true;`
`154`	`150`	`$cache = true;`
`155`	`151`
`156`	`152`	`if ($preferredChoices instanceof Cache\PreferredChoice) {`
Original file line number	Diff line number	Diff line change
`@@ -81,5 +81,5 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, callable $va`
`81`	`81`	`* on top of the list and in their original position`
`82`	`82`	`* or only in the top of the list`
`83`	`83`	`*/`
`84`		`- 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;`
	`84`	`+ 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;`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,12 +52,8 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, callable $va`
`52`	`52`	`return new LazyChoiceList($loader, $value);`
`53`	`53`	`}`
`54`	`54`
`55`		`- /**`
`56`		`- * @param bool $duplicatePreferredChoices`
`57`		`- */`
`58`		`- 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`
	`55`	`+ 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`
`59`	`56`	`{`
`60`		`- $duplicatePreferredChoices = \func_num_args() > 7 ? func_get_arg(7) : true;`
`61`	`57`	`$preferredViews = [];`
`62`	`58`	`$preferredViewsOrder = [];`
`63`	`59`	`$otherViews = [];`
Original file line number	Diff line number	Diff line change
`@@ -109,12 +109,8 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, mixed $value`
`109`	`109`	`return $this->decoratedFactory->createListFromLoader($loader, $value, $filter);`
`110`	`110`	`}`
`111`	`111`
`112`		`- /**`
`113`		`- * @param bool $duplicatePreferredChoices`
`114`		`- */`
`115`		`- 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`
	`112`	`+ 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`
`116`	`113`	`{`
`117`		`- $duplicatePreferredChoices = \func_num_args() > 7 ? func_get_arg(7) : true;`
`118`	`114`	`$accessor = $this->propertyAccessor;`
`119`	`115`
`120`	`116`	`if (\is_string($label)) {`