Merge branch '5.4' into 6.0

* 5.4:
  [Serializer] cs fix
  Cleanup more `@return` annotations
  [Form] Fix phpdoc on FormBuilderInterface

Author: nicolas-grekas

Key.php

@@ -78,9 +78,7 @@ public function reduceLifetime(float $ttl)
     }
 
     /**
-     * Returns the remaining lifetime.
-     *
-     * @return float|null Remaining lifetime in seconds. Null when the key won't expire.
+     * Returns the remaining lifetime in seconds.
      */
     public function getRemainingLifetime(): ?float
     {

LockInterface.php

@@ -26,8 +26,6 @@ interface LockInterface
      * Acquires the lock. If the lock is acquired by someone else, the parameter `blocking` determines whether or not
      * the call should block until the release of the lock.
      *
-     * @return bool whether or not the lock had been acquired
-     *
      * @throws LockConflictedException If the lock is acquired by someone else in blocking mode
      * @throws LockAcquiringException  If the lock can not be acquired
      */
@@ -58,9 +56,7 @@ public function release();
     public function isExpired(): bool;
 
     /**
-     * Returns the remaining lifetime.
-     *
-     * @return float|null Remaining lifetime in seconds. Null when the lock won't expire.
+     * Returns the remaining lifetime in seconds.
      */
     public function getRemainingLifetime(): ?float;
 }

SharedLockInterface.php

@@ -25,8 +25,6 @@ interface SharedLockInterface extends LockInterface
      * Acquires the lock for reading. If the lock is acquired by someone else in write mode, the parameter `blocking`
      * determines whether or not the call should block until the release of the lock.
      *
-     * @return bool whether or not the lock had been acquired
-     *
      * @throws LockConflictedException If the lock is acquired by someone else in blocking mode
      * @throws LockAcquiringException  If the lock can not be acquired
      */

Store/MongoDbStore.php

@@ -350,8 +350,6 @@ private function createMongoDateTime(float $seconds): UTCDateTime
      * Retrieves an unique token for the given key namespaced to this store.
      *
      * @param Key lock state container
-     *
-     * @return string token
      */
     private function getUniqueToken(Key $key): string
     {