1 files changed, 3 insertions, 13 deletions

diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index b7a835ae45..073965db71 100644
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -458,8 +458,6 @@ static spl_filesystem_object *spl_filesystem_object_create_info(spl_filesystem_o
 
 	ce = ce ? ce : source->info_class;
 
-	zend_update_class_constants(ce);
-
 	intern = spl_filesystem_from_obj(spl_filesystem_object_new_ex(ce));
 	RETVAL_OBJ(&intern->std);
 
@@ -478,7 +476,7 @@ static spl_filesystem_object *spl_filesystem_object_create_info(spl_filesystem_o
 static spl_filesystem_object *spl_filesystem_object_create_type(int num_args, spl_filesystem_object *source, int type, zend_class_entry *ce, zval *return_value) /* {{{ */
 {
 	spl_filesystem_object *intern;
-	zend_bool use_include_path = 0;
+	bool use_include_path = 0;
 	zval arg1, arg2;
 	zend_error_handling error_handling;
 
@@ -497,10 +495,6 @@ static spl_filesystem_object *spl_filesystem_object_create_type(int num_args, sp
 		case SPL_FS_INFO:
 			ce = ce ? ce : source->info_class;
 
-			if (UNEXPECTED(zend_update_class_constants(ce) != SUCCESS)) {
-				return NULL;
-			}
-
 			intern = spl_filesystem_from_obj(spl_filesystem_object_new_ex(ce));
 			RETVAL_OBJ(&intern->std);
 
@@ -523,10 +517,6 @@ static spl_filesystem_object *spl_filesystem_object_create_type(int num_args, sp
 		{
 			ce = ce ? ce : source->file_class;
 
-			if (UNEXPECTED(zend_update_class_constants(ce) != SUCCESS)) {
-				return NULL;
-			}
-
 			char *open_mode = "r";
 			size_t open_mode_len = 1;
 			zval *resource = NULL;
@@ -1467,7 +1457,7 @@ PHP_METHOD(FilesystemIterator, setFlags)
 /* {{{ Returns whether current entry is a directory and not '.' or '..' */
 PHP_METHOD(RecursiveDirectoryIterator, hasChildren)
 {
-	zend_bool allow_links = 0;
+	bool allow_links = 0;
 	spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS);
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|b", &allow_links) == FAILURE) {
@@ -2051,7 +2041,7 @@ static void spl_filesystem_file_rewind(zval * this_ptr, spl_filesystem_object *i
 PHP_METHOD(SplFileObject, __construct)
 {
 	spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS);
-	zend_bool use_include_path = 0;
+	bool use_include_path = 0;
 	char *p1, *p2;
 	char *tmp_path;
 	size_t   tmp_path_len;