Skip to content

Commit b977f61

Browse files
committed
Fix review comments
1 parent 7585b07 commit b977f61

11 files changed

+43
-58
lines changed

Zend/zend_builtin_functions.stub.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ class stdClass
66
{
77
}
88

9+
class AssertionError extends Error
10+
{
11+
}
12+
913
function zend_version(): string {}
1014

1115
function func_num_args(): int {}

Zend/zend_builtin_functions_arginfo.h

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 429fc9b22054348101d0b9d6746494e52dc04edf */
2+
* Stub hash: 4f8b74da36f11cf79ab7d78ec1e1573b6fbf268d */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_version, 0, 0, IS_STRING, 0)
55
ZEND_END_ARG_INFO()
@@ -339,6 +339,11 @@ static const zend_function_entry class_stdClass_methods[] = {
339339
ZEND_FE_END
340340
};
341341

342+
343+
static const zend_function_entry class_AssertionError_methods[] = {
344+
ZEND_FE_END
345+
};
346+
342347
static zend_class_entry *register_class_stdClass(void)
343348
{
344349
zend_class_entry ce, *class_entry;
@@ -348,3 +353,13 @@ static zend_class_entry *register_class_stdClass(void)
348353

349354
return class_entry;
350355
}
356+
357+
static zend_class_entry *register_class_AssertionError(zend_class_entry *class_entry_Error)
358+
{
359+
zend_class_entry ce, *class_entry;
360+
361+
INIT_CLASS_ENTRY(ce, "AssertionError", class_AssertionError_methods);
362+
class_entry = zend_register_internal_class_ex(&ce, class_entry_Error);
363+
364+
return class_entry;
365+
}

ext/dom/php_dom.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ void dom_child_node_remove(dom_object *context);
141141
}
142142

143143
#define DOM_NO_ARGS() \
144-
if (zend_parse_parameters_none() == failure) { \
144+
if (zend_parse_parameters_none() == FAILURE) { \
145145
RETURN_THROWS(); \
146146
}
147147

ext/standard/assert.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
/* {{{ includes */
1818
#include "php.h"
1919
#include "php_assert.h"
20-
#include "assert_arginfo.h"
2120
#include "php_ini.h"
2221
#include "zend_exceptions.h"
22+
#include "zend_builtin_functions_arginfo.h"
2323
/* }}} */
2424

2525
ZEND_BEGIN_MODULE_GLOBALS(assert)

ext/standard/assert.stub.php

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

ext/standard/assert_arginfo.h

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

ext/standard/basic_functions.stub.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
/** @generate-class-entries */
44

5+
final class __PHP_Incomplete_Class
6+
{
7+
}
8+
59
/* main/main.c */
610

711
function set_time_limit(int $seconds): bool {}

ext/standard/basic_functions_arginfo.h

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: adbca296811725459f6fbede5a279256675ad19e */
2+
* Stub hash: 1318a2d9392f1ef1f9583780af279046fa45a5f5 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
55
ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0)
@@ -3491,3 +3491,19 @@ static const zend_function_entry ext_functions[] = {
34913491
#endif
34923492
ZEND_FE_END
34933493
};
3494+
3495+
3496+
static const zend_function_entry class___PHP_Incomplete_Class_methods[] = {
3497+
ZEND_FE_END
3498+
};
3499+
3500+
static zend_class_entry *register_class___PHP_Incomplete_Class(void)
3501+
{
3502+
zend_class_entry ce, *class_entry;
3503+
3504+
INIT_CLASS_ENTRY(ce, "__PHP_Incomplete_Class", class___PHP_Incomplete_Class_methods);
3505+
class_entry = zend_register_internal_class_ex(&ce, NULL);
3506+
class_entry->ce_flags |= ZEND_ACC_FINAL;
3507+
3508+
return class_entry;
3509+
}

ext/standard/incomplete_class.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "php.h"
1818
#include "basic_functions.h"
1919
#include "basic_functions_arginfo.h"
20-
#include "incomplete_class_arginfo.h"
2120
#include "php_incomplete_class.h"
2221

2322
#define INCOMPLETE_CLASS_MSG \

ext/standard/incomplete_class.stub.php

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

ext/standard/incomplete_class_arginfo.h

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

0 commit comments

Comments
 (0)