Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4

lstrojny · lstrojny · commit d371a306a24d · 2012-09-02T14:53:52.000+02:00
diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c
@@ -78,7 +78,7 @@ ZEND_METHOD(Closure, __invoke) /* {{{ */
 
 /* {{{ proto Closure Closure::bind(Closure $old, object $to [, mixed $scope = "static" ] )
    Create a closure from another one and bind to another object and scope */
-ZEND_METHOD(Closure, bind) /* {{{ */
+ZEND_METHOD(Closure, bind)
 {
 	zval *newthis, *zclosure, *scope_arg = NULL;
 	zend_closure *closure;

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ ZEND_METHOD(Closure, __invoke) /* {{{ */`
`78`	`78`
`79`	`79`	`/* {{{ proto Closure Closure::bind(Closure $old, object $to [, mixed $scope = "static" ] )`
`80`	`80`	`Create a closure from another one and bind to another object and scope */`
`81`		`-ZEND_METHOD(Closure, bind) /* {{{ */`
	`81`	`+ZEND_METHOD(Closure, bind)`
`82`	`82`	`{`
`83`	`83`	`zval newthis, zclosure, *scope_arg = NULL;`
`84`	`84`	`zend_closure *closure;`