Merge branch '5.2' into 5.3

nicolas-grekas · nicolas-grekas · commit d6602aca7d3e · 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/File/Stream.php b/File/Stream.php
@@ -20,6 +20,8 @@ class Stream extends File
 {
     /**
      * {@inheritdoc}
+     *
+     * @return int|false
      */
     public function getSize()
     {

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ class Stream extends File`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`	`22`	`* {@inheritdoc}`
	`23`	`+ *`
	`24`	`+ * @return int\|false`
`23`	`25`	`*/`
`24`	`26`	`public function getSize()`
`25`	`27`	`{`