archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- Use exceptions now they work

Browse source
This commit is contained in:
Marcus Boerger 2004-11-11 19:42:11 +00:00
parent 9c0f5e8887
commit 4c8bca469f
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ext/spl/spl_array.c
View file

@ -643,8 +643,7 @@ SPL_METHOD(Array, __construct)
if (ZEND_NUM_ARGS() == 0) { if (ZEND_NUM_ARGS() == 0) {
return; /* nothing to do */ return; /* nothing to do */
} }
/* exceptions do not work yet php_set_error_handling(EH_THROW, spl_ce_InvalidArgumentException TSRMLS_CC);*/
php_set_error_handling(EH_THROW, zend_exception_get_default() TSRMLS_CC);*/
intern = (spl_array_object*)zend_object_store_get_object(object TSRMLS_CC); intern = (spl_array_object*)zend_object_store_get_object(object TSRMLS_CC);
@ -658,8 +657,8 @@ SPL_METHOD(Array, __construct)
intern->array = other->array; intern->array = other->array;
} else { } else {
if (!HASH_OF(*array)) { if (!HASH_OF(*array)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Passed variable is not an array or object, using empty array instead");
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC); php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
zend_throw_exception(spl_ce_InvalidArgumentException, "Passed variable is not an array or object, using empty array instead");
return; return;
} }
zval_dtor(intern->array); zval_dtor(intern->array);