Update the syntax of clone with

Author: kocsismate

Zend/tests/clone_initializer/clone_initializer_error1.phpt

@@ -13,4 +13,4 @@ class Foo
 
 ?>
 --EXPECTF--
-Parse error: syntax error, unexpected token ";", expecting "{" in %s on line %d
+Parse error: syntax error, unexpected token ";", expecting "[" in %s on line %d

Zend/tests/clone_initializer/clone_initializer_error10.phpt

@@ -15,13 +15,13 @@ class Foo
 $foo1 = new Foo(0);
 
 try {
-    $foo2 = clone $foo1 with {bar: 1};
+    $foo2 = clone $foo1 with ["bar" => 1];
 } catch (Error $exception) {
     echo $exception->getMessage() . "\n";
 }
 
 try {
-    $foo2 = clone $foo1 with {baz: 1};
+    $foo2 = clone $foo1 with ["baz" => 1];
 } catch (Error $exception) {
     echo $exception->getMessage() . "\n";
 }

Zend/tests/clone_initializer/clone_initializer_error11.phpt

@@ -16,10 +16,10 @@ class Foo
 
     public function with()
     {
-        return clone $this with {
+        return clone $this with [
             "bar" => 1,
             "bar" => 2,
-        };
+        ];
     }
 }
 

Zend/tests/clone_initializer/clone_initializer_error2.phpt

@@ -7,7 +7,7 @@ class Foo
 {
     public function withProperties()
     {
-        return clone $this with {1: "value"};
+        return clone $this with [1: "value"];
     }
 }
 

Zend/tests/clone_initializer/clone_initializer_error3.phpt

@@ -11,7 +11,7 @@ class Foo
 $foo = new Foo();
 
 try {
-    $foo = clone $foo with {bar: 1};
+    $foo = clone $foo with ["bar" => 1];
 } catch (Error $exception) {
     echo $exception->getMessage() . "\n";
 }

Zend/tests/clone_initializer/clone_initializer_error4.phpt

@@ -11,10 +11,10 @@ class Foo
 
     public function with()
     {
-        return clone $this with {
-            bar: 1,
-            bar: 2,
-        };
+        return clone $this with [
+            "bar" => 1,
+            "bar" => 2,
+        ];
     }
 }
 

Zend/tests/clone_initializer/clone_initializer_error5.phpt

@@ -11,13 +11,13 @@ class Foo
 $obj1 = new Foo();
 
 try {
-    clone $obj1 with {bar: []};
+    clone $obj1 with ["bar" => []];
 } catch (TypeError $e) {
     echo $e->getMessage() . "\n";
 }
 
 try {
-    clone $obj1 with {bar: []}; // The same as above but now using cache slots
+    clone $obj1 with ["bar" => []]; // The same as above but now using cache slots
 } catch (TypeError $e) {
     echo $e->getMessage() . "\n";
 }

Zend/tests/clone_initializer/clone_initializer_error6.phpt

@@ -17,13 +17,13 @@ function returnFoo() {
 }
 
 try {
-    clone returnFoo() with {bar: new stdClass()};
+    clone returnFoo() with ["bar" => new stdClass()];
 } catch (Exception $e) {
     echo $e->getMessage() . "\n";
 }
 
 try {
-    clone returnFoo() with {bar: new stdClass()}; // The same as above but now using cache slots
+    clone returnFoo() with ["bar" => new stdClass()]; // The same as above but now using cache slots
 } catch (Exception $e) {
     echo $e->getMessage() . "\n";
 }

Zend/tests/clone_initializer/clone_initializer_error7.phpt

@@ -16,13 +16,13 @@ function returnFoo() {
 }
 
 try {
-    clone returnFoo() with {bar: new stdClass()};
+    clone returnFoo() with ["bar" => new stdClass()];
 } catch (Exception $e) {
     echo $e->getMessage() . "\n";
 }
 
 try {
-    clone returnFoo() with {bar: new stdClass()}; // The same as above but now using cache slots
+    clone returnFoo() with ["bar" => new stdClass()]; // The same as above but now using cache slots
 } catch (Exception $e) {
     echo $e->getMessage() . "\n";
 }

Zend/tests/clone_initializer/clone_initializer_error8.phpt

@@ -4,49 +4,49 @@ Test "clone with" with invalid property names
 <?php
 
 try {
-    clone new stdClass() with {$undefined => 1};
+    clone new stdClass() with [$undefined => 1];
 } catch (TypeError $e) {
     echo $e->getMessage() . "\n";
 }
 
 try {
-    clone new stdClass() with {$undefined => 1}; // The same as above but now using cache slots
+    clone new stdClass() with [$undefined => 1]; // The same as above but now using cache slots
 } catch (TypeError $e) {
     echo $e->getMessage() . "\n";
 }
 
 try {
-    clone new stdClass() with {null => 1};
+    clone new stdClass() with [null => 1];
 } catch (TypeError $e) {
     echo $e->getMessage() . "\n";
 }
 
 try {
-    clone new stdClass() with {null => 1}; // The same as above but now using cache slots
+    clone new stdClass() with [null => 1]; // The same as above but now using cache slots
 } catch (TypeError $e) {
     echo $e->getMessage() . "\n";
 }
 
 try {
-    clone new stdClass() with {[] => 1};
+    clone new stdClass() with [[] => 1];
 } catch (TypeError $e) {
     echo $e->getMessage() . "\n";
 }
 
 try {
-    clone new stdClass() with {[] => 1}; // The same as above but now using cache slots
+    clone new stdClass() with [[] => 1]; // The same as above but now using cache slots
 } catch (TypeError $e) {
     echo $e->getMessage() . "\n";
 }
 
 try {
-    clone new stdClass() with {1 => 1};
+    clone new stdClass() with [1 => 1];
 } catch (TypeError $e) {
     echo $e->getMessage() . "\n";
 }
 
 try {
-    clone new stdClass() with {1 => 1}; // The same as above but now using cache slots
+    clone new stdClass() with [1 => 1]; // The same as above but now using cache slots
 } catch (TypeError $e) {
     echo $e->getMessage() . "\n";
 }

Zend/tests/clone_initializer/clone_initializer_error9.phpt

@@ -11,9 +11,9 @@ class Foo
 
     public function with()
     {
-        return clone $this with {
-            bar: 1,
-        };
+        return clone $this with [
+            "bar" => 1,
+        ];
     }
 
     public function assign()

Zend/tests/clone_initializer/clone_initializer_success1.phpt

@@ -10,10 +10,10 @@ class Foo
 
     public function withProperties($property1, $property2)
     {
-        return clone $this with {
-            property1: $property1,
-            property2: $property2,
-        };
+        return clone $this with [
+            "property1" => $property1,
+            "property2" => $property2,
+        ];
     }
 }
 

Zend/tests/clone_initializer/clone_initializer_success10.phpt

@@ -14,19 +14,19 @@ try {
 }
 
 try {
-    assert(clone new stdClass() with {} === null);
+    assert(clone new stdClass() with [] === null);
 } catch (AssertionError $e) {
     echo $e->getMessage() . "\n";
 }
 
 try {
-    assert(clone new stdClass() with {foo: 1, bar: "abc"} === null);
+    assert(clone new stdClass() with ["foo" => 1, "bar" => "abc"] === null);
 } catch (AssertionError $e) {
     echo $e->getMessage() . "\n";
 }
 
 ?>
 --EXPECT--
 assert(clone new stdClass() === null)
-assert(clone new stdClass() with {} === null)
-assert(clone new stdClass() with {foo: 1, bar: 'abc'} === null)
+assert(clone new stdClass() with [] === null)
+assert(clone new stdClass() with ['foo' => 1, 'bar' => 'abc'] === null)

Zend/tests/clone_initializer/clone_initializer_success11.phpt

@@ -11,26 +11,26 @@ class Foo
     {
         $property = "property1";
 
-        return clone $this with {$property => "value"};
+        return clone $this with [$property => "value"];
     }
 
     public function withProperty2()
     {
         $property = "string";
 
-        return clone $this with {$this->getProperty1Name() => "value"};
+        return clone $this with [$this->getProperty1Name() => "value"];
     }
 
     public function withProperty3()
     {
         $property = "property2";
 
-        return clone $this with {$property => "value"};
+        return clone $this with [$property => "value"];
     }
 
     public function withProperty4()
     {
-        return clone $this with {substr($this->getProperty1Name(), 0, 8) . "1" => "value"};
+        return clone $this with [substr($this->getProperty1Name(), 0, 8) . "1" => "value"];
     }
 
     private function getProperty1Name() {

Zend/tests/clone_initializer/clone_initializer_success12.phpt

@@ -11,11 +11,11 @@ class Foo
 
     public function with()
     {
-        return clone $this with {
-            bar: 1,
-            bar: 2,
-            bar: 3,
-        };
+        return clone $this with [
+            "bar" => 1,
+            "bar" => 2,
+            "bar" => 3,
+        ];
     }
 }
 

Zend/tests/clone_initializer/clone_initializer_success13.phpt

@@ -11,9 +11,9 @@ class Foo
 
     public function with()
     {
-        return clone $this with {
+        return clone $this with [
             "bar" => 1,
-        };
+        ];
     }
 }
 

Zend/tests/clone_initializer/clone_initializer_success14.phpt

@@ -16,9 +16,9 @@ class Foo
 
     public function with()
     {
-        return clone $this with {
+        return clone $this with [
             "bar" => 2,
-        };
+        ];
     }
 }
 

Zend/tests/clone_initializer/clone_initializer_success2.phpt

@@ -7,10 +7,10 @@ class Foo
 {
     public function withProperties($property1, $property2)
     {
-        return clone $this with {
-            property1: $property1,
-            property2: $property2,
-        };
+        return clone $this with [
+            "property1" => $property1,
+            "property2" => $property2,
+        ];
     }
 }
 

Zend/tests/clone_initializer/clone_initializer_success3.phpt

@@ -7,7 +7,7 @@ class Foo
 {
     public function withProperties()
     {
-        return clone $this with {};
+        return clone $this with [];
     }
 }
 

Zend/tests/clone_initializer/clone_initializer_success4.phpt

@@ -9,7 +9,7 @@ class Foo
 
     public function withProperties()
     {
-        return (clone $this with {})->bar;
+        return (clone $this with [])->bar;
     }
 }
 

Zend/tests/clone_initializer/clone_initializer_success5.phpt

@@ -4,8 +4,8 @@ Test that the "clone with" respects #[AllowDynamicProperties]
 <?php
 
 $obj1 = new stdClass();
-$obj2 = clone $obj1 with {foo: 1, bar: ""};
-$obj3 = clone $obj1 with {foo: 2, bar: []};
+$obj2 = clone $obj1 with ["foo" => 1, "bar" => ""];
+$obj3 = clone $obj1 with ["foo" => 2, "bar" => []];
 
 var_dump($obj1);
 var_dump($obj2);

Zend/tests/clone_initializer/clone_initializer_success6.phpt

@@ -10,8 +10,8 @@ class Foo
 }
 
 $obj1 = new Foo();
-$obj2 = clone $obj1 with {bar: new stdClass(), baz: strpos("abc", "b")};
-$obj3 = clone $obj2 with {bar: new stdClass(), baz: ["abc", "def"]}; // The same as above but now using cache slots
+$obj2 = clone $obj1 with ["bar" => new stdClass(), "baz" => strpos("abc", "b")];
+$obj3 = clone $obj2 with ["bar" => new stdClass(), "baz" => ["abc", "def"]]; // The same as above but now using cache slots
 
 var_dump($obj1);
 var_dump($obj2);

Zend/tests/clone_initializer/clone_initializer_success7.phpt

@@ -11,7 +11,7 @@ class Foo
     }
 }
 
-$foo = clone Foo::create() with {};
+$foo = clone Foo::create() with [];
 var_dump($foo);
 
 ?>

Zend/tests/clone_initializer/clone_initializer_success8.phpt

@@ -12,7 +12,7 @@ class Foo
 $foo = new Foo();
 $ref = &$foo;
 
-$bar = clone $ref with {property1: 1, property2: 2};
+$bar = clone $ref with ["property1" => 1, "property2" => 2];
 var_dump($bar);
 
 ?>

Zend/tests/clone_initializer/clone_initializer_success9.phpt

@@ -12,10 +12,10 @@ class Foo
 
     public function with(int $bar, stdClass $baz)
     {
-        return clone $this with {
-            bar: $bar,
-            baz: $baz,
-        };
+        return clone $this with [
+            "bar" => $bar,
+            "baz" => $baz,
+        ];
     }
 }