Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 2f7463f156cf · 2021-08-17T17:35:52.000+02:00
* 5.4:
  [Serializer] cs fix
  Cleanup more `@return` annotations
  [Form] Fix phpdoc on FormBuilderInterface
diff --git a/CacheInterface.php b/CacheInterface.php
@@ -38,8 +38,6 @@ interface CacheInterface
      *                                              See https://en.wikipedia.org/wiki/Cache_stampede#Probabilistic_early_expiration
      * @param array                      &$metadata The metadata of the cached item {@see ItemInterface::getMetadata()}
      *
-     * @return mixed The value corresponding to the provided key
-     *
      * @throws InvalidArgumentException When $key is not valid or when $beta is negative
      */
     public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed;

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,6 @@ interface CacheInterface`
`38`	`38`	`* See https://en.wikipedia.org/wiki/Cache_stampede#Probabilistic_early_expiration`
`39`	`39`	`* @param array &$metadata The metadata of the cached item {@see ItemInterface::getMetadata()}`
`40`	`40`	`*`
`41`		`- * @return mixed The value corresponding to the provided key`
`42`		`- *`
`43`	`41`	`* @throws InvalidArgumentException When $key is not valid or when $beta is negative`
`44`	`42`	`*/`
`45`	`43`	`public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed;`