Skip to content

Commit 9e99feb

Browse files
nikicnikic
committed
Fix tests
1 parent 61c0c46 commit 9e99feb

26 files changed

+236
-537
lines changed

‎Zend/tests/026.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ print "ok\n";
2121
Notice: Trying to get property 'a' of non-object in %s on line %d
2222
ok
2323

24-
Warning: Creating default object from empty value in %s on line %d
24+
Warning: Attempt to assign property 'a' of non-object in %s on line %d
2525
ok

‎Zend/tests/033.phpt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,10 @@ $arr[1][2][3][4][5];
77

88
echo $arr[1][2][3][4][5];
99

10-
$arr[1][2][3][4][5]->foo;
11-
12-
$arr[1][2][3][4][5]->foo = 1;
13-
1410
$arr[][] = 2;
1511

16-
$arr[][]->bar = 2;
17-
1812
?>
1913
--EXPECTF--
2014
Notice: Undefined variable: arr in %s on line %d
2115

2216
Notice: Undefined variable: arr in %s on line %d
23-
24-
Notice: Undefined variable: arr in %s on line %d
25-
26-
Notice: Trying to get property 'foo' of non-object in %s on line %d
27-
28-
Warning: Creating default object from empty value in %s on line %d
29-
30-
Warning: Creating default object from empty value in %s on line %d

‎Zend/tests/bug36303.phpt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ foreach($x->a->b as &$v) {
88
echo "ok\n";
99
?>
1010
--EXPECTF--
11-
Warning: Attempt to modify property 'a' of non-object in %sbug36303.php on line 3
11+
Notice: Trying to get property 'a' of non-object in %s on line %d
1212

13-
Warning: Invalid argument supplied for foreach() in %sbug36303.php on line 3
13+
Warning: Attempt to modify property 'b' of non-object in %s on line %d
14+
15+
Warning: Invalid argument supplied for foreach() in %s on line %d
1416
ok

‎Zend/tests/bug41075.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ try {
2727
echo "Done\n";
2828
?>
2929
--EXPECT--
30-
string(40) "Creating default object from empty value"
30+
string(31) "Undefined property: test::$blah"
3131
Done

‎Zend/tests/bug41813.phpt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,5 @@ $foo[0]->bar = "xyz";
99
echo "Done\n";
1010
?>
1111
--EXPECTF--
12-
Fatal error: Uncaught Error: Cannot use string offset as an object in %s:%d
13-
Stack trace:
14-
#0 {main}
15-
thrown in %s on line %d
12+
Warning: Attempt to assign property 'bar' of non-object in %s on line %d
13+
Done

‎Zend/tests/bug41919.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $foo[3]->bar[1] = "bang";
88
echo "ok\n";
99
?>
1010
--EXPECTF--
11-
Fatal error: Uncaught Error: Cannot use string offset as an object in %sbug41919.php:%d
12-
Stack trace:
13-
#0 {main}
14-
thrown in %sbug41919.php on line %d
11+
Notice: Uninitialized string offset: 3 in %s on line %d
12+
13+
Warning: Attempt to modify property 'bar' of non-object in %s on line %d
14+
ok

‎Zend/tests/bug47704.phpt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,4 @@ $s = "abd";
66
$s[0]->a += 1;
77
?>
88
--EXPECTF--
9-
Fatal error: Uncaught Error: Cannot use string offset as an object in %sbug47704.php:%d
10-
Stack trace:
11-
#0 {main}
12-
thrown in %sbug47704.php on line %d
9+
Warning: Attempt to assign property 'a' of non-object in %s on line %d

‎Zend/tests/bug48004.phpt

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎Zend/tests/bug52041.phpt

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,45 +25,33 @@ var_dump(foo());
2525
--EXPECTF--
2626
Notice: Undefined variable: x in %sbug52041.php on line 3
2727

28-
Warning: Creating default object from empty value in %sbug52041.php on line 6
28+
Warning: Attempt to assign property 'a' of non-object in %sbug52041.php on line 6
2929

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

32-
Warning: Creating default object from empty value in %sbug52041.php on line 7
32+
Notice: Trying to get property 'a' of non-object in %sbug52041.php on line 7
3333

34-
Warning: Creating default object from empty value in %sbug52041.php on line 7
34+
Warning: Attempt to assign property 'b' of non-object in %sbug52041.php on line 7
3535

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

38-
Warning: Creating default object from empty value in %sbug52041.php on line 8
39-
40-
Notice: Undefined property: stdClass::$a in %sbug52041.php on line 8
38+
Warning: Attempt to increment/decrement property 'a' of non-object in %sbug52041.php on line 8
4139

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

44-
Warning: Creating default object from empty value in %sbug52041.php on line 9
45-
46-
Notice: Undefined property: stdClass::$a in %sbug52041.php on line 9
47-
48-
Warning: Creating default object from empty value in %sbug52041.php on line 9
42+
Notice: Trying to get property 'a' of non-object in %sbug52041.php on line 9
4943

50-
Notice: Undefined property: stdClass::$b in %sbug52041.php on line 9
44+
Warning: Attempt to increment/decrement property 'b' of non-object in %sbug52041.php on line 9
5145

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

54-
Warning: Creating default object from empty value in %sbug52041.php on line 10
55-
56-
Notice: Undefined property: stdClass::$a in %sbug52041.php on line 10
48+
Warning: Attempt to assign property 'a' of non-object in %sbug52041.php on line 10
5749

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

60-
Warning: Creating default object from empty value in %sbug52041.php on line 11
61-
62-
Notice: Undefined property: stdClass::$a in %sbug52041.php on line 11
63-
64-
Warning: Creating default object from empty value in %sbug52041.php on line 11
52+
Notice: Trying to get property 'a' of non-object in %sbug52041.php on line 11
6553

66-
Notice: Undefined property: stdClass::$b in %sbug52041.php on line 11
54+
Warning: Attempt to assign property 'b' of non-object in %sbug52041.php on line 11
6755

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

‎Zend/tests/bug52614.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ array(0) {
7272
array(0) {
7373
}
7474

75-
Warning: Creating default object from empty value in %sbug52614.php on line 52
75+
Warning: Attempt to assign property 'a' of non-object in %s on line %d
7676
NULL
7777
object(stdClass)#%d (1) {
7878
["a"]=>

‎Zend/tests/bug54265.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@ $my_var = str_repeat("A",$my_var[0]->errormsg = "xyz");
1212
echo "ok\n";
1313
?>
1414
--EXPECT--
15-
EROOR: Creating default object from empty value
15+
EROOR: Undefined variable: my_var
16+
EROOR: Attempt to assign property 'errormsg' of non-object
1617
ok

‎Zend/tests/bug62005.phpt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,4 @@ function add_points($player, $points) {
88
}
99
add_points(NULL, 2);
1010
--EXPECTF--
11-
Warning: Creating default object from empty value in %sbug62005.php on line %d
12-
13-
Notice: Undefined property: stdClass::$energy in %sbug62005.php on line 3
14-
stdClass Object
15-
(
16-
[energy] => 2
17-
)
11+
Warning: Attempt to assign property 'energy' of non-object in %s on line %d

‎Zend/tests/bug71539_5.phpt

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,10 @@ $array[0] = 42;
88
var_dump($array);
99
?>
1010
--EXPECTF--
11-
Warning: Creating default object from empty value in %sbug71539_5.php on line 3
12-
array(2) {
11+
Notice: Undefined index: in %s on line %d
12+
13+
Warning: Attempt to modify property 'prop' of non-object in %s on line %d
14+
array(1) {
1315
[0]=>
14-
&int(42)
15-
[""]=>
16-
object(stdClass)#1 (1) {
17-
["prop"]=>
18-
&int(42)
19-
}
16+
int(42)
2017
}

‎Zend/tests/bug72911.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,7 @@ var_dump($b);
1111

1212
?>
1313
--EXPECTF--
14-
Warning: Attempt to modify property 'b' of non-object in %sbug72911.php on line %d
14+
Notice: Trying to get property 'b' of non-object in %s on line %d
15+
16+
Warning: Attempt to assign property 'i' of non-object in %s on line %d
1517
NULL

‎Zend/tests/bug75241.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ function eh(){}
66

77
set_error_handler('eh');
88

9+
$d = new stdClass;
910
$d->d = &$d + $d->d/=0;
1011
var_dump($d);
1112
?>

‎Zend/tests/bug75573.phpt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ Bug #75573 (Segmentation fault in 7.1.12 and 7.0.26)
66
class A
77
{
88
var $_stdObject;
9+
function __construct()
10+
{
11+
$this->_stdObject = new stdClass;
12+
}
913
function &__get($property)
1014
{
1115
if (isset($this->_stdObject->{$property})) {
@@ -44,9 +48,7 @@ var_dump($b->name);
4448
var_dump($b->settings);
4549
?>
4650
--EXPECTF--
47-
Warning: Creating default object from empty value in %sbug75573.php on line %d
48-
49-
Notice: Only variable references should be returned by reference in %sbug75573.php on line %d
51+
Notice: Only variable references should be returned by reference in %s on line %d
5052
string(3) "abc"
5153
array(2) {
5254
["foo"]=>

‎Zend/tests/bug75921.phpt

Lines changed: 36 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -25,56 +25,39 @@ unset($null);
2525

2626
?>
2727
--EXPECTF--
28-
Warning: Creating default object from empty value in %sbug75921.php on line 3
29-
object(stdClass)#1 (1) {
30-
["a"]=>
31-
int(42)
32-
}
33-
34-
Warning: Creating default object from empty value in %sbug75921.php on line 7
35-
object(stdClass)#1 (1) {
36-
["a"]=>
37-
array(1) {
38-
["hello"]=>
39-
int(42)
40-
}
41-
}
42-
43-
Warning: Creating default object from empty value in %sbug75921.php on line 11
44-
45-
Warning: Creating default object from empty value in %sbug75921.php on line 11
46-
object(stdClass)#1 (1) {
47-
["a"]=>
48-
object(stdClass)#2 (1) {
49-
["b"]=>
50-
int(42)
51-
}
52-
}
53-
54-
Warning: Creating default object from empty value in %sbug75921.php on line 15
55-
56-
Warning: Creating default object from empty value in %sbug75921.php on line 15
57-
object(stdClass)#1 (1) {
58-
["a"]=>
59-
array(1) {
60-
["hello"]=>
61-
object(stdClass)#2 (1) {
62-
["b"]=>
63-
int(42)
64-
}
65-
}
66-
}
67-
68-
Warning: Creating default object from empty value in %sbug75921.php on line 19
69-
70-
Warning: Creating default object from empty value in %sbug75921.php on line 19
71-
object(stdClass)#1 (1) {
72-
["a"]=>
73-
object(stdClass)#2 (1) {
74-
["b"]=>
75-
array(1) {
76-
["hello"]=>
77-
int(42)
78-
}
79-
}
80-
}
28+
Warning: Attempt to assign property 'a' of non-object in %s on line %d
29+
30+
Notice: Undefined variable: null in %s on line %d
31+
NULL
32+
33+
Warning: Attempt to modify property 'a' of non-object in %s on line %d
34+
35+
Notice: Undefined variable: null in %s on line %d
36+
NULL
37+
38+
Notice: Undefined variable: null in %s on line %d
39+
40+
Notice: Trying to get property 'a' of non-object in %s on line %d
41+
42+
Warning: Attempt to assign property 'b' of non-object in %s on line %d
43+
44+
Notice: Undefined variable: null in %s on line %d
45+
NULL
46+
47+
Notice: Undefined variable: null in %s on line %d
48+
49+
Notice: Trying to get property 'a' of non-object in %s on line %d
50+
51+
Warning: Attempt to assign property 'b' of non-object in %s on line %d
52+
53+
Notice: Undefined variable: null in %s on line %d
54+
NULL
55+
56+
Notice: Undefined variable: null in %s on line %d
57+
58+
Notice: Trying to get property 'a' of non-object in %s on line %d
59+
60+
Warning: Attempt to modify property 'b' of non-object in %s on line %d
61+
62+
Notice: Undefined variable: null in %s on line %d
63+
NULL

‎Zend/tests/objects_020.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Accessing members of standard object through of variable variable
55

66
error_reporting(E_ALL);
77

8+
$stdclass = new stdClass;
89
$test = 'stdclass';
910

1011
$$test->a =& $$test;
@@ -14,8 +15,7 @@ var_dump($$test);
1415

1516
?>
1617
--EXPECTF--
17-
Warning: Creating default object from empty value in %sobjects_020.php on line 7
18-
object(stdClass)#%d (2) {
18+
object(stdClass)#1 (2) {
1919
["a"]=>
2020
*RECURSION*
2121
["b"]=>

0 commit comments

Comments
 (0)