Skip to content

Commit cc91da1

Browse files
dstogovdstogov
committed
Fixed bug #47664 (get_class returns NULL instead of FALSE)
1 parent 6e2521f commit cc91da1

File tree

5 files changed

+59
-58
lines changed

5 files changed

+59
-58
lines changed

‎NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ PHP NEWS
88

99
- Added LIBXML_LOADED_VERSION constant (libxml2 version currently used). (Rob)
1010

11+
- Fixed bug #47664 (get_class returns NULL instead of FALSE). (Dmitry)
1112
- Fixed bug #47593 (interface_exists() returns false when using absolute
1213
namespace path). (Kalle, Felipe)
1314
- Fixed bug #47572 (Undefined constant causes segmentation fault). (Felipe)

‎Zend/tests/009.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Warning: get_class() called without object from outside a class in %s on line %d
4242
bool(false)
4343

4444
Warning: get_class() expects parameter 1 to be object, string given in %s on line %d
45-
NULL
45+
bool(false)
4646
string(3) "foo"
4747
string(4) "foo2"
4848
Done

‎Zend/zend_builtin_functions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ ZEND_FUNCTION(get_class)
719719
int dup;
720720

721721
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|o", &obj) == FAILURE) {
722-
return;
722+
RETURN_FALSE;
723723
}
724724

725725
if (!obj) {

‎ext/standard/tests/class_object/get_class_error_001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ echo "Done";
2424
-- Testing get_class() function with more than expected no. of arguments --
2525

2626
Warning: get_class() expects at most 1 parameter, 2 given in %s on line 14
27-
NULL
27+
bool(false)
2828
Done

‎ext/standard/tests/class_object/get_class_variation_001.phpt

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -76,137 +76,137 @@ echo "Done";
7676
--EXPECTF--
7777
*** Testing get_class() : usage variations ***
7878

79-
Notice: Undefined variable: undefined_var in %s on line 58
79+
Notice: Undefined variable: undefined_var in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 58
8080

81-
Notice: Undefined variable: unset_var in %s on line 61
81+
Notice: Undefined variable: unset_var in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 61
8282

8383
Arg value: 0 (type: integer)
8484

85-
Warning: get_class() expects parameter 1 to be object, integer given in %s on line %d
86-
NULL
85+
Warning: get_class() expects parameter 1 to be object, integer given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
86+
bool(false)
8787

8888
Arg value: 1 (type: integer)
8989

90-
Warning: get_class() expects parameter 1 to be object, integer given in %s on line %d
91-
NULL
90+
Warning: get_class() expects parameter 1 to be object, integer given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
91+
bool(false)
9292

9393
Arg value: 12345 (type: integer)
9494

95-
Warning: get_class() expects parameter 1 to be object, integer given in %s on line %d
96-
NULL
95+
Warning: get_class() expects parameter 1 to be object, integer given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
96+
bool(false)
9797

9898
Arg value: -2345 (type: integer)
9999

100-
Warning: get_class() expects parameter 1 to be object, integer given in %s on line %d
101-
NULL
100+
Warning: get_class() expects parameter 1 to be object, integer given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
101+
bool(false)
102102

103103
Arg value: 10.5 (type: double)
104104

105-
Warning: get_class() expects parameter 1 to be object, double given in %s on line %d
106-
NULL
105+
Warning: get_class() expects parameter 1 to be object, double given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
106+
bool(false)
107107

108108
Arg value: -10.5 (type: double)
109109

110-
Warning: get_class() expects parameter 1 to be object, double given in %s on line %d
111-
NULL
110+
Warning: get_class() expects parameter 1 to be object, double given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
111+
bool(false)
112112

113113
Arg value: 101234567000 (type: double)
114114

115-
Warning: get_class() expects parameter 1 to be object, double given in %s on line %d
116-
NULL
115+
Warning: get_class() expects parameter 1 to be object, double given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
116+
bool(false)
117117

118118
Arg value: 1.07654321E-9 (type: double)
119119

120-
Warning: get_class() expects parameter 1 to be object, double given in %s on line %d
121-
NULL
120+
Warning: get_class() expects parameter 1 to be object, double given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
121+
bool(false)
122122

123123
Arg value: 0.5 (type: double)
124124

125-
Warning: get_class() expects parameter 1 to be object, double given in %s on line %d
126-
NULL
125+
Warning: get_class() expects parameter 1 to be object, double given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
126+
bool(false)
127127

128128
Arg value: Array (type: array)
129129

130-
Warning: get_class() expects parameter 1 to be object, array given in %s on line %d
131-
NULL
130+
Warning: get_class() expects parameter 1 to be object, array given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
131+
bool(false)
132132

133133
Arg value: Array (type: array)
134134

135-
Warning: get_class() expects parameter 1 to be object, array given in %s on line %d
136-
NULL
135+
Warning: get_class() expects parameter 1 to be object, array given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
136+
bool(false)
137137

138138
Arg value: Array (type: array)
139139

140-
Warning: get_class() expects parameter 1 to be object, array given in %s on line %d
141-
NULL
140+
Warning: get_class() expects parameter 1 to be object, array given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
141+
bool(false)
142142

143143
Arg value: Array (type: array)
144144

145-
Warning: get_class() expects parameter 1 to be object, array given in %s on line %d
146-
NULL
145+
Warning: get_class() expects parameter 1 to be object, array given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
146+
bool(false)
147147

148148
Arg value: Array (type: array)
149149

150-
Warning: get_class() expects parameter 1 to be object, array given in %s on line %d
151-
NULL
150+
Warning: get_class() expects parameter 1 to be object, array given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
151+
bool(false)
152152

153153
Arg value: (type: NULL)
154154

155-
Warning: get_class() expects parameter 1 to be object, null given in %s on line %d
156-
NULL
155+
Warning: get_class() expects parameter 1 to be object, null given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
156+
bool(false)
157157

158158
Arg value: (type: NULL)
159159

160-
Warning: get_class() expects parameter 1 to be object, null given in %s on line %d
161-
NULL
160+
Warning: get_class() expects parameter 1 to be object, null given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
161+
bool(false)
162162

163163
Arg value: 1 (type: boolean)
164164

165-
Warning: get_class() expects parameter 1 to be object, boolean given in %s on line %d
166-
NULL
165+
Warning: get_class() expects parameter 1 to be object, boolean given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
166+
bool(false)
167167

168168
Arg value: (type: boolean)
169169

170-
Warning: get_class() expects parameter 1 to be object, boolean given in %s on line %d
171-
NULL
170+
Warning: get_class() expects parameter 1 to be object, boolean given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
171+
bool(false)
172172

173173
Arg value: 1 (type: boolean)
174174

175-
Warning: get_class() expects parameter 1 to be object, boolean given in %s on line %d
176-
NULL
175+
Warning: get_class() expects parameter 1 to be object, boolean given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
176+
bool(false)
177177

178178
Arg value: (type: boolean)
179179

180-
Warning: get_class() expects parameter 1 to be object, boolean given in %s on line %d
181-
NULL
180+
Warning: get_class() expects parameter 1 to be object, boolean given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
181+
bool(false)
182182

183183
Arg value: (type: string)
184184

185-
Warning: get_class() expects parameter 1 to be object, string given in %s on line %d
186-
NULL
185+
Warning: get_class() expects parameter 1 to be object, string given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
186+
bool(false)
187187

188188
Arg value: (type: string)
189189

190-
Warning: get_class() expects parameter 1 to be object, string given in %s on line %d
191-
NULL
190+
Warning: get_class() expects parameter 1 to be object, string given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
191+
bool(false)
192192

193193
Arg value: string (type: string)
194194

195-
Warning: get_class() expects parameter 1 to be object, string given in %s on line %d
196-
NULL
195+
Warning: get_class() expects parameter 1 to be object, string given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
196+
bool(false)
197197

198198
Arg value: string (type: string)
199199

200-
Warning: get_class() expects parameter 1 to be object, string given in %s on line %d
201-
NULL
200+
Warning: get_class() expects parameter 1 to be object, string given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
201+
bool(false)
202202

203203
Arg value: (type: NULL)
204204

205-
Warning: get_class() expects parameter 1 to be object, null given in %s on line %d
206-
NULL
205+
Warning: get_class() expects parameter 1 to be object, null given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
206+
bool(false)
207207

208208
Arg value: (type: NULL)
209209

210-
Warning: get_class() expects parameter 1 to be object, null given in %s on line %d
211-
NULL
212-
Done
210+
Warning: get_class() expects parameter 1 to be object, null given in /home/dmitry/php/php5.3/ext/standard/tests/class_object/get_class_variation_001.php on line 68
211+
bool(false)
212+
Done

0 commit comments

Comments
 (0)