Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit d92dc93bc107 · 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/Route.php b/Route.php
@@ -251,6 +251,8 @@ public function addOptions(array $options)
     }
 
     /**
+     * Sets an option value.
+     *
      * @return $this
      */
     public function setOption(string $name, mixed $value)

Original file line number	Diff line number	Diff line change
`@@ -251,6 +251,8 @@ public function addOptions(array $options)`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`/**`
	`254`	`+ * Sets an option value.`
	`255`	`+ *`
`254`	`256`	`* @return $this`
`255`	`257`	`*/`
`256`	`258`	`public function setOption(string $name, mixed $value)`