Merge branch '5.2' into 5.3

nicolas-grekas · nicolas-grekas · commit f2fd22081575 · 2021-07-23T17:55:36.000+02:00
* 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
diff --git a/GenericEvent.php b/GenericEvent.php
@@ -128,6 +128,8 @@ public function offsetGet($key)
      *
      * @param string $key   Array key to set
      * @param mixed  $value Value
+     *
+     * @return void
      */
     public function offsetSet($key, $value)
     {
@@ -138,6 +140,8 @@ public function offsetSet($key, $value)
      * ArrayAccess for unset argument.
      *
      * @param string $key Array key
+     *
+     * @return void
      */
     public function offsetUnset($key)
     {

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,8 @@ public function offsetGet($key)`
`128`	`128`	`*`
`129`	`129`	`* @param string $key Array key to set`
`130`	`130`	`* @param mixed $value Value`
	`131`	`+ *`
	`132`	`+ * @return void`
`131`	`133`	`*/`
`132`	`134`	`public function offsetSet($key, $value)`
`133`	`135`	`{`
`@@ -138,6 +140,8 @@ public function offsetSet($key, $value)`
`138`	`140`	`* ArrayAccess for unset argument.`
`139`	`141`	`*`
`140`	`142`	`* @param string $key Array key`
	`143`	`+ *`
	`144`	`+ * @return void`
`141`	`145`	`*/`
`142`	`146`	`public function offsetUnset($key)`
`143`	`147`	`{`