Merge branch 'PHP-5.4' into PHP-5.5

smalyshev · smalyshev · commit 68e630b72f52 · 2013-07-15T00:36:35.000-07:00
* PHP-5.4:
  fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
  fix invalid variable name at ext/spl/internal/multipleiterator.inc
diff --git a/ext/spl/internal/multipleiterator.inc b/ext/spl/internal/multipleiterator.inc
@@ -163,7 +163,7 @@ class MultipleIterator implements Iterator
 		$retval = array();
 		foreach($this->iterators as $iter)
 		{
-			if ($it->valid())
+			if ($iter->valid())
 			{
 				if ($this->flags & self::MIT_KEYS_ASSOC)
 				{
@@ -205,7 +205,7 @@ class MultipleIterator implements Iterator
 		$retval = array();
 		foreach($this->iterators as $iter)
 		{
-			if ($it->valid())
+			if ($iter->valid())
 			{
 				$retval[] = $iter->key();
 			}

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ class MultipleIterator implements Iterator`
`163`	`163`	`$retval = array();`
`164`	`164`	`foreach($this->iterators as $iter)`
`165`	`165`	`{`
`166`		`- if ($it->valid())`
	`166`	`+ if ($iter->valid())`
`167`	`167`	`{`
`168`	`168`	`if ($this->flags & self::MIT_KEYS_ASSOC)`
`169`	`169`	`{`
`@@ -205,7 +205,7 @@ class MultipleIterator implements Iterator`
`205`	`205`	`$retval = array();`
`206`	`206`	`foreach($this->iterators as $iter)`
`207`	`207`	`{`
`208`		`- if ($it->valid())`
	`208`	`+ if ($iter->valid())`
`209`	`209`	`{`
`210`	`210`	`$retval[] = $iter->key();`
`211`	`211`	`}`