Sep 1, 2012 · May 15, 2012 · May 19, 2012 · May 19, 2012 · May 19, 2012 · May 19, 2012
diff --git a/Zend/Makefile.am b/Zend/Makefile.am
 zend_objects_API.c zend_ts_hash.c zend_stream.c \
 zend_default_classes.c \
 zend_iterators.c zend_interfaces.c zend_exceptions.c \
 zend_strtod.c zend_closures.c zend_float.c zend_string.c zend_signal.c
 zend_strtod.c zend_closures.c zend_float.c zend_string.c zend_signal.c \
 zend_generators.c

 libZend_la_LDFLAGS =
 libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
diff --git a/Zend/Zend.dsp b/Zend/Zend.dsp
diff --git a/Zend/ZendTS.dsp b/Zend/ZendTS.dsp
diff --git a/Zend/tests/errmsg_043.phpt b/Zend/tests/errmsg_043.phpt
diff --git a/Zend/tests/foreach_temp_array_expr_with_refs.phpt b/Zend/tests/foreach_temp_array_expr_with_refs.phpt
 --TEST--
 Temporary array expressions can be iterated by reference
 --FILE--
 <?php

 $a = 'a';
 $b = 'b';

 foreach ([&$a, &$b] as &$value) {
    $value .= '-foo';
 }

 var_dump($a, $b);

 ?>
 --EXPECT--
 string(5) "a-foo"
 string(5) "b-foo"
diff --git a/Zend/tests/generators/auto_incrementing_keys.phpt b/Zend/tests/generators/auto_incrementing_keys.phpt
 --TEST--
 Generator keys are auto-incrementing by default
 --FILE--
 <?php

 function gen() {
    yield 'foo';
    yield 'bar';
    yield 5 => 'rab';
    yield 'oof';
 }

 foreach (gen() as $k => $v) {
    echo $k, ' => ', $v, "\n";
 }

 ?>
 --EXPECT--
 0 => foo
 1 => bar
 5 => rab
 6 => oof
diff --git a/Zend/tests/generators/backtrace.phpt b/Zend/tests/generators/backtrace.phpt
 --TEST--
 Printing the stack trace in a generator
 --FILE--
 <?php

 function f1() {
    debug_print_backtrace();
 }

 function f2($arg1, $arg2) {
    f1();
    yield; // force generator
 }

 function f3($gen) {
    $gen->rewind(); // trigger run
 }

 $gen = f2('foo', 'bar');
 f3($gen);

 ?>
 --EXPECTF--
 #0  f1() called at [%s:%d]
 #1  f2(foo, bar)
 #2  Generator->rewind() called at [%s:%d]
 #3  f3(Generator Object ()) called at [%s:%d]
diff --git a/Zend/tests/generators/clone.phpt b/Zend/tests/generators/clone.phpt
 --TEST--
 Generators can be cloned
 --FILE--
 <?php

 function firstN($end) {
    for ($i = 0; $i < $end; ++$i) {
        yield $i;
    }
 }

 $g1 = firstN(5);
 var_dump($g1->current());
 $g1->next();

 $g2 = clone $g1;
 var_dump($g2->current());
 $g2->next();

 var_dump($g2->current());
 var_dump($g1->current());

 $g1->next();
 var_dump($g1->current());

 ?>
 --EXPECT--
 int(0)
 int(1)
 int(2)
 int(1)
 int(2)
diff --git a/Zend/tests/generators/clone_with_foreach.phpt b/Zend/tests/generators/clone_with_foreach.phpt
 --TEST--
 Cloning a generator with a foreach loop properly adds a ref for the loop var
 --FILE--
 <?php

 function gen() {
    foreach ([1, 2, 3] as $i) {
        yield $i;
    }
 }

 $g1 = gen();
 var_dump($g1->current());

 $g2 = clone $g1;
 var_dump($g2->current());

 $g1->next();
 $g2->next();
 var_dump($g1->current());
 var_dump($g2->current());

 unset($g1);
 $g2->next();
 var_dump($g2->current());

 ?>
 --EXPECT--
 int(1)
 int(1)
 int(2)
 int(2)
 int(3)
diff --git a/Zend/tests/generators/clone_with_stack.phpt b/Zend/tests/generators/clone_with_stack.phpt
 --TEST--
 A generator with an active stack can be cloned
 --FILE--
 <?php

 function gen() {
    var_dump(str_repeat("x", yield));
 }

 $g1 = gen();
 $g1->rewind();
 $g2 = clone $g1;
 unset($g1);
 $g2->send(10);

 ?>
 --EXPECT--
 string(10) "xxxxxxxxxx"
diff --git a/Zend/tests/generators/clone_with_symbol_table.phpt b/Zend/tests/generators/clone_with_symbol_table.phpt
 --TEST--
 A generator using a symbol table can be cloned
 --FILE--
 <?php

 function gen() {
    // force compiled variable for $foo
    $foo = 'foo';

    // force symbol table
    extract(['foo' => 'bar']);

    // interrupt
    yield;

    var_dump($foo);
 }

 $g1 = gen();
 $g1->rewind();
 $g2 = clone $g1;
 unset($g1);
 $g2->next();

 ?>
 --EXPECT--
 string(3) "bar"
diff --git a/Zend/tests/generators/clone_with_this.phpt b/Zend/tests/generators/clone_with_this.phpt
 --TEST--
 Cloning a generator method (with $this)
 --FILE--
 <?php

 class Test {
    protected $foo;

    public function gen() {
        $this->foo = 'bar';
        yield; // interrupt
        var_dump($this->foo);
    }
 }

 $g1 = (new Test)->gen();
 $g1->rewind(); // goto yield
 $g2 = clone $g1;
 unset($g1);
 $g2->next();

 ?>
 --EXPECT--
 string(3) "bar"
diff --git a/Zend/tests/generators/dynamic_call.phpt b/Zend/tests/generators/dynamic_call.phpt
 --TEST--
 It's possible to invoke a generator dynamically
 --FILE--
 <?php

 function gen($foo, $bar) {
    yield $foo;
    yield $bar;
 }

 $gen = call_user_func('gen', 'bar', 'foo');
 foreach ($gen as $value) {
    var_dump($value);
 }

 ?>
 --EXPECT--
 string(3) "bar"
 string(3) "foo"
diff --git a/Zend/tests/generators/errors/generator_cannot_return_before_yield_error.phpt b/Zend/tests/generators/errors/generator_cannot_return_before_yield_error.phpt
 --TEST--
 Generators cannot return values (even before yield)
 --FILE--
 <?php

 function gen() {
    return $foo;
    yield;
 }

 ?>
 --EXPECTF--
 Fatal error: Generators cannot return values using "return" in %s on line 4
diff --git a/Zend/tests/generators/errors/generator_cannot_return_error.phpt b/Zend/tests/generators/errors/generator_cannot_return_error.phpt
 --TEST--
 Generators cannot return values
 --FILE--
 <?php

 function gen() {
    yield;
 return $abc;
 }

 ?>
 --EXPECTF--
 Fatal error: Generators cannot return values using "return" in %s on line 5
diff --git a/Zend/tests/generators/errors/generator_extend_error.phpt b/Zend/tests/generators/errors/generator_extend_error.phpt
 --TEST--
 The Generator class cannot be extended
 --FILE--
 <?php

 class ExtendedGenerator extends Generator { }

 ?>
 --EXPECTF--
 Fatal error: Class ExtendedGenerator may not inherit from final class (Generator) in %s on line %d
diff --git a/Zend/tests/generators/errors/generator_instantiate_error.phpt b/Zend/tests/generators/errors/generator_instantiate_error.phpt
 --TEST--
 It's not possible to directly instantiate the Generator class
 --FILE--
 <?php

 new Generator;

 ?>
 --EXPECTF--
 Catchable fatal error: The "Generator" class is reserved for internal use and cannot be manually instantiated in %s on line %d
diff --git a/Zend/tests/generators/errors/non_ref_generator_iterated_by_ref_error.phpt b/Zend/tests/generators/errors/non_ref_generator_iterated_by_ref_error.phpt
 --TEST--
 Non-ref generators cannot be iterated by-ref
 --FILE--
 <?php

 function gen() { yield; }

 $gen = gen();
 foreach ($gen as &$value) { }

 ?>
 --EXPECTF--
 Fatal error: Uncaught exception 'Exception' with message 'You can only iterate a generator by-reference if it declared that it yields by-reference' in %s:%d
 Stack trace:
 #0 %s(%d): unknown()
 #1 {main}
  thrown in %s on line %d

diff --git a/Zend/tests/generators/errors/resume_running_generator_error.phpt b/Zend/tests/generators/errors/resume_running_generator_error.phpt
 --TEST--
 It is not possible to resume an already running generator
 --FILE--
 <?php

 function gen() {
    $gen = yield;
    $gen->next();
 }

 $gen = gen();
 $gen->send($gen);
 $gen->next();

 ?>
 --EXPECTF--
 Fatal error: Cannot resume an already running generator in %s on line %d
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,7 +17,8 @@ libZend_la_SOURCES=\
		zend_objects_API.c zend_ts_hash.c zend_stream.c \
		zend_default_classes.c \
		zend_iterators.c zend_interfaces.c zend_exceptions.c \
		zend_strtod.c zend_closures.c zend_float.c zend_string.c zend_signal.c
		zend_strtod.c zend_closures.c zend_float.c zend_string.c zend_signal.c \
		zend_generators.c

		libZend_la_LDFLAGS =
		libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,18 @@
		--TEST--
		Temporary array expressions can be iterated by reference
		--FILE--
		<?php

		$a = 'a';
		$b = 'b';

		foreach ([&$a, &$b] as &$value) {
		$value .= '-foo';
		}

		var_dump($a, $b);

		?>
		--EXPECT--
		string(5) "a-foo"
		string(5) "b-foo"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,22 @@
		--TEST--
		Generator keys are auto-incrementing by default
		--FILE--
		<?php

		function gen() {
		yield 'foo';
		yield 'bar';
		yield 5 => 'rab';
		yield 'oof';
		}

		foreach (gen() as $k => $v) {
		echo $k, ' => ', $v, "\n";
		}

		?>
		--EXPECT--
		0 => foo
		1 => bar
		5 => rab
		6 => oof
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,27 @@
		--TEST--
		Printing the stack trace in a generator
		--FILE--
		<?php

		function f1() {
		debug_print_backtrace();
		}

		function f2($arg1, $arg2) {
		f1();
		yield; // force generator
		}

		function f3($gen) {
		$gen->rewind(); // trigger run
		}

		$gen = f2('foo', 'bar');
		f3($gen);

		?>
		--EXPECTF--
		#0 f1() called at [%s:%d]
		#1 f2(foo, bar)
		#2 Generator->rewind() called at [%s:%d]
		#3 f3(Generator Object ()) called at [%s:%d]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,32 @@
		--TEST--
		Generators can be cloned
		--FILE--
		<?php

		function firstN($end) {
		for ($i = 0; $i < $end; ++$i) {
		yield $i;
		}
		}

		$g1 = firstN(5);
		var_dump($g1->current());
		$g1->next();

		$g2 = clone $g1;
		var_dump($g2->current());
		$g2->next();

		var_dump($g2->current());
		var_dump($g1->current());

		$g1->next();
		var_dump($g1->current());

		?>
		--EXPECT--
		int(0)
		int(1)
		int(2)
		int(1)
		int(2)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,33 @@
		--TEST--
		Cloning a generator with a foreach loop properly adds a ref for the loop var
		--FILE--
		<?php

		function gen() {
		foreach ([1, 2, 3] as $i) {
		yield $i;
		}
		}

		$g1 = gen();
		var_dump($g1->current());

		$g2 = clone $g1;
		var_dump($g2->current());

		$g1->next();
		$g2->next();
		var_dump($g1->current());
		var_dump($g2->current());

		unset($g1);
		$g2->next();
		var_dump($g2->current());

		?>
		--EXPECT--
		int(1)
		int(1)
		int(2)
		int(2)
		int(3)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,18 @@
		--TEST--
		A generator with an active stack can be cloned
		--FILE--
		<?php

		function gen() {
		var_dump(str_repeat("x", yield));
		}

		$g1 = gen();
		$g1->rewind();
		$g2 = clone $g1;
		unset($g1);
		$g2->send(10);

		?>
		--EXPECT--
		string(10) "xxxxxxxxxx"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,27 @@
		--TEST--
		A generator using a symbol table can be cloned
		--FILE--
		<?php

		function gen() {
		// force compiled variable for $foo
		$foo = 'foo';

		// force symbol table
		extract(['foo' => 'bar']);

		// interrupt
		yield;

		var_dump($foo);
		}

		$g1 = gen();
		$g1->rewind();
		$g2 = clone $g1;
		unset($g1);
		$g2->next();

		?>
		--EXPECT--
		string(3) "bar"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,24 @@
		--TEST--
		Cloning a generator method (with $this)
		--FILE--
		<?php

		class Test {
		protected $foo;

		public function gen() {
		$this->foo = 'bar';
		yield; // interrupt
		var_dump($this->foo);
		}
		}

		$g1 = (new Test)->gen();
		$g1->rewind(); // goto yield
		$g2 = clone $g1;
		unset($g1);
		$g2->next();

		?>
		--EXPECT--
		string(3) "bar"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,19 @@
		--TEST--
		It's possible to invoke a generator dynamically
		--FILE--
		<?php

		function gen($foo, $bar) {
		yield $foo;
		yield $bar;
		}

		$gen = call_user_func('gen', 'bar', 'foo');
		foreach ($gen as $value) {
		var_dump($value);
		}

		?>
		--EXPECT--
		string(3) "bar"
		string(3) "foo"