Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 47afe111d3ca · 2021-09-09T14:52:47.000+02:00
* 5.4:
  [DoctrineBridge] Remove dead code
  [Lock] Remove unused variable
  [DoctrineBridge] Replace string with FQCN resolution in EntityType
  Add missing `@return $this` annotations
  [Notifier] Add missing types to SmscTransport
diff --git a/OptionsResolver.php b/OptionsResolver.php
@@ -423,6 +423,8 @@ public function isNested(string $option): bool
      * @param string          $package The name of the composer package that is triggering the deprecation
      * @param string          $version The version of the package that introduced the deprecation
      * @param string|\Closure $message The deprecation message to use
+     *
+     * @return $this
      */
     public function setDeprecated(string $option, string $package, string $version, string|\Closure $message = 'The option "%name%" is deprecated.'): self
     {

Original file line number	Diff line number	Diff line change
`@@ -423,6 +423,8 @@ public function isNested(string $option): bool`
`423`	`423`	`* @param string $package The name of the composer package that is triggering the deprecation`
`424`	`424`	`* @param string $version The version of the package that introduced the deprecation`
`425`	`425`	`* @param string\|\Closure $message The deprecation message to use`
	`426`	`+ *`
	`427`	`+ * @return $this`
`426`	`428`	`*/`
`427`	`429`	`public function setDeprecated(string $option, string $package, string $version, string\|\Closure $message = 'The option "%name%" is deprecated.'): self`
`428`	`430`	`{`