3.22.5 sync

protobuf-team-bot · protobuf-team-bot · commit c5e2aa49caf0 · 2023-05-09T23:17:45.000Z
diff --git a/src/Google/Protobuf/Internal/RepeatedField.php b/src/Google/Protobuf/Internal/RepeatedField.php
@@ -219,13 +219,13 @@ public function offsetSet($offset, $value)
     public function offsetUnset($offset)
     {
         $count = count($this->container);
-        if (!is_numeric($offset) || $count === 0 || $offset < 0 || $offset >= $count) {
+        if (!is_numeric($offset) || $count === 0 || $offset !== $count - 1) {
             trigger_error(
                 "Cannot remove element at the given index",
                 E_USER_ERROR);
             return;
         }
-        array_splice($this->container, $offset, 1);
+        array_pop($this->container);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -219,13 +219,13 @@ public function offsetSet($offset, $value)`
`219`	`219`	`public function offsetUnset($offset)`
`220`	`220`	`{`
`221`	`221`	`$count = count($this->container);`
`222`		`- if (!is_numeric($offset) \|\| $count === 0 \|\| $offset < 0 \|\| $offset >= $count) {`
	`222`	`+ if (!is_numeric($offset) \|\| $count === 0 \|\| $offset !== $count - 1) {`
`223`	`223`	`trigger_error(`
`224`	`224`	`"Cannot remove element at the given index",`
`225`	`225`	`E_USER_ERROR);`
`226`	`226`	`return;`
`227`	`227`	`}`
`228`		`- array_splice($this->container, $offset, 1);`
	`228`	`+ array_pop($this->container);`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`/**`