Various fixes from review

Also fix test output for DBA4

Author: Girgias

ext/dba/dba.c

@@ -621,7 +621,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
 				}
 				break;
 			default:
-				zend_argument_value_error(2, "second character must be one of \"d\",\"l\",\"-\", or \"t\"");
+				zend_argument_value_error(2, "second character must be one of \"d\", \"l\", \"-\", or \"t\"");
 				FREE_PERSISTENT_RESOURCE_KEY();
 				RETURN_THROWS();
 		}
@@ -690,7 +690,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
 			file_mode = "w+b";
 			break;
 		default:
-			zend_argument_value_error(2, "first character must be one of \"r\",\"w\",\"c\", or \"n\"");
+			zend_argument_value_error(2, "first character must be one of \"r\", \"w\", \"c\", or \"n\"");
 			FREE_PERSISTENT_RESOURCE_KEY();
 			RETURN_THROWS();
 	}

ext/dba/dba_arginfo.h

@@ -5,7 +5,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, mode, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, handler, IS_STRING, 1, "null")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, permission, IS_LONG, 0, "00")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, permission, IS_LONG, 0, "0644")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, map_size, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 

ext/dba/dba_lmdb.c

@@ -44,7 +44,7 @@ DBA_OPEN_FUNC(lmdb)
 	int mode = info->file_permission;
 	zend_long map_size = info->map_size;
 
-	ZEND_ASSERT(map_size > 0);
+	ZEND_ASSERT(map_size >= 0);
 
 	rc = mdb_env_create(&env);
 	if (rc) {

ext/dba/tests/dba011.phpt

@@ -121,8 +121,8 @@ bool(false)
 dba_open(): Argument #1 ($path) cannot be empty
 dba_open(): Argument #2 ($mode) cannot be empty
 dba_open(): Argument #3 ($handler) cannot be empty
-dba_open(): Argument #2 ($mode) first character must be one of "r","w","c", or "n"
-dba_open(): Argument #2 ($mode) second character must be one of "d","l","-", or "t"
+dba_open(): Argument #2 ($mode) first character must be one of "r", "w", "c", or "n"
+dba_open(): Argument #2 ($mode) second character must be one of "d", "l", "-", or "t"
 dba_open(): Argument #2 ($mode) third character must be "t"
 dba_open(): Argument #2 ($mode) cannot combine mode "-" (no lock) and "t" (test lock)
 dba_open(): Argument #5 ($map_size) must be greater or equal than 0
@@ -133,8 +133,8 @@ bool(false)
 dba_popen(): Argument #1 ($path) cannot be empty
 dba_popen(): Argument #2 ($mode) cannot be empty
 dba_popen(): Argument #3 ($handler) cannot be empty
-dba_popen(): Argument #2 ($mode) first character must be one of "r","w","c", or "n"
-dba_popen(): Argument #2 ($mode) second character must be one of "d","l","-", or "t"
+dba_popen(): Argument #2 ($mode) first character must be one of "r", "w", "c", or "n"
+dba_popen(): Argument #2 ($mode) second character must be one of "d", "l", "-", or "t"
 dba_popen(): Argument #2 ($mode) third character must be "t"
 dba_popen(): Argument #2 ($mode) cannot combine mode "-" (no lock) and "t" (test lock)
 dba_popen(): Argument #5 ($map_size) must be greater or equal than 0

ext/dba/tests/dba_db4_003.phpt

@@ -41,6 +41,6 @@ require(__DIR__ .'/clean.inc');
 database handler: db4
 int(14)
 
-Warning: dba_open(%stest0.dbm,c): Driver initialization failed for handler: db4: Invalid argument in %sdba_db4_003.php on line %d
+Warning: dba_open(): Driver initialization failed for handler: db4: Invalid argument in %sdba_db4_003.php on line %d
 Error creating %stest0.dbm
 Dummy contents

ext/dba/tests/dba_db4_007.phpt

@@ -37,5 +37,5 @@ require(__DIR__ .'/clean.inc');
 database handler: db4
 int(14)
 
-Warning: dba_popen(%stest0.dbm,c): Driver initialization failed for handler: db4: Invalid argument in %sdba_db4_007.php on line %d
+Warning: dba_popen(): Driver initialization failed for handler: db4: Invalid argument in %sdba_db4_007.php on line %d
 Error creating %stest0.dbm

ext/dba/tests/dba_db4_012.phpt

@@ -29,5 +29,5 @@ require(__DIR__ .'/clean.inc');
 --EXPECTF--
 database handler: db4
 
-Warning: dba_open(%stest0.dbm,rl): Driver initialization failed for handler: db4: No such file or directory in %sdba_db4_012.php on line %d
+Warning: dba_open(): Driver initialization failed for handler: db4: No such file or directory in %sdba_db4_012.php on line %d
 Error creating %stest0.dbm

ext/dba/tests/dba_db4_014.phpt

@@ -30,5 +30,5 @@ require(__DIR__ .'/clean.inc');
 --EXPECTF--
 database handler: db4
 
-Warning: dba_open(%stest0.dbm,wl): Driver initialization failed for handler: db4: No such file or directory in %sdba_db4_014.php on line %d
+Warning: dba_open(): Driver initialization failed for handler: db4: No such file or directory in %sdba_db4_014.php on line %d
 Error creating %stest0.dbm