Skip to content

Commit dc6f073

Browse files
committed
fix tests
1 parent 0c6d903 commit dc6f073

File tree

4 files changed

+32
-4
lines changed

4 files changed

+32
-4
lines changed

Zend/tests/bug52041.phpt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,30 @@ Notice: Undefined variable: x in %sbug52041.php on line 3
3535

3636
Warning: Creating default object from empty value in %sbug52041.php on line 8
3737

38+
Notice: Undefined property: a in %sbug52041.php on line 8
39+
3840
Notice: Undefined variable: x in %sbug52041.php on line 3
3941

42+
Notice: Undefined property: a in %sbug52041.php on line 9
43+
4044
Warning: Creating default object from empty value in %sbug52041.php on line 9
4145

46+
Notice: Undefined property: b in %sbug52041.php on line 9
47+
4248
Notice: Undefined variable: x in %sbug52041.php on line 3
4349

4450
Warning: Creating default object from empty value in %sbug52041.php on line 10
4551

52+
Notice: Undefined property: a in %sbug52041.php on line 10
53+
4654
Notice: Undefined variable: x in %sbug52041.php on line 3
4755

56+
Notice: Undefined property: a in %sbug52041.php on line 11
57+
4858
Warning: Creating default object from empty value in %sbug52041.php on line 11
4959

60+
Notice: Undefined property: b in %sbug52041.php on line 11
61+
5062
Notice: Undefined variable: x in %sbug52041.php on line 3
5163

5264
Notice: Undefined variable: x in %sbug52041.php on line 3

Zend/tests/bug60536_001.phpt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,25 @@ Bug #60536 (Traits Segfault)
33
--FILE--
44
<?php
55
trait T { private $x = 0; }
6-
class X {
6+
class X {
77
use T;
88
}
99
class Y extends X {
1010
use T;
1111
function x() {
12-
return ++$this->x;
12+
return ++$this->x;
1313
}
1414
}
1515
class Z extends Y {
1616
function z() {
17-
return ++$this->x;
17+
return ++$this->x;
1818
}
1919
}
2020
$a = new Z();
2121
$a->x();
2222
echo "DONE";
2323
?>
2424
--EXPECTF--
25+
26+
Notice: Undefined property: x in %s on line 14
2527
DONE

Zend/tests/bug62005.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ function add_points($player, $points) {
99
add_points(NULL, 2);
1010
--EXPECTF--
1111
Warning: Creating default object from empty value in %sbug62005.php on line %d
12+
13+
Notice: Undefined property: energy in %sbug62005.php on line 3
1214
stdClass Object
1315
(
1416
[energy] => 2

tests/classes/implicit_instantiation_001.phpt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ foreach($c as $name => $value) {
2020
echo "\n --> Attempting implicit conversion to object using increment...\n";
2121
$c->$name->prop++;
2222
$c->$name = $value; // reset value in case implicit conversion was successful
23-
23+
2424
echo "\n --> Attempting implicit conversion to object using assignment...\n";
2525
$c->$name->prop = "Implicit instantiation!";
2626
$c->$name = $value; // reset value in case implicit conversion was successful
@@ -41,6 +41,8 @@ var_dump($c);
4141

4242
Warning: Creating default object from empty value in %s on line 18
4343

44+
Notice: Undefined property: prop in %s on line 18
45+
4446
--> Attempting implicit conversion to object using assignment...
4547

4648
Warning: Creating default object from empty value in %s on line 22
@@ -49,12 +51,16 @@ Warning: Creating default object from empty value in %s on line 22
4951

5052
Warning: Creating default object from empty value in %s on line 26
5153

54+
Notice: Undefined property: prop in %s on line 26
55+
5256

5357
---( $c->emptyString )---
5458
--> Attempting implicit conversion to object using increment...
5559

5660
Warning: Creating default object from empty value in %s on line 18
5761

62+
Notice: Undefined property: prop in %s on line 18
63+
5864
--> Attempting implicit conversion to object using assignment...
5965

6066
Warning: Creating default object from empty value in %s on line 22
@@ -63,12 +69,16 @@ Warning: Creating default object from empty value in %s on line 22
6369

6470
Warning: Creating default object from empty value in %s on line 26
6571

72+
Notice: Undefined property: prop in %s on line 26
73+
6674

6775
---( $c->null )---
6876
--> Attempting implicit conversion to object using increment...
6977

7078
Warning: Creating default object from empty value in %s on line 18
7179

80+
Notice: Undefined property: prop in %s on line 18
81+
7282
--> Attempting implicit conversion to object using assignment...
7383

7484
Warning: Creating default object from empty value in %s on line 22
@@ -77,6 +87,8 @@ Warning: Creating default object from empty value in %s on line 22
7787

7888
Warning: Creating default object from empty value in %s on line 26
7989

90+
Notice: Undefined property: prop in %s on line 26
91+
8092

8193
---( $c->boolTrue )---
8294
--> Attempting implicit conversion to object using increment...

0 commit comments

Comments
 (0)