Merge branch '5.2' into 5.3

* 5.2:
  [5.2] Add missing `@return` annotations
  [4.4] Add missing `@return` annotations
  Handle lock with long key
  #42227 update phpdoc to recommend createIndex over ensureIndex

Author: nicolas-grekas

OptionsResolver.php

@@ -1211,6 +1211,8 @@ public function offsetExists($option)
     /**
      * Not supported.
      *
+     * @return void
+     *
      * @throws AccessException
      */
     public function offsetSet($option, $value)
@@ -1221,6 +1223,8 @@ public function offsetSet($option, $value)
     /**
      * Not supported.
      *
+     * @return void
+     *
      * @throws AccessException
      */
     public function offsetUnset($option)