Merge branch '4.4' into 5.2

* 4.4:
  [4.4] Add missing `@return` annotations
  Handle lock with long key

Author: nicolas-grekas

OptionsResolver.php

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