Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit d166bb71c29d · 2021-07-03T11:26:52.000+02:00
* 5.4: (21 commits)
  Backport type fixes
  [Messenger] Added StopWorkerException
  [Workflown] Add support for getting updated context after a transition
  Fix CS
  fix annot
  Backport type fixes
  Fix CS
  Avoid triggering the autoloader in Deprecation::isLegacy()
  fix markdown markup
  Backport type fixes
  [TwigBundle] Improve comment on error silencing
  [SecurityBundle] Fix wrongly inverted condition
  [Notifier] Add MessageMedia Bridge
  uzb translation
  [DependencyInjection] Fix doc blocks
  [DependencyInjection] Turn $defaultDeprecationTemplate into a constant
  [SecurityBundle] Hide Security item if no firewall matched
  [GHA] restore phpunit-bridge job
  rethrow caught exception
  [Form] better form doc types to support static analysis
  ...
diff --git a/OptionsResolver.php b/OptionsResolver.php
@@ -258,8 +258,6 @@ public function setDefault(string $option, mixed $value)
     }
 
     /**
-     * Sets a list of default values.
-     *
      * @return $this
      *
      * @throws AccessException If called from a lazy option or normalizer

Original file line number	Diff line number	Diff line change
`@@ -258,8 +258,6 @@ public function setDefault(string $option, mixed $value)`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`/**`
`261`		`- * Sets a list of default values.`
`262`		`- *`
`263`	`261`	`* @return $this`
`264`	`262`	`*`
`265`	`263`	`* @throws AccessException If called from a lazy option or normalizer`