Corrected typo in LimitIterator offset exception. Fixes #51119

diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 3c76867a8576cf1085ef0fb010141095ce0d6ef3..07f47680de3553089882181b1d56eaccfb0f857f 100755 (executable)
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -923,7 +923,7 @@ static spl_dual_it_object* spl_dual_it_construct(INTERNAL_FUNCTION_PARAMETERS, z
                        }
                        if (intern->u.limit.offset < 0) {
                                php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
-                               zend_throw_exception(spl_ce_OutOfRangeException, "Parameter offset must be > 0", 0 TSRMLS_CC);
+                               zend_throw_exception(spl_ce_OutOfRangeException, "Parameter offset must be >= 0", 0 TSRMLS_CC);
                                return NULL;
                        }
                        if (intern->u.limit.count < 0 && intern->u.limit.count != -1) {

diff --git a/ext/spl/tests/bug51119.phpt b/ext/spl/tests/bug51119.phpt
new file mode 100644 (file)
index 0000000..441aa12
--- /dev/null
+++ b/ext/spl/tests/bug51119.phpt
@@ -0,0 +1,34 @@
+--TEST--
+SPL: LimitIterator zero is valid offset
+--FILE--
+<?php
+
+$array = array('a', 'b', 'c');
+$arrayIterator = new ArrayIterator($array);
+
+try {
+  $limitIterator = new LimitIterator($arrayIterator, 0);
+  foreach ($limitIterator as $item) {
+    echo $item . "\n";
+  }
+} catch (OutOfRangeException $e){
+  print $e->getMessage() . "\n";
+}
+
+try {
+  $limitIterator = new LimitIterator($arrayIterator, -1);
+  foreach ($limitIterator as $item) {
+    echo $item . "\n";
+  }
+} catch (OutOfRangeException $e){
+  print $e->getMessage() . "\n";
+}
+
+?>
+===DONE===
+--EXPECT--
+a
+b
+c
+Parameter offset must be >= 0
+===DONE===

diff --git a/ext/spl/tests/spl_limit_iterator_check_limits.phpt b/ext/spl/tests/spl_limit_iterator_check_limits.phpt
index 01436a8fbe01de882142540aba90f6922323acc5..ae1bc85e895e07fac165c02bfd46b165a067f9c8 100644 (file)
--- a/ext/spl/tests/spl_limit_iterator_check_limits.phpt
+++ b/ext/spl/tests/spl_limit_iterator_check_limits.phpt
@@ -32,6 +32,6 @@ try {
 ?>
 ===DONE===
 --EXPECTF--
-Parameter offset must be > 0
+Parameter offset must be >= 0
 Parameter count must either be -1 or a value greater than or equal 0
 ===DONE===