summaryrefslogtreecommitdiff
path: root/Zend
diff options
context:
space:
mode:
authorEtienne Kneuss <colder@php.net>2010-02-01 13:45:57 (GMT)
committerEtienne Kneuss <colder@php.net>2010-02-01 13:45:57 (GMT)
commitcca05f1403dca5db3f090850d8623cb7f36cd188 (patch)
treee242dec6f7420be5e48bc7b0585470a010c5b20d /Zend
parentb0f76c253485334d1d917b45b867bce02f26ccd9 (diff)
downloadphp-cca05f1403dca5db3f090850d8623cb7f36cd188.tar.gz
Fix #48667 (Implementing Iterator and IteratorAggregate is now restricted in both orders)
Diffstat (limited to 'Zend')
-rw-r--r--Zend/tests/bug48667_1.phpt10
-rw-r--r--Zend/tests/bug48667_2.phpt10
-rwxr-xr-xZend/zend_interfaces.c12
3 files changed, 31 insertions, 1 deletions
diff --git a/Zend/tests/bug48667_1.phpt b/Zend/tests/bug48667_1.phpt
new file mode 100644
index 0000000..df98aed
--- /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
index 0000000..6bc707e
--- /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 4106c7e..5f9440f 100755
--- 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;
}
}