protocolbuffers#9293 - remove return type void for compatible with ph…

…p 7.0
oleg1540 · Dec 15, 2021 · 7c1b174 · 7c1b174
1 parent c7e9b8d
commit 7c1b174
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/php/src/Google/Protobuf/Internal/MapField.php b/php/src/Google/Protobuf/Internal/MapField.php
@@ -150,8 +150,10 @@ public function offsetGet($key): object
      * @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)
      */
-    public function offsetSet($key, $value): void
+    #[\ReturnTypeWillChange]
+    public function offsetSet($key, $value)
     {
         $this->checkKey($this->key_type, $key);
 
@@ -208,8 +210,10 @@ public function offsetSet($key, $value): void
      * @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)
      */
-    public function offsetUnset($key): void
+    #[\ReturnTypeWillChange]
+    public function offsetUnset($key)
     {
         $this->checkKey($this->key_type, $key);
         unset($this->container[$key]);

diff --git a/php/src/Google/Protobuf/Internal/MapFieldIter.php b/php/src/Google/Protobuf/Internal/MapFieldIter.php
@@ -67,8 +67,10 @@ 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)
      */
-    public function rewind(): void
+    #[\ReturnTypeWillChange]
+    public function rewind()
     {
         reset($this->container);
     }
@@ -116,8 +118,10 @@ public function key(): object
      * Move to the next position.
      *
      * @return void
+     * @todo need to add return type void (require update php version to 7.1)
      */
-    public function next(): void
+    #[\ReturnTypeWillChange]
+    public function next()
     {
         next($this->container);
     }

diff --git a/php/src/Google/Protobuf/Internal/RepeatedField.php b/php/src/Google/Protobuf/Internal/RepeatedField.php
@@ -137,8 +137,10 @@ public function offsetGet($offset): object
      * @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)
      */
-    public function offsetSet($offset, $value): void
+    #[\ReturnTypeWillChange]
+    public function offsetSet($offset, $value)
     {
         switch ($this->type) {
             case GPBType::SFIXED32:
@@ -208,8 +210,10 @@ public function offsetSet($offset, $value): void
      * @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)
      */
-    public function offsetUnset($offset): void
+    #[\ReturnTypeWillChange]
+    public function offsetUnset($offset)
     {
         $count = count($this->container);
         if (!is_numeric($offset) || $count === 0 || $offset !== $count - 1) {

diff --git a/php/src/Google/Protobuf/Internal/RepeatedFieldIter.php b/php/src/Google/Protobuf/Internal/RepeatedFieldIter.php
@@ -70,8 +70,10 @@ 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)
      */
-    public function rewind(): void
+    #[\ReturnTypeWillChange]
+    public function rewind()
     {
         $this->position = 0;
     }
@@ -100,8 +102,10 @@ public function key(): int
      * Move to the next position.
      *
      * @return void
+     * @todo need to add return type void (require update php version to 7.1)
      */
-    public function next(): void
+    #[\ReturnTypeWillChange]
+    public function next()
     {
         ++$this->position;
     }