Remove get()/set() helpers, switch tests to offsetGet/offsetSet

Author: TysonAndre

ext/collections/collections_deque.c

@@ -805,16 +805,6 @@ static zend_always_inline void collections_deque_get_value_at_offset(zval *retur
 	RETURN_COPY(collections_deque_get_entry_at_offset(&intern->array, offset));
 }
 
-PHP_METHOD(Collections_Deque, get)
-{
-	zend_long offset;
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_LONG(offset)
-	ZEND_PARSE_PARAMETERS_END();
-
-	collections_deque_get_value_at_offset(return_value, ZEND_THIS, offset);
-}
-
 PHP_METHOD(Collections_Deque, offsetGet)
 {
 	zval *offset_zv;
@@ -914,18 +904,6 @@ static void collections_deque_write_dimension(zend_object *object, zval *offset_
 	collections_deque_set_value_at_offset(object, offset, value);
 }
 
-PHP_METHOD(Collections_Deque, set)
-{
-	zend_long offset;
-	zval *value;
-	ZEND_PARSE_PARAMETERS_START(2, 2)
-		Z_PARAM_LONG(offset)
-		Z_PARAM_ZVAL(value)
-	ZEND_PARSE_PARAMETERS_END();
-
-	collections_deque_set_value_at_offset(Z_OBJ_P(ZEND_THIS), offset, value);
-}
-
 PHP_METHOD(Collections_Deque, offsetSet)
 {
 	zval                  *offset_zv, *value;

ext/collections/collections_deque.stub.php

@@ -67,17 +67,7 @@ public function top(): mixed {}
 
     /** Returns a list of the elements from front to back. */
     public function toArray(): array {}
-    /* Get and set are strictly typed, unlike offsetGet/offsetSet. */
-    /**
-     * Returns the value at offset $offset (relative to the start of the Deque)
-     * @throws OutOfBoundsException if the value of (int)$offset is not within the bounds of this vector
-     */
-    public function get(int $offset): mixed {}
-    /**
-     * Sets the value at offset $offset (relative to the start of the Deque) to $value
-     * @throws OutOfBoundsException if the value of (int)$offset is not within the bounds of this vector
-     */
-    public function set(int $offset, mixed $value): void {}
+
     // Must be mixed for compatibility with ArrayAccess
     /**
      * Returns the value at offset (int)$offset (relative to the start of the Deque)

ext/collections/collections_deque_arginfo.h

@@ -14,7 +14,6 @@ function expect_throws(Closure $cb): void {
 expect_throws(fn() => (new ReflectionClass(Collections\Deque::class))->newInstanceWithoutConstructor());
 $it = new Collections\Deque(['first' => new stdClass()]);
 var_dump($it->offsetGet(0));
-var_dump($it->get(0));
 expect_throws(fn() => $it->offsetSet(1,'x'));
 expect_throws(fn() => $it->offsetUnset(0));
 var_dump($it->offsetGet('0'));
@@ -23,20 +22,15 @@ var_dump($it->offsetExists(1));
 var_dump($it->offsetExists('1'));
 var_dump($it->offsetExists(PHP_INT_MAX));
 var_dump($it->offsetExists(PHP_INT_MIN));
-expect_throws(fn() => $it->get(1));
-expect_throws(fn() => $it->get(-1));
+expect_throws(fn() => $it->offsetGet(1));
+expect_throws(fn() => $it->offsetGet(-1));
 echo "Invalid offsetGet calls\n";
 expect_throws(fn() => $it->offsetGet(PHP_INT_MAX));
 expect_throws(fn() => $it->offsetGet(PHP_INT_MIN));
 expect_throws(fn() => $it->offsetGet(1));
-expect_throws(fn() => $it->get(PHP_INT_MAX));
-expect_throws(fn() => $it->get(PHP_INT_MIN));
-expect_throws(fn() => $it->get(1));
-expect_throws(fn() => $it->get(-1));
-expect_throws(fn() => $it->offsetGet(1));
+expect_throws(fn() => $it->offsetGet(-1));
 expect_throws(fn() => $it->offsetGet('1'));
 expect_throws(fn() => $it->offsetGet('invalid'));
-expect_throws(fn() => $it->get('invalid'));
 expect_throws(fn() => $it[['invalid']]);
 expect_throws(fn() => $it->offsetUnset(PHP_INT_MAX));
 expect_throws(fn() => $it->offsetSet(PHP_INT_MAX,'x'));
@@ -47,8 +41,6 @@ var_dump($it->getIterator());
 Caught ReflectionException: Class Collections\Deque is an internal class marked as final that cannot be instantiated without invoking its constructor
 object(stdClass)#1 (0) {
 }
-object(stdClass)#1 (0) {
-}
 Caught OutOfBoundsException: Index out of range
 Caught RuntimeException: Collections\Deque does not support offsetUnset - elements must be set to null or removed by resizing
 object(stdClass)#1 (0) {
@@ -66,15 +58,10 @@ Caught OutOfBoundsException: Index out of range
 Caught OutOfBoundsException: Index out of range
 Caught OutOfBoundsException: Index out of range
 Caught OutOfBoundsException: Index out of range
-Caught OutOfBoundsException: Index out of range
-Caught OutOfBoundsException: Index out of range
-Caught OutOfBoundsException: Index out of range
-Caught OutOfBoundsException: Index out of range
 Caught TypeError: Illegal offset type
-Caught TypeError: Collections\Deque::get(): Argument #1 ($offset) must be of type int, string given
 Caught TypeError: Illegal offset type
 Caught RuntimeException: Collections\Deque does not support offsetUnset - elements must be set to null or removed by resizing
 Caught OutOfBoundsException: Index out of range
 Caught RuntimeException: Collections\Deque does not support offsetUnset - elements must be set to null or removed by resizing
-object(InternalIterator)#2 (0) {
+object(InternalIterator)#4 (0) {
 }

ext/collections/tests/Deque/offsetGet.phpt

@@ -15,23 +15,21 @@ function expect_throws(Closure $cb): void {
 echo "Test empty deque\n";
 $it = new Collections\Deque([]);
 expect_throws(fn() => $it->offsetSet(0, strtoupper('value')));
-expect_throws(fn() => $it->set(0, strtoupper('value')));
 
 echo "Test short deque\n";
 $str = 'Test short deque';
 $it = new Collections\Deque(explode(' ', $str));
-$it->set(0, 'new');
+$it->offsetSet(0, 'new');
 $it->offsetSet(2, strtoupper('test'));
 echo json_encode($it), "\n";
-expect_throws(fn() => $it->set(-1, strtoupper('value')));
-expect_throws(fn() => $it->set(3, 'end'));
-expect_throws(fn() => $it->set(PHP_INT_MAX, 'end'));
+expect_throws(fn() => $it->offsetSet(-1, strtoupper('value')));
+expect_throws(fn() => $it->offsetSet(3, 'end'));
+expect_throws(fn() => $it->offsetSet(PHP_INT_MAX, 'end'));
 
 ?>
 --EXPECT--
 Test empty deque
 Caught OutOfBoundsException: Index out of range
-Caught OutOfBoundsException: Index out of range
 Test short deque
 ["new","short","TEST"]
 Caught OutOfBoundsException: Index out of range