Skip to content

Commit 6f33be3

Browse files
Merge branch '4.4' into 5.2
* 4.4: Backport type fixes uzb translation [DependencyInjection] Fix doc blocks [DependencyInjection] Turn $defaultDeprecationTemplate into a constant [Form] better form doc types to support static analysis
2 parents ceab1c2 + d330017 commit 6f33be3

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

OptionsResolver.php

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,6 @@ public function setDefault(string $option, $value)
251251
}
252252

253253
/**
254-
* Sets a list of default values.
255-
*
256-
* @param array $defaults The default values to set
257-
*
258254
* @return $this
259255
*
260256
* @throws AccessException If called from a lazy option or normalizer
@@ -506,8 +502,7 @@ public function isDeprecated(string $option): bool
506502
*
507503
* The resolved option value is set to the return value of the closure.
508504
*
509-
* @param string $option The option name
510-
* @param \Closure $normalizer The normalizer
505+
* @param string $option The option name
511506
*
512507
* @return $this
513508
*
@@ -550,10 +545,6 @@ public function setNormalizer(string $option, \Closure $normalizer)
550545
*
551546
* The resolved option value is set to the return value of the closure.
552547
*
553-
* @param string $option The option name
554-
* @param \Closure $normalizer The normalizer
555-
* @param bool $forcePrepend If set to true, prepend instead of appending
556-
*
557548
* @return $this
558549
*
559550
* @throws UndefinedOptionsException If the option is undefined
@@ -853,8 +844,6 @@ public function clear()
853844
* - Options have invalid types;
854845
* - Options have invalid values.
855846
*
856-
* @param array $options A map of option names to values
857-
*
858847
* @return array The merged and validated options
859848
*
860849
* @throws UndefinedOptionsException If an option name is undefined

0 commit comments

Comments
 (0)