Skip to content

Commit 8549de3

Browse files
NickSdotNickSdot
committed
Zend: applied fixers to improve test robustness (part 6/8)
1 parent 98a259e commit 8549de3

87 files changed

Lines changed: 425 additions & 425 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Zend/tests/readonly_props/readonly_clone_error6.phpt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ var_dump($foo);
2222
try {
2323
$foo->__clone();
2424
} catch (Error $e) {
25-
echo $e->getMessage() . "\n";
25+
echo $e::class, ': ', $e->getMessage(), "\n";
2626
}
2727

2828
try {
2929
$foo->__clone();
3030
} catch (Error $e) {
31-
echo $e->getMessage() . "\n";
31+
echo $e::class, ': ', $e->getMessage(), "\n";
3232
}
3333

3434
var_dump($foo);
@@ -39,8 +39,8 @@ object(Foo)#%d (%d) {
3939
["bar"]=>
4040
int(0)
4141
}
42-
Cannot modify readonly property Foo::$bar
43-
Cannot modify readonly property Foo::$bar
42+
Error: Cannot modify readonly property Foo::$bar
43+
Error: Cannot modify readonly property Foo::$bar
4444
object(Foo)#%d (%d) {
4545
["bar"]=>
4646
int(0)

‎Zend/tests/readonly_props/readonly_clone_error7.phpt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ $foo = new Foo([]);
1919
try {
2020
var_dump(clone $foo);
2121
} catch (Error $e) {
22-
echo $e->getMessage(), "\n";
22+
echo $e::class, ': ', $e->getMessage(), "\n";
2323
}
2424
try {
2525
var_dump(clone $foo);
2626
} catch (Error $e) {
27-
echo $e->getMessage(), "\n";
27+
echo $e::class, ': ', $e->getMessage(), "\n";
2828
}
2929

3030
?>
3131
--EXPECT--
32-
Cannot indirectly modify readonly property Foo::$bar
33-
Cannot indirectly modify readonly property Foo::$bar
32+
Error: Cannot indirectly modify readonly property Foo::$bar
33+
Error: Cannot indirectly modify readonly property Foo::$bar

‎Zend/tests/readonly_props/readonly_clone_success4.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class Foo {
1313
try {
1414
$this->bar = "foo";
1515
} catch (Error $e) {
16-
echo $e->getMessage() . "\n";
16+
echo $e::class, ': ', $e->getMessage(), "\n";
1717
}
1818

1919
$this->bar = 2;
@@ -27,12 +27,12 @@ var_dump(clone $foo);
2727

2828
?>
2929
--EXPECTF--
30-
Cannot assign string to property Foo::$bar of type int
30+
TypeError: Cannot assign string to property Foo::$bar of type int
3131
object(Foo)#%d (%d) {
3232
["bar"]=>
3333
int(2)
3434
}
35-
Cannot assign string to property Foo::$bar of type int
35+
TypeError: Cannot assign string to property Foo::$bar of type int
3636
object(Foo)#%d (%d) {
3737
["bar"]=>
3838
int(2)

‎Zend/tests/readonly_props/readonly_coercion_type_error.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class Foo {
1111
try {
1212
$this->bar = 42;
1313
} catch (Error $e) {
14-
echo $e->getMessage(), "\n";
14+
echo $e::class, ': ', $e->getMessage(), "\n";
1515
}
1616
}
1717
}
@@ -20,4 +20,4 @@ new Foo();
2020

2121
?>
2222
--EXPECTF--
23-
Cannot modify readonly property Foo::$bar
23+
Error: Cannot modify readonly property Foo::$bar

‎Zend/tests/readonly_props/readonly_containing_object.phpt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ $test->prop->foo++;
1818
try {
1919
$test->prop += 1;
2020
} catch (Error $e) {
21-
echo $e->getMessage(), "\n";
21+
echo $e::class, ': ', $e->getMessage(), "\n";
2222
}
2323
try {
2424
$test->prop++;
2525
} catch (Error $e) {
26-
echo $e->getMessage(), "\n";
26+
echo $e::class, ': ', $e->getMessage(), "\n";
2727
}
2828
try {
2929
--$test->prop;
3030
} catch (Error $e) {
31-
echo $e->getMessage(), "\n";
31+
echo $e::class, ': ', $e->getMessage(), "\n";
3232
}
3333
var_dump($test->prop);
3434

@@ -44,9 +44,9 @@ var_dump($test->prop);
4444

4545
?>
4646
--EXPECT--
47-
Unsupported operand types: stdClass + int
48-
Cannot modify readonly property Test::$prop
49-
Cannot modify readonly property Test::$prop
47+
TypeError: Unsupported operand types: stdClass + int
48+
Error: Cannot modify readonly property Test::$prop
49+
Error: Cannot modify readonly property Test::$prop
5050
object(stdClass)#2 (1) {
5151
["foo"]=>
5252
int(3)

‎Zend/tests/readonly_props/readonly_modification.phpt‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,62 +21,62 @@ var_dump($test->prop); // Read.
2121
try {
2222
$test->prop = 2;
2323
} catch (Error $e) {
24-
echo $e->getMessage(), "\n";
24+
echo $e::class, ': ', $e->getMessage(), "\n";
2525
}
2626
try {
2727
$test->prop += 1;
2828
} catch (Error $e) {
29-
echo $e->getMessage(), "\n";
29+
echo $e::class, ': ', $e->getMessage(), "\n";
3030
}
3131
try {
3232
$test->prop++;
3333
} catch (Error $e) {
34-
echo $e->getMessage(), "\n";
34+
echo $e::class, ': ', $e->getMessage(), "\n";
3535
}
3636
try {
3737
++$test->prop;
3838
} catch (Error $e) {
39-
echo $e->getMessage(), "\n";
39+
echo $e::class, ': ', $e->getMessage(), "\n";
4040
}
4141
try {
4242
$ref =& $test->prop;
4343
} catch (Error $e) {
44-
echo $e->getMessage(), "\n";
44+
echo $e::class, ': ', $e->getMessage(), "\n";
4545
}
4646
try {
4747
$test->prop =& $ref;
4848
} catch (Error $e) {
49-
echo $e->getMessage(), "\n";
49+
echo $e::class, ': ', $e->getMessage(), "\n";
5050
}
5151
try {
5252
byRef($test->prop);
5353
} catch (Error $e) {
54-
echo $e->getMessage(), "\n";
54+
echo $e::class, ': ', $e->getMessage(), "\n";
5555
}
5656

5757
var_dump($test->prop2); // Read.
5858
try {
5959
$test->prop2[] = 1;
6060
} catch (Error $e) {
61-
echo $e->getMessage(), "\n";
61+
echo $e::class, ': ', $e->getMessage(), "\n";
6262
}
6363
try {
6464
$test->prop2[0][] = 1;
6565
} catch (Error $e) {
66-
echo $e->getMessage(), "\n";
66+
echo $e::class, ': ', $e->getMessage(), "\n";
6767
}
6868

6969
?>
7070
--EXPECT--
7171
int(1)
72-
Cannot modify readonly property Test::$prop
73-
Cannot modify readonly property Test::$prop
74-
Cannot modify readonly property Test::$prop
75-
Cannot modify readonly property Test::$prop
76-
Cannot indirectly modify readonly property Test::$prop
77-
Cannot indirectly modify readonly property Test::$prop
78-
Cannot indirectly modify readonly property Test::$prop
72+
Error: Cannot modify readonly property Test::$prop
73+
Error: Cannot modify readonly property Test::$prop
74+
Error: Cannot modify readonly property Test::$prop
75+
Error: Cannot modify readonly property Test::$prop
76+
Error: Cannot indirectly modify readonly property Test::$prop
77+
Error: Cannot indirectly modify readonly property Test::$prop
78+
Error: Cannot indirectly modify readonly property Test::$prop
7979
array(0) {
8080
}
81-
Cannot indirectly modify readonly property Test::$prop2
82-
Cannot indirectly modify readonly property Test::$prop2
81+
Error: Cannot indirectly modify readonly property Test::$prop2
82+
Error: Cannot indirectly modify readonly property Test::$prop2

‎Zend/tests/readonly_props/unset.phpt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $test = new Test(1);
1515
try {
1616
unset($test->prop);
1717
} catch (Error $e) {
18-
echo $e->getMessage(), "\n";
18+
echo $e::class, ': ', $e->getMessage(), "\n";
1919
}
2020

2121
class Test2 {
@@ -40,7 +40,7 @@ var_dump($test->prop); // Don't call __get.
4040
try {
4141
unset($test->prop); // Unset initialized, illegal.
4242
} catch (Error $e) {
43-
echo $e->getMessage(), "\n";
43+
echo $e::class, ': ', $e->getMessage(), "\n";
4444
}
4545

4646
class Test3 {
@@ -51,7 +51,7 @@ $test = new Test3;
5151
try {
5252
unset($test->prop);
5353
} catch (Error $e) {
54-
echo $e->getMessage(), "\n";
54+
echo $e::class, ': ', $e->getMessage(), "\n";
5555
}
5656

5757
class Test4 {
@@ -81,12 +81,12 @@ var_dump($test->prop); // Still don't call __get.
8181

8282
?>
8383
--EXPECT--
84-
Cannot unset readonly property Test::$prop
84+
Error: Cannot unset readonly property Test::$prop
8585
Test2::__get
8686
int(1)
8787
int(1)
88-
Cannot unset readonly property Test2::$prop
89-
Cannot unset protected(set) readonly property Test3::$prop from global scope
88+
Error: Cannot unset readonly property Test2::$prop
89+
Error: Cannot unset protected(set) readonly property Test3::$prop from global scope
9090
Error: Cannot unset readonly property Test4::$prop
9191
int(1)
9292
Error: Cannot unset readonly property Test4::$prop

‎Zend/tests/readonly_props/visibility_change.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ $a = new A();
1818
try {
1919
var_dump($a->prop);
2020
} catch (Error $error) {
21-
echo $error->getMessage() . "\n";
21+
echo $error::class, ': ', $error->getMessage(), "\n";
2222
}
2323

2424
$b = new B();
2525
var_dump($b->prop);
2626

2727
?>
2828
--EXPECT--
29-
Cannot access protected property A::$prop
29+
Error: Cannot access protected property A::$prop
3030
int(42)

‎Zend/tests/recursive_array_comparison.phpt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ $a = [&$a];
66
try {
77
$a === [[]];
88
} catch (Error $e) {
9-
echo $e->getMessage(), "\n";
9+
echo $e::class, ': ', $e->getMessage(), "\n";
1010
}
1111
try {
1212
[[]] === $a;
1313
} catch (Error $e) {
14-
echo $e->getMessage(), "\n";
14+
echo $e::class, ': ', $e->getMessage(), "\n";
1515
}
1616
var_dump($a === $a);
1717
?>
1818
--EXPECT--
19-
Nesting level too deep - recursive dependency?
20-
Nesting level too deep - recursive dependency?
19+
Error: Nesting level too deep - recursive dependency?
20+
Error: Nesting level too deep - recursive dependency?
2121
bool(true)

‎Zend/tests/recv_init_ref_type.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ try {
1010
$bar = 42;
1111
test($bar);
1212
} catch (TypeError $e) {
13-
echo $e->getMessage(), "\n";
13+
echo $e::class, ': ', $e->getMessage(), "\n";
1414
}
1515

1616
?>
1717
--EXPECTF--
18-
test(): Argument #1 ($foo) must be of type array, int given, called in %s on line %d
18+
TypeError: test(): Argument #1 ($foo) must be of type array, int given, called in %s on line %d

0 commit comments

Comments
 (0)