Merge branch '5.4' into 6.0

derrabus · derrabus · commit 26416cc2a726 · 2021-08-04T23:30:37.000+02:00
* 5.4:
  Fix return types for PHP 8.1
diff --git a/InputStream.php b/InputStream.php
@@ -69,6 +69,7 @@ public function isClosed()
     /**
      * @return \Traversable
      */
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         $this->open = true;
diff --git a/Process.php b/Process.php
@@ -620,6 +620,7 @@ public function getIncrementalOutput()
      *
      * @return \Generator
      */
+    #[\ReturnTypeWillChange]
     public function getIterator(int $flags = 0)
     {
         $this->readPipesForOutput(__FUNCTION__, false);

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ public function isClosed()`
`69`	`69`	`/**`
`70`	`70`	`* @return \Traversable`
`71`	`71`	`*/`
	`72`	`+ #[\ReturnTypeWillChange]`
`72`	`73`	`public function getIterator()`
`73`	`74`	`{`
`74`	`75`	`$this->open = true;`
Original file line number	Diff line number	Diff line change
`@@ -620,6 +620,7 @@ public function getIncrementalOutput()`
`620`	`620`	`*`
`621`	`621`	`* @return \Generator`
`622`	`622`	`*/`
	`623`	`+ #[\ReturnTypeWillChange]`
`623`	`624`	`public function getIterator(int $flags = 0)`
`624`	`625`	`{`
`625`	`626`	`$this->readPipesForOutput(__FUNCTION__, false);`