Fix review comments

Author: kocsismate

ext/dom/php_dom.h

@@ -141,7 +141,7 @@ void dom_child_node_remove(dom_object *context);
 }
 
 #define DOM_NO_ARGS() \
-	if (zend_parse_parameters_none() == failure) { \
+	if (zend_parse_parameters_none() == FAILURE) { \
 		RETURN_THROWS(); \
 	}
 

ext/standard/assert.c

@@ -17,7 +17,6 @@
 /* {{{ includes */
 #include "php.h"
 #include "php_assert.h"
-#include "assert_arginfo.h"
 #include "php_ini.h"
 #include "zend_exceptions.h"
 /* }}} */
@@ -33,8 +32,6 @@ ZEND_END_MODULE_GLOBALS(assert)
 
 ZEND_DECLARE_MODULE_GLOBALS(assert)
 
-static zend_class_entry *assertion_error_ce;
-
 #define ASSERTG(v) ZEND_MODULE_GLOBALS_ACCESSOR(assert, v)
 
 #define SAFE_STRING(s) ((s)?(s):"")
@@ -100,8 +97,6 @@ PHP_MINIT_FUNCTION(assert) /* {{{ */
 	REGISTER_LONG_CONSTANT("ASSERT_WARNING", ASSERT_WARNING, CONST_CS|CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("ASSERT_EXCEPTION", ASSERT_EXCEPTION, CONST_CS|CONST_PERSISTENT);
 
-	assertion_error_ce = register_class_AssertionError(zend_ce_error);
-
 	return SUCCESS;
 }
 /* }}} */

ext/standard/assert.stub.php

@@ -16,6 +16,7 @@
  */
 
 #include "php.h"
+#include "php_assert.h"
 #include "php_streams.h"
 #include "php_main.h"
 #include "php_globals.h"
@@ -283,7 +284,10 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */
 #endif
 #endif
 
-	php_register_incomplete_class();
+	php_ce_incomplete_class = register_class___PHP_Incomplete_Class();
+	php_register_incomplete_class_handlers();
+
+	assertion_error_ce = register_class_AssertionError(zend_ce_error);
 
 	REGISTER_LONG_CONSTANT("CONNECTION_ABORTED", PHP_CONNECTION_ABORTED, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("CONNECTION_NORMAL",  PHP_CONNECTION_NORMAL,  CONST_CS | CONST_PERSISTENT);

ext/standard/assert_arginfo.h

@@ -2,6 +2,14 @@
 
 /** @generate-class-entries */
 
+final class __PHP_Incomplete_Class
+{
+}
+
+class AssertionError extends Error
+{
+}
+
 /* main/main.c */
 
 function set_time_limit(int $seconds): bool {}

ext/standard/basic_functions.c

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: adbca296811725459f6fbede5a279256675ad19e */
+ * Stub hash: 97edf8c87780c892984099e52ad1c6c745b919f8 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0)
@@ -3491,3 +3491,34 @@ static const zend_function_entry ext_functions[] = {
 #endif
 	ZEND_FE_END
 };
+
+
+static const zend_function_entry class___PHP_Incomplete_Class_methods[] = {
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_AssertionError_methods[] = {
+	ZEND_FE_END
+};
+
+static zend_class_entry *register_class___PHP_Incomplete_Class(void)
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "__PHP_Incomplete_Class", class___PHP_Incomplete_Class_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+	class_entry->ce_flags |= ZEND_ACC_FINAL;
+
+	return class_entry;
+}
+
+static zend_class_entry *register_class_AssertionError(zend_class_entry *class_entry_Error)
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "AssertionError", class_AssertionError_methods);
+	class_entry = zend_register_internal_class_ex(&ce, class_entry_Error);
+
+	return class_entry;
+}

ext/standard/basic_functions.stub.php

@@ -16,8 +16,6 @@
 
 #include "php.h"
 #include "basic_functions.h"
-#include "basic_functions_arginfo.h"
-#include "incomplete_class_arginfo.h"
 #include "php_incomplete_class.h"
 
 #define INCOMPLETE_CLASS_MSG \
@@ -110,7 +108,7 @@ static zend_object *php_create_incomplete_object(zend_class_entry *class_type)
 	return object;
 }
 
-PHPAPI void php_register_incomplete_class(void)
+PHPAPI void php_register_incomplete_class_handlers(void)
 {
 	memcpy(&php_incomplete_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));
 	php_incomplete_object_handlers.read_property = incomplete_class_get_property;
@@ -120,7 +118,6 @@ PHPAPI void php_register_incomplete_class(void)
 	php_incomplete_object_handlers.get_property_ptr_ptr = incomplete_class_get_property_ptr_ptr;
     php_incomplete_object_handlers.get_method = incomplete_class_get_method;
 
-	php_ce_incomplete_class = register_class___PHP_Incomplete_Class();
 	php_ce_incomplete_class->create_object = php_create_incomplete_object;
 }
 /* }}} */

ext/standard/basic_functions_arginfo.h

@@ -23,4 +23,6 @@ PHP_RINIT_FUNCTION(assert);
 PHP_RSHUTDOWN_FUNCTION(assert);
 PHP_MINFO_FUNCTION(assert);
 
+static zend_class_entry *assertion_error_ce;
+
 #endif /* PHP_ASSERT_H */

ext/standard/incomplete_class.c

@@ -49,7 +49,7 @@ extern PHPAPI zend_class_entry *php_ce_incomplete_class;
 extern "C" {
 #endif
 
-PHPAPI void php_register_incomplete_class(void);
+PHPAPI void php_register_incomplete_class_handlers(void);
 PHPAPI zend_string *php_lookup_class_name(zend_object *object);
 PHPAPI void php_store_class_name(zval *object, zend_string *name);
 

ext/standard/incomplete_class.stub.php

@@ -58,7 +58,7 @@ PHP_METHOD(php_user_filter, onClose)
 	ZEND_PARSE_PARAMETERS_NONE();
 }
 
-static zend_class_entry user_filter_class_entry;
+static zend_class_entry *user_filter_class_entry;
 
 static ZEND_RSRC_DTOR_FUNC(php_bucket_dtor)
 {
@@ -72,7 +72,7 @@ static ZEND_RSRC_DTOR_FUNC(php_bucket_dtor)
 PHP_MINIT_FUNCTION(user_filters)
 {
 	/* init the filter class ancestor */
-	zend_class_entry *php_user_filter = register_class_php_user_filter();
+	user_filter_class_entry = register_class_php_user_filter();
 
 	/* init the filter resource; it has no dtor, as streams will always clean it up
 	 * at the correct time */