diff --git a/ext/standard/assert.c b/ext/standard/assert.c
index 1c5108b94e5b..f5f10752fe54 100644
--- a/ext/standard/assert.c
+++ b/ext/standard/assert.c
@@ -36,14 +36,6 @@ ZEND_DECLARE_MODULE_GLOBALS(assert)
 
 #define SAFE_STRING(s) ((s)?(s):"")
 
-enum {
-	ASSERT_ACTIVE=1,
-	ASSERT_CALLBACK,
-	ASSERT_BAIL,
-	ASSERT_WARNING,
-	ASSERT_EXCEPTION
-};
-
 PHPAPI zend_class_entry *assertion_error_ce;
 
 static PHP_INI_MH(OnChangeCallback) /* {{{ */
@@ -93,12 +85,6 @@ PHP_MINIT_FUNCTION(assert) /* {{{ */
 
 	REGISTER_INI_ENTRIES();
 
-	REGISTER_LONG_CONSTANT("ASSERT_ACTIVE", ASSERT_ACTIVE, CONST_CS|CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("ASSERT_CALLBACK", ASSERT_CALLBACK, CONST_CS|CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("ASSERT_BAIL", ASSERT_BAIL, CONST_CS|CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("ASSERT_WARNING", ASSERT_WARNING, CONST_CS|CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("ASSERT_EXCEPTION", ASSERT_EXCEPTION, CONST_CS|CONST_PERSISTENT);
-
 	return SUCCESS;
 }
 /* }}} */
@@ -219,7 +205,7 @@ PHP_FUNCTION(assert_options)
 	ZEND_PARSE_PARAMETERS_END();
 
 	switch (what) {
-	case ASSERT_ACTIVE:
+	case PHP_ASSERT_ACTIVE:
 		oldint = ASSERTG(active);
 		if (ac == 2) {
 			zend_string *value_str = zval_try_get_string(value);
@@ -235,7 +221,7 @@ PHP_FUNCTION(assert_options)
 		RETURN_LONG(oldint);
 		break;
 
-	case ASSERT_BAIL:
+	case PHP_ASSERT_BAIL:
 		oldint = ASSERTG(bail);
 		if (ac == 2) {
 			zend_string *value_str = zval_try_get_string(value);
@@ -251,7 +237,7 @@ PHP_FUNCTION(assert_options)
 		RETURN_LONG(oldint);
 		break;
 
-	case ASSERT_WARNING:
+	case PHP_ASSERT_WARNING:
 		oldint = ASSERTG(warning);
 		if (ac == 2) {
 			zend_string *value_str = zval_try_get_string(value);
@@ -267,7 +253,7 @@ PHP_FUNCTION(assert_options)
 		RETURN_LONG(oldint);
 		break;
 
-	case ASSERT_CALLBACK:
+	case PHP_ASSERT_CALLBACK:
 		if (Z_TYPE(ASSERTG(callback)) != IS_UNDEF) {
 			ZVAL_COPY(return_value, &ASSERTG(callback));
 		} else if (ASSERTG(cb)) {
@@ -286,7 +272,7 @@ PHP_FUNCTION(assert_options)
 		}
 		return;
 
-	case ASSERT_EXCEPTION:
+	case PHP_ASSERT_EXCEPTION:
 		oldint = ASSERTG(exception);
 		if (ac == 2) {
 			zend_string *val = zval_try_get_string(value);
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 97b8c7b9c245..fddd76470b9e 100755
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -16,6 +16,7 @@
  */
 
 #include "php.h"
+#include "php_assert.h"
 #include "php_streams.h"
 #include "php_main.h"
 #include "php_globals.h"
diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php
index 40485067e825..86257cbead67 100755
--- a/ext/standard/basic_functions.stub.php
+++ b/ext/standard/basic_functions.stub.php
@@ -120,6 +120,34 @@
  */
 const ARRAY_FILTER_USE_KEY = UNKNOWN;
 
+/* assert.c */
+
+/**
+ * @var int
+ * @cvalue PHP_ASSERT_ACTIVE
+ */
+const ASSERT_ACTIVE = UNKNOWN;
+/**
+ * @var int
+ * @cvalue PHP_ASSERT_CALLBACK
+ */
+const ASSERT_CALLBACK = UNKNOWN;
+/**
+ * @var int
+ * @cvalue PHP_ASSERT_BAIL
+ */
+const ASSERT_BAIL = UNKNOWN;
+/**
+ * @var int
+ * @cvalue PHP_ASSERT_WARNING
+ */
+const ASSERT_WARNING = UNKNOWN;
+/**
+ * @var int
+ * @cvalue PHP_ASSERT_EXCEPTION
+ */
+const ASSERT_EXCEPTION = UNKNOWN;
+
 /* basic_functions.h */
 
 /**
diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h
index 159149d56c1b..09e2343c139d 100644
--- a/ext/standard/basic_functions_arginfo.h
+++ b/ext/standard/basic_functions_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 84da2d4d107d431887910833ac7a2f5dfced4d6f */
+ * Stub hash: ae2cadf6fd352eb17e878f377d9b93ee8303943a */
 
 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)
@@ -3505,6 +3505,11 @@ static void register_basic_functions_symbols(int module_number)
 	REGISTER_LONG_CONSTANT("COUNT_RECURSIVE", PHP_COUNT_RECURSIVE, CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("ARRAY_FILTER_USE_BOTH", ARRAY_FILTER_USE_BOTH, CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("ARRAY_FILTER_USE_KEY", ARRAY_FILTER_USE_KEY, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("ASSERT_ACTIVE", PHP_ASSERT_ACTIVE, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("ASSERT_CALLBACK", PHP_ASSERT_CALLBACK, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("ASSERT_BAIL", PHP_ASSERT_BAIL, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("ASSERT_WARNING", PHP_ASSERT_WARNING, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("ASSERT_EXCEPTION", PHP_ASSERT_EXCEPTION, CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("CONNECTION_ABORTED", PHP_CONNECTION_ABORTED, CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("CONNECTION_NORMAL", PHP_CONNECTION_NORMAL, CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("CONNECTION_TIMEOUT", PHP_CONNECTION_TIMEOUT, CONST_PERSISTENT);
diff --git a/ext/standard/php_assert.h b/ext/standard/php_assert.h
index 914e90f0a9a7..103a770e7601 100644
--- a/ext/standard/php_assert.h
+++ b/ext/standard/php_assert.h
@@ -23,6 +23,14 @@ PHP_RINIT_FUNCTION(assert);
 PHP_RSHUTDOWN_FUNCTION(assert);
 PHP_MINFO_FUNCTION(assert);
 
+enum {
+	PHP_ASSERT_ACTIVE=1,
+	PHP_ASSERT_CALLBACK,
+	PHP_ASSERT_BAIL,
+	PHP_ASSERT_WARNING,
+	PHP_ASSERT_EXCEPTION
+};
+
 extern PHPAPI zend_class_entry *assertion_error_ce;
 
 #endif /* PHP_ASSERT_H */