- Fix #48667 (Implementing Iterator and IteratorAggregate is now restricted..

diff --git a/Zend/tests/bug48667_1.phpt b/Zend/tests/bug48667_1.phpt
new file mode 100644 (file)
index 0000000..2d94aed
--- /dev/null
+++ b/Zend/tests/bug48667_1.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Bug #48667 (Implementing both iterator and iteratoraggregate)
+--FILE--
+<?php
+
+abstract class A implements Iterator, IteratorAggregate { }
+
+?>
+--EXPECTF--
+Fatal error: Class A cannot implement both IteratorAggregate and Iterator at the same time in %s on line %d

diff --git a/Zend/tests/bug48667_2.phpt b/Zend/tests/bug48667_2.phpt
new file mode 100644 (file)
index 0000000..57cd5eb
--- /dev/null
+++ b/Zend/tests/bug48667_2.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Bug #48667 (Implementing both iterator and iteratoraggregate)
+--FILE--
+<?php
+
+abstract class A implements IteratorAggregate, Iterator { }
+
+?>
+--EXPECTF--
+Fatal error: Class A cannot implement both Iterator and IteratorAggregate at the same time in %s on line %d

diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c
index 4106c7e2da89fcee76b4a560dbc59f7a6d0a6aee..517b1163180b4b6a0502c329da439486f3e9e1c3 100755 (executable)
--- a/Zend/zend_interfaces.c
+++ b/Zend/zend_interfaces.c
@@ -353,6 +353,10 @@ static int zend_implement_aggregate(zend_class_entry *interface, zend_class_entr
                        if (class_type->num_interfaces) {
                                for (i = 0; i < class_type->num_interfaces; i++) {
                                        if (class_type->interfaces[i] == zend_ce_iterator) {
+                                               zend_error(E_ERROR, "Class %s cannot implement both %s and %s at the same time",
+                                                                       class_type->name,
+                                                                       interface->name,
+                                                                       zend_ce_iterator->name);
                                                return FAILURE;
                                        }
                                        if (class_type->interfaces[i] == zend_ce_traversable) {
@@ -378,8 +382,14 @@ static int zend_implement_iterator(zend_class_entry *interface, zend_class_entry
                if (class_type->type == ZEND_INTERNAL_CLASS) {
                        /* inheritance ensures the class has the necessary userland methods */
                        return SUCCESS;
-               } else if (class_type->get_iterator != zend_user_it_get_new_iterator) {
+               } else {
                        /* c-level get_iterator cannot be changed */
+                       if (class_type->get_iterator == zend_user_it_get_new_iterator) {
+                               zend_error(E_ERROR, "Class %s cannot implement both %s and %s at the same time",
+                                                       class_type->name,
+                                                       interface->name,
+                                                       zend_ce_aggregate->name);
+                       }
                        return FAILURE;
                }
        }