Merge branch '5.3' into 5.4

nicolas-grekas · nicolas-grekas · commit c385af13d628 · 2021-07-13T11:35:11.000+02:00
* 5.3:
  [Contracts] Add missing `@return` annotations
  [FrameworkBundle] Fixed file operations in Sodium vault seal
  [Doctrine Bridge] Fix an exception message
  [Messenger] [Redis] Make `auth` option works
diff --git a/CacheTrait.php b/CacheTrait.php
@@ -27,6 +27,8 @@ trait CacheTrait
 {
     /**
      * {@inheritdoc}
+     *
+     * @return mixed
      */
     public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
     {

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@ trait CacheTrait`
`27`	`27`	`{`
`28`	`28`	`/**`
`29`	`29`	`* {@inheritdoc}`
	`30`	`+ *`
	`31`	`+ * @return mixed`
`30`	`32`	`*/`
`31`	`33`	`public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)`
`32`	`34`	`{`