SPL Double Linked List

Girgias · Girgias · commit ac44effef273 · 2020-04-17T00:28:45.000+02:00
diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c
@@ -770,6 +770,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetGet)
 	spl_dllist_object     *intern;
 	spl_ptr_llist_element *element;
 
+	/* TODO Change this to int? */
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &zindex) == FAILURE) {
 		RETURN_THROWS();
 	}
@@ -778,7 +779,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetGet)
 	index  = spl_offset_convert_to_long(zindex);
 
 	if (index < 0 || index >= intern->llist->count) {
-		zend_value_error("Offset invalid or out of range");
+		zend_argument_value_error(1, "is out of range");
 		RETURN_THROWS();
 	}
 
@@ -789,7 +790,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetGet)
 
 		ZVAL_COPY_DEREF(return_value, value);
 	} else {
-		zend_value_error("Offset invalid");
+		zend_argument_value_error(1, "is invalid");
 		RETURN_THROWS();
 	}
 } /* }}} */
@@ -818,7 +819,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetSet)
 		index = spl_offset_convert_to_long(zindex);
 
 		if (index < 0 || index >= intern->llist->count) {
-			zend_value_error("Offset invalid or out of range");
+			zend_argument_value_error(1, "is out of range");
 			RETURN_THROWS();
 		}
 
@@ -841,7 +842,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetSet)
 			}
 		} else {
 			zval_ptr_dtor(value);
-			zend_value_error("Offset invalid");
+			zend_argument_value_error(1, "is invalid");
 			RETURN_THROWS();
 		}
 	}
@@ -866,7 +867,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetUnset)
 	llist  = intern->llist;
 
 	if (index < 0 || index >= intern->llist->count) {
-		zend_value_error("Offset out of range");
+		zend_argument_value_error(1, "is out of range");
 		RETURN_THROWS();
 	}
 
@@ -907,7 +908,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetUnset)
 
 		SPL_LLIST_DELREF(element);
 	} else {
-		zend_value_error("Offset invalid");
+		zend_argument_value_error(1, "is invalid");
 		RETURN_THROWS();
 	}
 } /* }}} */
@@ -1210,6 +1211,7 @@ SPL_METHOD(SplDoublyLinkedList, unserialize)
 
 error:
 	PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
+	/* TODO Convert to standard Error ? */
 	zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0, "Error at offset %zd of %zd bytes", ((char*)p - buf), buf_len);
 	RETURN_THROWS();
 
@@ -1263,8 +1265,7 @@ SPL_METHOD(SplDoublyLinkedList, __unserialize) {
 	if (!flags_zv || !storage_zv || !members_zv ||
 			Z_TYPE_P(flags_zv) != IS_LONG || Z_TYPE_P(storage_zv) != IS_ARRAY ||
 			Z_TYPE_P(members_zv) != IS_ARRAY) {
-		zend_throw_exception(spl_ce_UnexpectedValueException,
-			"Incomplete or ill-typed serialization data", 0);
+		zend_throw_error(NULL, "Incomplete or ill-typed serialization data");
 		RETURN_THROWS();
 	}
 
@@ -1294,7 +1295,7 @@ SPL_METHOD(SplDoublyLinkedList, add)
 	index  = spl_offset_convert_to_long(zindex);
 
 	if (index < 0 || index > intern->llist->count) {
-		zend_value_error("Offset invalid or out of range");
+		zend_argument_value_error(1, "is out of range");
 		RETURN_THROWS();
 	}
 
@@ -1358,7 +1359,7 @@ zend_object_iterator *spl_dllist_get_iterator(zend_class_entry *ce, zval *object
 	spl_dllist_object *dllist_object = Z_SPLDLLIST_P(object);
 
 	if (by_ref) {
-		zend_throw_exception(spl_ce_RuntimeException, "An iterator cannot be used with foreach by reference", 0);
+		zend_throw_error(NULL, "An iterator cannot be used with foreach by reference");
 		return NULL;
 	}
 
diff --git a/ext/spl/tests/SPLDoublyLinkedList_iterate_by_reference.phpt b/ext/spl/tests/SPLDoublyLinkedList_iterate_by_reference.phpt
@@ -17,7 +17,7 @@ try {
         $value *= $value;
         echo $value, PHP_EOL;
     }
-} catch (Exception $e) {
+} catch (\Error $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
diff --git a/ext/spl/tests/SplDoublyLinkedList_add_invalid_offset.phpt b/ext/spl/tests/SplDoublyLinkedList_add_invalid_offset.phpt
@@ -10,4 +10,4 @@ try {
 }
 ?>
 --EXPECT--
-Offset invalid or out of range
+SplDoublyLinkedList::add(): Argument #1 ($index) is out of range
diff --git a/ext/spl/tests/SplDoublyLinkedList_add_null_offset.phpt b/ext/spl/tests/SplDoublyLinkedList_add_null_offset.phpt
@@ -10,4 +10,4 @@ try {
 }
 ?>
 --EXPECT--
-Offset invalid or out of range
+SplDoublyLinkedList::add(): Argument #1 ($index) is out of range
diff --git a/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_array.phpt b/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_array.phpt
@@ -15,4 +15,4 @@ try {
 
 ?>
 --EXPECT--
-Offset invalid or out of range
+SplDoublyLinkedList::offsetGet(): Argument #1 ($index) is out of range
diff --git a/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_string.phpt b/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_string.phpt
@@ -15,4 +15,4 @@ try {
 
 ?>
 --EXPECT--
-Offset invalid or out of range
+SplDoublyLinkedList::offsetGet(): Argument #1 ($index) is out of range
diff --git a/ext/spl/tests/SplDoublyLinkedList_offsetUnset_greater_than_elements.phpt b/ext/spl/tests/SplDoublyLinkedList_offsetUnset_greater_than_elements.phpt
@@ -19,4 +19,4 @@ try {
 
 ?>
 --EXPECT--
-Offset out of range
+SplDoublyLinkedList::offsetUnset(): Argument #1 ($index) is out of range
diff --git a/ext/spl/tests/SplDoublyLinkedList_offsetUnset_negative-parameter.phpt b/ext/spl/tests/SplDoublyLinkedList_offsetUnset_negative-parameter.phpt
@@ -19,4 +19,4 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com )
 	}
 ?>
 --EXPECT--
-Offset out of range
+SplDoublyLinkedList::offsetUnset(): Argument #1 ($index) is out of range
diff --git a/ext/spl/tests/SplDoublyLinkedList_offsetUnset_parameter-larger-num-elements.phpt b/ext/spl/tests/SplDoublyLinkedList_offsetUnset_parameter-larger-num-elements.phpt
@@ -19,4 +19,4 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com )
 	}
 ?>
 --EXPECT--
-Offset out of range
+SplDoublyLinkedList::offsetUnset(): Argument #1 ($index) is out of range
diff --git a/ext/spl/tests/bug46160.phpt b/ext/spl/tests/bug46160.phpt
@@ -10,4 +10,4 @@ try {
 }
 ?>
 --EXPECT--
-Offset invalid or out of range
+SplDoublyLinkedList::offsetSet(): Argument #1 ($index) is out of range
diff --git a/ext/spl/tests/bug71735.phpt b/ext/spl/tests/bug71735.phpt
@@ -10,4 +10,4 @@ try {
 }
 ?>
 --EXPECT--
-Offset invalid or out of range
+SplDoublyLinkedList::offsetSet(): Argument #1 ($index) is out of range
diff --git a/ext/spl/tests/dllist_006.phpt b/ext/spl/tests/dllist_006.phpt
@@ -44,6 +44,6 @@ Unsetting..
 int(3)
 int(4)
 int(2)
-Offset invalid or out of range
+SplDoublyLinkedList::offsetGet(): Argument #1 ($index) is out of range
 int(1)
-Offset invalid or out of range
+SplDoublyLinkedList::offsetGet(): Argument #1 ($index) is out of range
diff --git a/ext/spl/tests/dllist_013.phpt b/ext/spl/tests/dllist_013.phpt
@@ -31,7 +31,7 @@ echo $dll->pop()."\n";
 echo $dll->pop()."\n";
 ?>
 --EXPECT--
-Offset invalid or out of range
+SplDoublyLinkedList::add(): Argument #1 ($index) is out of range
 7
 7
 6
diff --git a/ext/spl/tests/unserialize_errors.phpt b/ext/spl/tests/unserialize_errors.phpt
@@ -59,25 +59,25 @@ echo "SplDoublyLinkedList:\n";
 
 try {
     unserialize('O:19:"SplDoublyLinkedList":0:{}');
-} catch (Exception $e) {
+} catch (Error $e) {
     echo $e->getMessage(), "\n";
 }
 
 try {
     unserialize('O:19:"SplDoublyLinkedList":3:{i:0;b:1;i:1;a:0:{}i:2;a:0:{}}');
-} catch (Exception $e) {
+} catch (Error $e) {
     echo $e->getMessage(), "\n";
 }
 
 try {
     unserialize('O:19:"SplDoublyLinkedList":3:{i:0;i:0;i:1;a:0:{}i:2;i:0;}');
-} catch (Exception $e) {
+} catch (Error $e) {
     echo $e->getMessage(), "\n";
 }
 
 try {
     unserialize('O:19:"SplDoublyLinkedList":3:{i:0;i:0;i:1;i:0;i:2;a:0:{}}');
-} catch (Exception $e) {
+} catch (Error $e) {
     echo $e->getMessage(), "\n";
 }
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ try {`
`17`	`17`	`$value *= $value;`
`18`	`18`	`echo $value, PHP_EOL;`
`19`	`19`	`}`
`20`		`-} catch (Exception $e) {`
	`20`	`+} catch (\Error $e) {`
`21`	`21`	`echo $e->getMessage(), PHP_EOL;`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,4 @@ try {`
`10`	`10`	`}`
`11`	`11`	`?>`
`12`	`12`	`--EXPECT--`
`13`		`-Offset invalid or out of range`
	`13`	`+SplDoublyLinkedList::add(): Argument #1 ($index) is out of range`
Original file line number	Diff line number	Diff line change
`@@ -19,4 +19,4 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com )`
`19`	`19`	`}`
`20`	`20`	`?>`
`21`	`21`	`--EXPECT--`
`22`		`-Offset out of range`
	`22`	`+SplDoublyLinkedList::offsetUnset(): Argument #1 ($index) is out of range`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ echo $dll->pop()."\n";`
`31`	`31`	`echo $dll->pop()."\n";`
`32`	`32`	`?>`
`33`	`33`	`--EXPECT--`
`34`		`-Offset invalid or out of range`
	`34`	`+SplDoublyLinkedList::add(): Argument #1 ($index) is out of range`
`35`	`35`	`7`
`36`	`36`	`7`
`37`	`37`	`6`