Migrate to clone function

Author: TimWolla

Zend/tests/assert/expect_015.phpt

@@ -183,7 +183,7 @@ assert(0 && ($a = function () {
     $x = $a ?? $b;
     [$a, $b, $c] = [1, 2 => 'x', 'z' => 'c'];
     @foo();
-    $y = clone $x;
+    $y = \clone($x);
     yield 1 => 2;
     yield from $x;
 }))

Zend/tests/clone/ast.phpt

@@ -42,8 +42,8 @@ try {
 
 ?>
 --EXPECT--
-assert(false && ($y = clone($x)))
-assert(false && ($y = clone($x)))
-assert(false && ($y = clone($x, foo: $foo, bar: $bar)))
-assert(false && ($y = clone($x, ...$array)))
-assert(false && ($y = clone($x, ...['foo' => $foo, 'bar' => $bar])))
+assert(false && ($y = \clone($x)))
+assert(false && ($y = \clone($x)))
+assert(false && ($y = \clone($x, foo: $foo, bar: $bar)))
+assert(false && ($y = \clone($x, ...$array)))
+assert(false && ($y = \clone($x, ...['foo' => $foo, 'bar' => $bar])))

Zend/tests/clone/bug36071.phpt

@@ -8,7 +8,8 @@ $a = clone 0;
 $a[0]->b = 0;
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: __clone method called on non-object in %sbug36071.php:2
+Fatal error: Uncaught TypeError: clone(): Argument #1 ($object) must be of type object, int given in %s:%d
 Stack trace:
-#0 {main}
+#0 %s(%d): clone(0)
+#1 {main}
   thrown in %sbug36071.php on line 2

Zend/tests/clone/bug42817.phpt

@@ -6,7 +6,8 @@ $a = clone(null);
 array_push($a->b, $c);
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: __clone method called on non-object in %sbug42817.php:2
+Fatal error: Uncaught TypeError: clone(): Argument #1 ($object) must be of type object, null given in %s:%d
 Stack trace:
-#0 {main}
+#0 %s(%d): clone(NULL)
+#1 {main}
   thrown in %sbug42817.php on line 2

Zend/tests/clone/bug42818.phpt

@@ -5,7 +5,8 @@ Bug #42818 ($foo = clone(array()); leaks memory)
 $foo = clone(array());
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: __clone method called on non-object in %sbug42818.php:2
+Fatal error: Uncaught TypeError: clone(): Argument #1 ($object) must be of type object, array given in %s:%d
 Stack trace:
-#0 {main}
+#0 %s(%d): clone(Array)
+#1 {main}
   thrown in %sbug42818.php on line 2

Zend/tests/clone/callback.phpt

@@ -0,0 +1,24 @@
+--TEST--
+As Callback
+--FILE--
+<?php
+
+class Foo {
+	private function __clone() {
+		
+	}
+
+	public function clone_me() {
+		return array_map(clone(...), [$this]);
+	}
+}
+
+$f = new Foo();
+
+$clone = $f->clone_me()[0];
+
+var_dump($f !== $clone);
+
+?>
+--EXPECT--
+bool(true)

Zend/tests/clone/clone_001.phpt

@@ -7,7 +7,8 @@ $a = clone array();
 
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: __clone method called on non-object in %s:%d
+Fatal error: Uncaught TypeError: clone(): Argument #1 ($object) must be of type object, array given in %s:%d
 Stack trace:
-#0 {main}
+#0 %s(%d): clone(Array)
+#1 {main}
   thrown in %s on line %d

Zend/tests/clone/clone_003.phpt

@@ -9,7 +9,8 @@ $a = clone $b;
 --EXPECTF--
 Warning: Undefined variable $b in %s on line %d
 
-Fatal error: Uncaught Error: __clone method called on non-object in %s:%d
+Fatal error: Uncaught TypeError: clone(): Argument #1 ($object) must be of type object, null given in %s:%d
 Stack trace:
-#0 {main}
+#0 %s(%d): clone(NULL)
+#1 {main}
   thrown in %s on line %d

Zend/tests/clone/clone_with_001.phpt

@@ -14,6 +14,10 @@ $array = [
 	'array' => [1, 2, 3],
 ];
 
+function gen() {
+	yield 'from_gen' => 'value';
+}
+
 var_dump(clone $x);
 var_dump(clone($x));
 var_dump(clone($x, foo: $foo, bar: $bar));
@@ -27,6 +31,8 @@ var_dump(clone($x, ...[
 	'named' => 'value',
 ]));
 
+var_dump(clone($x, ...gen()));
+
 ?>
 --EXPECTF--
 object(stdClass)#%d (0) {
@@ -69,3 +75,7 @@ object(stdClass)#%d (4) {
   ["named"]=>
   string(5) "value"
 }
+object(stdClass)#%d (1) {
+  ["from_gen"]=>
+  string(5) "value"
+}

Zend/tests/clone/clone_with_006.phpt

@@ -13,4 +13,4 @@ try {
 
 ?>
 --EXPECT--
-TypeError: Only arrays can be unpacked for clone, int given
+TypeError: Only arrays and Traversables can be unpacked, int given

Zend/tests/magic_methods/bug73288.phpt

@@ -28,7 +28,8 @@ test_clone();
 --EXPECTF--
 Fatal error: Uncaught Exception: No Cloneable in %sbug73288.php:%d
 Stack trace:
-#0 %s(%d): NoClone->__clone()
-#1 %s(%d): test_clone()
-#2 {main}
+#0 [internal function]: NoClone->__clone()
+#1 %s(%d): clone(Object(NoClone))
+#2 %s(%d): test_clone()
+#3 {main}
   thrown in %sbug73288.php on line %d

Zend/zend_language_parser.y

@@ -46,7 +46,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 %define api.pure full
 %define api.value.type {zend_parser_stack_elem}
 %define parse.error verbose
-%expect 0
+%expect 1
 
 %destructor { zend_ast_destroy($$); } <ast>
 %destructor { if ($$) zend_string_release_ex($$, 0); } <str>
@@ -1214,8 +1214,16 @@ expr:
 			{ $$ = zend_ast_create(ZEND_AST_ASSIGN, $1, $3); }
 	|	variable '=' ampersand variable
 			{ $$ = zend_ast_create(ZEND_AST_ASSIGN_REF, $1, $4); }
-	|	T_CLONE '(' expr ',' non_empty_argument_list ')' { $$ = zend_ast_create(ZEND_AST_CLONE, $3, $5); }
-	|	T_CLONE expr { $$ = zend_ast_create(ZEND_AST_CLONE, $2, NULL); }
+	|	T_CLONE argument_list {
+			zend_ast *name = zend_ast_create_zval_from_str(ZSTR_KNOWN(ZEND_STR_CLONE));
+			name->attr = ZEND_NAME_FQ;
+			$$ = zend_ast_create(ZEND_AST_CALL, name, $2);
+		}
+	|	T_CLONE expr {
+			zend_ast *name = zend_ast_create_zval_from_str(ZSTR_KNOWN(ZEND_STR_CLONE));
+			name->attr = ZEND_NAME_FQ;
+			$$ = zend_ast_create(ZEND_AST_CALL, name, zend_ast_create_list(1, ZEND_AST_ARG_LIST, $2));
+		}
 	|	variable T_PLUS_EQUAL expr
 			{ $$ = zend_ast_create_assign_op(ZEND_ADD, $1, $3); }
 	|	variable T_MINUS_EQUAL expr