#9293 - incompatible return type php 8.1 (#9301)

* #9293 - fix Missing function's return type declaration (incompatible return type php 8.1) * #9293 - remove return type void for compatible with php 7.0 * #9293 - add todo for mixed return type Co-authored-by: Adam Cozzette <[email protected]>
protocolbuffers · Feb 11, 2022 · fe87de3 · fe87de3
1 parent 2ce9604
commit fe87de3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/php/src/Google/Protobuf/Internal/MapField.php b/php/src/Google/Protobuf/Internal/MapField.php
@@ -135,6 +135,7 @@ public function getLegacyValueClass()
  * @return object The stored element at given key.
  * @throws \ErrorException Invalid type for index.
  * @throws \ErrorException Non-existing index.
+ * @todo need to add return type mixed (require update php version to 8.0)
  */
  #[\ReturnTypeWillChange]
  public function offsetGet($key)
@@ -153,6 +154,7 @@ public function offsetGet($key)
  * @throws \ErrorException Invalid type for key.
  * @throws \ErrorException Invalid type for value.
  * @throws \ErrorException Non-existing key.
+ * @todo need to add return type void (require update php version to 7.1)
  */
  #[\ReturnTypeWillChange]
  public function offsetSet($key, $value)
@@ -212,6 +214,7 @@ public function offsetSet($key, $value)
  * @param object $key The key of the element to be removed.
  * @return void
  * @throws \ErrorException Invalid type for key.
+ * @todo need to add return type void (require update php version to 7.1)
  */
  #[\ReturnTypeWillChange]
  public function offsetUnset($key)

diff --git a/php/src/Google/Protobuf/Internal/MapFieldIter.php b/php/src/Google/Protobuf/Internal/MapFieldIter.php
@@ -67,6 +67,7 @@ public function __construct($container, $key_type)
  * Reset the status of the iterator
  *
  * @return void
+ * @todo need to add return type void (require update php version to 7.1)
  */
  #[\ReturnTypeWillChange]
  public function rewind()
@@ -78,6 +79,7 @@ public function rewind()
  * Return the element at the current position.
  *
  * @return object The element at the current position.
+ * @todo need to add return type mixed (require update php version to 8.0)
  */
  #[\ReturnTypeWillChange]
  public function current()
@@ -89,6 +91,7 @@ public function current()
  * Return the current key.
  *
  * @return object The current key.
+ * @todo need to add return type mixed (require update php version to 8.0)
  */
  #[\ReturnTypeWillChange]
  public function key()
@@ -119,6 +122,7 @@ public function key()
  * Move to the next position.
  *
  * @return void
+ * @todo need to add return type void (require update php version to 7.1)
  */
  #[\ReturnTypeWillChange]
  public function next()

diff --git a/php/src/Google/Protobuf/Internal/RepeatedField.php b/php/src/Google/Protobuf/Internal/RepeatedField.php
@@ -121,6 +121,7 @@ public function getLegacyClass()
  * @return object The stored element at given index.
  * @throws \ErrorException Invalid type for index.
  * @throws \ErrorException Non-existing index.
+ * @todo need to add return type mixed (require update php version to 8.0)
  */
  #[\ReturnTypeWillChange]
  public function offsetGet($offset)
@@ -139,6 +140,7 @@ public function offsetGet($offset)
  * @throws \ErrorException Invalid type for index.
  * @throws \ErrorException Non-existing index.
  * @throws \ErrorException Incorrect type of the element.
+ * @todo need to add return type void (require update php version to 7.1)
  */
  #[\ReturnTypeWillChange]
  public function offsetSet($offset, $value)
@@ -211,6 +213,7 @@ public function offsetSet($offset, $value)
  * @throws \ErrorException Invalid type for index.
  * @throws \ErrorException The element to be removed is not at the end of the
  * RepeatedField.
+ * @todo need to add return type void (require update php version to 7.1)
  */
  #[\ReturnTypeWillChange]
  public function offsetUnset($offset)

diff --git a/php/src/Google/Protobuf/Internal/RepeatedFieldIter.php b/php/src/Google/Protobuf/Internal/RepeatedFieldIter.php
@@ -70,6 +70,7 @@ public function __construct($container)
  * Reset the status of the iterator
  *
  * @return void
+ * @todo need to add return type void (require update php version to 7.1)
  */
  #[\ReturnTypeWillChange]
  public function rewind()
@@ -81,6 +82,7 @@ public function rewind()
  * Return the element at the current position.
  *
  * @return object The element at the current position.
+ * @todo need to add return type mixed (require update php version to 8.0)
  */
  #[\ReturnTypeWillChange]
  public function current()
@@ -92,6 +94,7 @@ public function current()
  * Return the current position.
  *
  * @return integer The current position.
+ * @todo need to add return type mixed (require update php version to 8.0)
  */
  #[\ReturnTypeWillChange]
  public function key()
@@ -103,6 +106,7 @@ public function key()
  * Move to the next position.
  *
  * @return void
+ * @todo need to add return type void (require update php version to 7.1)
  */
  #[\ReturnTypeWillChange]
  public function next()