Skip to content

Commit d776263

Browse files
nikicnikic
committed
Rename InternalIterator to IteratorForExtensions
1 parent 4ede3d5 commit d776263

File tree

3 files changed

+38
-37
lines changed

3 files changed

+38
-37
lines changed

‎Zend/zend_interfaces.c

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ZEND_API zend_class_entry *zend_ce_arrayaccess;
2929
ZEND_API zend_class_entry *zend_ce_serializable;
3030
ZEND_API zend_class_entry *zend_ce_countable;
3131
ZEND_API zend_class_entry *zend_ce_stringable;
32-
ZEND_API zend_class_entry *zend_ce_internal_iterator;
32+
ZEND_API zend_class_entry *zend_ce_iterator_for_extensions;
3333

3434
static zend_object_handlers zend_internal_iterator_handlers;
3535

@@ -464,7 +464,7 @@ ZEND_API int zend_create_internal_iterator_zval(zval *return_value, zval *obj) {
464464
}
465465

466466
zend_internal_iterator *intern =
467-
(zend_internal_iterator *) zend_internal_iterator_create(zend_ce_internal_iterator);
467+
(zend_internal_iterator *) zend_internal_iterator_create(zend_ce_iterator_for_extensions);
468468
intern->iter = iter;
469469
ZVAL_OBJ(return_value, &intern->std);
470470
return SUCCESS;
@@ -481,7 +481,8 @@ static void zend_internal_iterator_free(zend_object *obj) {
481481
static zend_internal_iterator *zend_internal_iterator_fetch(zval *This) {
482482
zend_internal_iterator *intern = (zend_internal_iterator *) Z_OBJ_P(This);
483483
if (!intern->iter) {
484-
zend_throw_error(NULL, "The InternalIterator object has not been properly initialized");
484+
zend_throw_error(NULL,
485+
"The IteratorForExtensions object has not been properly initialized");
485486
return NULL;
486487
}
487488
return intern;
@@ -503,11 +504,11 @@ static int zend_internal_iterator_ensure_rewound(zend_internal_iterator *intern)
503504
}
504505

505506

506-
ZEND_METHOD(InternalIterator, __construct) {
507-
zend_throw_error(NULL, "Cannot manually construct InternalIterator");
507+
ZEND_METHOD(IteratorForExtensions, __construct) {
508+
zend_throw_error(NULL, "Cannot manually construct IteratorForExtensions");
508509
}
509510

510-
ZEND_METHOD(InternalIterator, current) {
511+
ZEND_METHOD(IteratorForExtensions, current) {
511512
ZEND_PARSE_PARAMETERS_NONE();
512513

513514
zend_internal_iterator *intern = zend_internal_iterator_fetch(ZEND_THIS);
@@ -525,7 +526,7 @@ ZEND_METHOD(InternalIterator, current) {
525526
}
526527
}
527528

528-
ZEND_METHOD(InternalIterator, key) {
529+
ZEND_METHOD(IteratorForExtensions, key) {
529530
ZEND_PARSE_PARAMETERS_NONE();
530531

531532
zend_internal_iterator *intern = zend_internal_iterator_fetch(ZEND_THIS);
@@ -544,7 +545,7 @@ ZEND_METHOD(InternalIterator, key) {
544545
}
545546
}
546547

547-
ZEND_METHOD(InternalIterator, next) {
548+
ZEND_METHOD(IteratorForExtensions, next) {
548549
ZEND_PARSE_PARAMETERS_NONE();
549550

550551
zend_internal_iterator *intern = zend_internal_iterator_fetch(ZEND_THIS);
@@ -560,7 +561,7 @@ ZEND_METHOD(InternalIterator, next) {
560561
intern->iter->index++;
561562
}
562563

563-
ZEND_METHOD(InternalIterator, valid) {
564+
ZEND_METHOD(IteratorForExtensions, valid) {
564565
ZEND_PARSE_PARAMETERS_NONE();
565566

566567
zend_internal_iterator *intern = zend_internal_iterator_fetch(ZEND_THIS);
@@ -575,7 +576,7 @@ ZEND_METHOD(InternalIterator, valid) {
575576
RETURN_BOOL(intern->iter->funcs->valid(intern->iter) == SUCCESS);
576577
}
577578

578-
ZEND_METHOD(InternalIterator, rewind) {
579+
ZEND_METHOD(IteratorForExtensions, rewind) {
579580
ZEND_PARSE_PARAMETERS_NONE();
580581

581582
zend_internal_iterator *intern = zend_internal_iterator_fetch(ZEND_THIS);
@@ -622,13 +623,13 @@ ZEND_API void zend_register_interfaces(void)
622623
INIT_CLASS_ENTRY(ce, "Stringable", class_Stringable_methods);
623624
zend_ce_stringable = zend_register_internal_interface(&ce);
624625

625-
INIT_CLASS_ENTRY(ce, "InternalIterator", class_InternalIterator_methods);
626-
zend_ce_internal_iterator = zend_register_internal_class(&ce);
627-
zend_class_implements(zend_ce_internal_iterator, 1, zend_ce_iterator);
628-
zend_ce_internal_iterator->ce_flags |= ZEND_ACC_FINAL;
629-
zend_ce_internal_iterator->create_object = zend_internal_iterator_create;
630-
zend_ce_internal_iterator->serialize = zend_class_serialize_deny;
631-
zend_ce_internal_iterator->unserialize = zend_class_unserialize_deny;
626+
INIT_CLASS_ENTRY(ce, "IteratorForExtensions", class_IteratorForExtensions_methods);
627+
zend_ce_iterator_for_extensions = zend_register_internal_class(&ce);
628+
zend_class_implements(zend_ce_iterator_for_extensions, 1, zend_ce_iterator);
629+
zend_ce_iterator_for_extensions->ce_flags |= ZEND_ACC_FINAL;
630+
zend_ce_iterator_for_extensions->create_object = zend_internal_iterator_create;
631+
zend_ce_iterator_for_extensions->serialize = zend_class_serialize_deny;
632+
zend_ce_iterator_for_extensions->unserialize = zend_class_unserialize_deny;
632633

633634
memcpy(&zend_internal_iterator_handlers, zend_get_std_object_handlers(),
634635
sizeof(zend_object_handlers));

‎Zend/zend_interfaces.stub.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ interface Stringable
6464
public function __toString(): string;
6565
}
6666

67-
final class InternalIterator implements Iterator
67+
final class IteratorForExtensions implements Iterator
6868
{
6969
private function __construct();
7070

‎Zend/zend_interfaces_arginfo.h

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,27 +37,27 @@ ZEND_END_ARG_INFO()
3737
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Stringable___toString, 0, 0, IS_STRING, 0)
3838
ZEND_END_ARG_INFO()
3939

40-
#define arginfo_class_InternalIterator___construct arginfo_class_IteratorAggregate_getIterator
40+
#define arginfo_class_IteratorForExtensions___construct arginfo_class_IteratorAggregate_getIterator
4141

42-
#define arginfo_class_InternalIterator_current arginfo_class_IteratorAggregate_getIterator
42+
#define arginfo_class_IteratorForExtensions_current arginfo_class_IteratorAggregate_getIterator
4343

44-
#define arginfo_class_InternalIterator_key arginfo_class_IteratorAggregate_getIterator
44+
#define arginfo_class_IteratorForExtensions_key arginfo_class_IteratorAggregate_getIterator
4545

46-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_InternalIterator_next, 0, 0, IS_VOID, 0)
46+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_IteratorForExtensions_next, 0, 0, IS_VOID, 0)
4747
ZEND_END_ARG_INFO()
4848

49-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_InternalIterator_valid, 0, 0, _IS_BOOL, 0)
49+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_IteratorForExtensions_valid, 0, 0, _IS_BOOL, 0)
5050
ZEND_END_ARG_INFO()
5151

52-
#define arginfo_class_InternalIterator_rewind arginfo_class_InternalIterator_next
52+
#define arginfo_class_IteratorForExtensions_rewind arginfo_class_IteratorForExtensions_next
5353

5454

55-
ZEND_METHOD(InternalIterator, __construct);
56-
ZEND_METHOD(InternalIterator, current);
57-
ZEND_METHOD(InternalIterator, key);
58-
ZEND_METHOD(InternalIterator, next);
59-
ZEND_METHOD(InternalIterator, valid);
60-
ZEND_METHOD(InternalIterator, rewind);
55+
ZEND_METHOD(IteratorForExtensions, __construct);
56+
ZEND_METHOD(IteratorForExtensions, current);
57+
ZEND_METHOD(IteratorForExtensions, key);
58+
ZEND_METHOD(IteratorForExtensions, next);
59+
ZEND_METHOD(IteratorForExtensions, valid);
60+
ZEND_METHOD(IteratorForExtensions, rewind);
6161

6262

6363
static const zend_function_entry class_Traversable_methods[] = {
@@ -109,12 +109,12 @@ static const zend_function_entry class_Stringable_methods[] = {
109109
};
110110

111111

112-
static const zend_function_entry class_InternalIterator_methods[] = {
113-
ZEND_ME(InternalIterator, __construct, arginfo_class_InternalIterator___construct, ZEND_ACC_PRIVATE)
114-
ZEND_ME(InternalIterator, current, arginfo_class_InternalIterator_current, ZEND_ACC_PUBLIC)
115-
ZEND_ME(InternalIterator, key, arginfo_class_InternalIterator_key, ZEND_ACC_PUBLIC)
116-
ZEND_ME(InternalIterator, next, arginfo_class_InternalIterator_next, ZEND_ACC_PUBLIC)
117-
ZEND_ME(InternalIterator, valid, arginfo_class_InternalIterator_valid, ZEND_ACC_PUBLIC)
118-
ZEND_ME(InternalIterator, rewind, arginfo_class_InternalIterator_rewind, ZEND_ACC_PUBLIC)
112+
static const zend_function_entry class_IteratorForExtensions_methods[] = {
113+
ZEND_ME(IteratorForExtensions, __construct, arginfo_class_IteratorForExtensions___construct, ZEND_ACC_PRIVATE)
114+
ZEND_ME(IteratorForExtensions, current, arginfo_class_IteratorForExtensions_current, ZEND_ACC_PUBLIC)
115+
ZEND_ME(IteratorForExtensions, key, arginfo_class_IteratorForExtensions_key, ZEND_ACC_PUBLIC)
116+
ZEND_ME(IteratorForExtensions, next, arginfo_class_IteratorForExtensions_next, ZEND_ACC_PUBLIC)
117+
ZEND_ME(IteratorForExtensions, valid, arginfo_class_IteratorForExtensions_valid, ZEND_ACC_PUBLIC)
118+
ZEND_ME(IteratorForExtensions, rewind, arginfo_class_IteratorForExtensions_rewind, ZEND_ACC_PUBLIC)
119119
ZEND_FE_END
120120
};

0 commit comments

Comments
 (0)