6 files changed, 20 insertions, 16 deletions
diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index b3c9f4eeb2..ccf76d395b 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -114,8 +114,8 @@ static size_t php_dba_make_key(zval *key, char **key_str, char **key_free)
 		group = zend_hash_get_current_data_ex(Z_ARRVAL_P(key), &pos);
 		zend_hash_move_forward_ex(Z_ARRVAL_P(key), &pos);
 		name = zend_hash_get_current_data_ex(Z_ARRVAL_P(key), &pos);
-		convert_to_string_ex(group);
-		convert_to_string_ex(name);
+		convert_to_string(group);
+		convert_to_string(name);
 		if (Z_STRLEN_P(group) == 0) {
 			*key_str = Z_STRVAL_P(name);
 			*key_free = NULL;
@@ -542,8 +542,8 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 	zend_string *opened_path = NULL;
 	char *lock_name;
 #ifdef PHP_WIN32
-	zend_bool restarted = 0;
-	zend_bool need_creation = 0;
+	bool restarted = 0;
+	bool need_creation = 0;
 #endif
 
 	if (ac < 2) {
@@ -860,7 +860,7 @@ restart:
 				fcntl(info->fd, F_SETFL, flags & ~O_APPEND);
 #elif defined(PHP_WIN32)
 			} else if (modenr == DBA_CREAT && need_creation && !restarted) {
-				zend_bool close_both;
+				bool close_both;
 
 				close_both = (info->fp != info->lock.fp);
 				php_stream_close(info->lock.fp);
@@ -1155,7 +1155,7 @@ PHP_FUNCTION(dba_sync)
 PHP_FUNCTION(dba_handlers)
 {
 	dba_handler *hptr;
-	zend_bool full_info = 0;
+	bool full_info = 0;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|b", &full_info) == FAILURE) {
 		RETURN_THROWS();
diff --git a/ext/dba/dba.stub.php b/ext/dba/dba.stub.php
index 12cccbe506..cff3b165b6 100644
--- a/ext/dba/dba.stub.php
+++ b/ext/dba/dba.stub.php
@@ -1,6 +1,9 @@
 <?php
 
-/** @generate-function-entries */
+/**
+ * @generate-function-entries
+ * @generate-class-entries
+ */
 
 /**
  * @param string $path
diff --git a/ext/dba/dba_arginfo.h b/ext/dba/dba_arginfo.h
index d92eae0448..ae6faf26f3 100644
--- a/ext/dba/dba_arginfo.h
+++ b/ext/dba/dba_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 63980c2a7227d1b5dbd566efb3efbf8c45c55c0d */
+ * Stub hash: 847b6feaa62709f1a7a432564e9086e509b86bf7 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2)
 	ZEND_ARG_INFO(0, path)
@@ -94,3 +94,4 @@ static const zend_function_entry ext_functions[] = {
 	ZEND_FE(dba_list, arginfo_dba_list)
 	ZEND_FE_END
 };
+
diff --git a/ext/dba/dba_inifile.c b/ext/dba/dba_inifile.c
index dd3d42290f..ec50aeba15 100644
--- a/ext/dba/dba_inifile.c
+++ b/ext/dba/dba_inifile.c
@@ -120,7 +120,7 @@ DBA_EXISTS_FUNC(inifile)
 DBA_DELETE_FUNC(inifile)
 {
 	int res;
-	zend_bool found = 0;
+	bool found = 0;
 
 	INIFILE_DATA;
 	INIFILE_GKEY;
diff --git a/ext/dba/libinifile/inifile.c b/ext/dba/libinifile/inifile.c
index 43227c42d7..72f0ef4d9c 100644
--- a/ext/dba/libinifile/inifile.c
+++ b/ext/dba/libinifile/inifile.c
@@ -406,7 +406,7 @@ static int inifile_copy_to(inifile *dba, size_t pos_start, size_t pos_end, inifi
 /* {{{ inifile_filter
  * copy from to dba while ignoring key name (group must equal)
  */
-static int inifile_filter(inifile *dba, inifile *from, const key_type *key, zend_bool *found)
+static int inifile_filter(inifile *dba, inifile *from, const key_type *key, bool *found)
 {
 	size_t pos_start = 0, pos_next = 0, pos_curr;
 	int ret = SUCCESS;
@@ -418,7 +418,7 @@ static int inifile_filter(inifile *dba, inifile *from, const key_type *key, zend
 		switch(inifile_key_cmp(&ln.key, key)) {
 		case 0:
 			if (found) {
-				*found = (zend_bool) 1;
+				*found = (bool) 1;
 			}
 			pos_curr = php_stream_tell(from->fp);
 			if (pos_start != pos_next) {
@@ -453,7 +453,7 @@ static int inifile_filter(inifile *dba, inifile *from, const key_type *key, zend
 /* }}} */
 
 /* {{{ inifile_delete_replace_append */
-static int inifile_delete_replace_append(inifile *dba, const key_type *key, const val_type *value, int append, zend_bool *found)
+static int inifile_delete_replace_append(inifile *dba, const key_type *key, const val_type *value, int append, bool *found)
 {
 	size_t pos_grp_start=0, pos_grp_next;
 	inifile *ini_tmp = NULL;
@@ -562,7 +562,7 @@ int inifile_delete(inifile *dba, const key_type *key)
 /* }}} */
 
 /* {{{ inifile_delete_ex */
-int inifile_delete_ex(inifile *dba, const key_type *key, zend_bool *found)
+int inifile_delete_ex(inifile *dba, const key_type *key, bool *found)
 {
 	return inifile_delete_replace_append(dba, key, NULL, 0, found);
 }
@@ -576,7 +576,7 @@ int inifile_replace(inifile *dba, const key_type *key, const val_type *value)
 /* }}} */
 
 /* {{{ inifile_replace_ex */
-int inifile_replace_ex(inifile *dba, const key_type *key, const val_type *value, zend_bool *found)
+int inifile_replace_ex(inifile *dba, const key_type *key, const val_type *value, bool *found)
 {
 	return inifile_delete_replace_append(dba, key, value, 0, found);
 }
diff --git a/ext/dba/libinifile/inifile.h b/ext/dba/libinifile/inifile.h
index ec33f80ee7..d1816b1d2e 100644
--- a/ext/dba/libinifile/inifile.h
+++ b/ext/dba/libinifile/inifile.h
@@ -45,9 +45,9 @@ val_type inifile_fetch(inifile *dba, const key_type *key, int skip);
 int inifile_firstkey(inifile *dba);
 int inifile_nextkey(inifile *dba);
 int inifile_delete(inifile *dba, const key_type *key);
-int inifile_delete_ex(inifile *dba, const key_type *key, zend_bool *found);
+int inifile_delete_ex(inifile *dba, const key_type *key, bool *found);
 int inifile_replace(inifile *dba, const key_type *key, const val_type *val);
-int inifile_replace_ex(inifile *dba, const key_type *key, const val_type *val, zend_bool *found);
+int inifile_replace_ex(inifile *dba, const key_type *key, const val_type *val, bool *found);
 int inifile_append(inifile *dba, const key_type *key, const val_type *val);
 char *inifile_version();