Skip to content

Commit 38c634e

Browse files
committed
ext/intl: Small extension cleanup
1 parent 9771302 commit 38c634e

File tree

6 files changed

+5
-24
lines changed

6 files changed

+5
-24
lines changed

ext/intl/collator/collator_class.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,6 @@ void collator_register_Collator_symbols(int module_number)
7777
Collator_handlers.offset = XtOffsetOf(Collator_object, zo);
7878
Collator_handlers.clone_obj = NULL;
7979
Collator_handlers.free_obj = Collator_objects_free;
80-
81-
/* Declare 'Collator' class properties. */
82-
if( !Collator_ce_ptr )
83-
{
84-
zend_error( E_ERROR,
85-
"Collator: attempt to create properties "
86-
"on a non-registered class." );
87-
return;
88-
}
8980
}
9081
/* }}} */
9182

ext/intl/resourcebundle/resourcebundle_iterator.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,14 @@ static const zend_object_iterator_funcs resourcebundle_iterator_funcs = {
148148
/* {{{ resourcebundle_get_iterator */
149149
zend_object_iterator *resourcebundle_get_iterator( zend_class_entry *ce, zval *object, int byref )
150150
{
151-
ResourceBundle_object *rb = Z_INTL_RESOURCEBUNDLE_P(object );
152-
ResourceBundle_iterator *iterator = emalloc( sizeof( ResourceBundle_iterator ) );
153-
154151
if (byref) {
155-
php_error( E_ERROR, "ResourceBundle does not support writable iterators" );
152+
zend_throw_error(NULL, "An iterator cannot be used with foreach by reference");
153+
return NULL;
156154
}
157155

156+
ResourceBundle_object *rb = Z_INTL_RESOURCEBUNDLE_P(object );
157+
ResourceBundle_iterator *iterator = emalloc( sizeof( ResourceBundle_iterator ) );
158+
158159
zend_iterator_init(&iterator->intern);
159160
Z_ADDREF_P(object);
160161
ZVAL_OBJ(&iterator->intern.data, Z_OBJ_P(object));

ext/intl/tests/collator_get_error_code.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ function ut_main()
3636
return $res;
3737
}
3838

39-
# Suppress warning messages.
40-
error_reporting( E_ERROR );
41-
4239
include_once( 'ut_common.inc' );
4340
ut_run();
4441
?>

ext/intl/tests/intl_get_error_code.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ intl
88
* Check getting global error code.
99
*/
1010

11-
// Suppress warning messages.
12-
error_reporting( E_ERROR );
13-
1411
if( collator_get_locale(new Collator('en_US'), -1) !== false )
1512
echo "failed\n";
1613
else

ext/intl/tests/intl_get_error_message.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ intl
88
* Check getting global error message.
99
*/
1010

11-
// Suppress warning messages.
12-
error_reporting( E_ERROR );
13-
1411
if( collator_get_locale(new Collator('en_US'), -1) !== false )
1512
echo "failed\n";
1613
else

ext/intl/tests/locale_compose_locale.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ function ut_main()
101101
'loc12' => $loc_parts_arr12
102102
);
103103

104-
error_reporting( E_ERROR );
105-
106104
$cnt = 0;
107105
$res_str = '';
108106
foreach($loc_parts_arr as $key => $value ){

0 commit comments

Comments
 (0)