Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit d33eaac5278a · 2021-08-12T16:08:08.000+02:00
* 5.4:
  More return type fixes (bis)
  Cleanup `@return` annotations
diff --git a/Authentication/AuthenticationManagerInterface.php b/Authentication/AuthenticationManagerInterface.php
@@ -27,7 +27,7 @@ interface AuthenticationManagerInterface
     /**
      * Attempts to authenticate a TokenInterface object.
      *
-     * @return TokenInterface An authenticated TokenInterface instance, never null
+     * @return TokenInterface
      *
      * @throws AuthenticationException if the authentication fails
      */
diff --git a/Authentication/Token/Storage/TokenStorageInterface.php b/Authentication/Token/Storage/TokenStorageInterface.php
@@ -23,7 +23,7 @@ interface TokenStorageInterface
     /**
      * Returns the current security token.
      *
-     * @return TokenInterface|null A TokenInterface instance or null if no authentication information is available
+     * @return TokenInterface|null
      */
     public function getToken();
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ interface AuthenticationManagerInterface`
`27`	`27`	`/**`
`28`	`28`	`* Attempts to authenticate a TokenInterface object.`
`29`	`29`	`*`
`30`		`- * @return TokenInterface An authenticated TokenInterface instance, never null`
	`30`	`+ * @return TokenInterface`
`31`	`31`	`*`
`32`	`32`	`* @throws AuthenticationException if the authentication fails`
`33`	`33`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ interface TokenStorageInterface`
`23`	`23`	`/**`
`24`	`24`	`* Returns the current security token.`
`25`	`25`	`*`
`26`		`- * @return TokenInterface\|null A TokenInterface instance or null if no authentication information is available`
	`26`	`+ * @return TokenInterface\|null`
`27`	`27`	`*/`
`28`	`28`	`public function getToken();`
`29`	`29`