File tree Expand file tree Collapse file tree 2 files changed +10
-2
lines changed Expand file tree Collapse file tree 2 files changed +10
-2
lines changed Original file line number Diff line number Diff line change @@ -8118,6 +8118,7 @@ void zend_compile_top_stmt(zend_ast *ast) /* {{{ */
8118
8118
}
8119
8119
8120
8120
/* Compile remainder */
8121
+ /* todo: loop to catch any non-consecutive type declarations */
8121
8122
for (p = last_decl ; p < end ; ++ p ) {
8122
8123
zend_compile_top_stmt (* p );
8123
8124
}
Original file line number Diff line number Diff line change @@ -245,6 +245,12 @@ int _check_zce_variance(
245
245
}
246
246
}
247
247
248
+ /* This int return is not a boolean, but will often be treated this way.
249
+ * * 0 means there is definitely an error.
250
+ * * 1 means there are definitely not any errors.
251
+ * * -1 means there are no known errors but it is not known to be good
252
+ * either (there is not enough information at the moment).
253
+ */
248
254
static
249
255
int _check_inherited_arg_info (
250
256
const zend_function * fe , zend_arg_info * fe_arg_info ,
@@ -284,8 +290,9 @@ int _check_inherited_arg_info(
284
290
if (fe_ce && proto_ce ) {
285
291
code = _check_zce_variance (fe_ce , proto_ce , variance );
286
292
} else {
287
- /* todo: delay to runtime. How? */
288
- /* Don't break bug62441! */
293
+ /* The -1 will still be considered "truthy". It means there
294
+ * is not enough information at the moment, but there are
295
+ * not any known errors either. */
289
296
code = -1 ;
290
297
}
291
298
} else {
You can’t perform that action at this time.
0 commit comments