Define ZSTR_VAL() for PHP 5 and remove phongo_str() macro

Author: jmikola

phongo_compat.h

@@ -116,7 +116,6 @@
 #  error Unsupported architecture (integers are neither 32-bit nor 64-bit)
 #endif
 # define SIZEOF_PHONGO_LONG SIZEOF_ZEND_LONG
-# define phongo_str(str) (str)->val
 # define phongo_create_object_retval zend_object*
 # define PHONGO_ALLOC_OBJECT_T(_obj_t, _class_type) (_obj_t *)ecalloc(1, sizeof(_obj_t)+zend_object_properties_size(_class_type))
 # define PHONGO_TSRMLS_FETCH_FROM_CTX(user_data)
@@ -147,7 +146,7 @@
 # define phongo_long long
 # define PHONGO_LONG_FORMAT "ld"
 # define SIZEOF_PHONGO_LONG SIZEOF_LONG
-# define phongo_str(str) str
+# define ZSTR_VAL(str) str
 # define phongo_create_object_retval zend_object_value
 # define PHONGO_ALLOC_OBJECT_T(_obj_t, _class_type) (_obj_t *)ecalloc(1, sizeof(_obj_t))
 # define PHONGO_TSRMLS_FETCH_FROM_CTX(user_data) TSRMLS_FETCH_FROM_CTX(user_data)

php_phongo.c

@@ -224,7 +224,7 @@ static void php_phongo_log(mongoc_log_level_t log_level, const char *log_domain,
 			time(&t);
 			dt = php_format_date((char *)"Y-m-d\\TH:i:sP", strlen("Y-m-d\\TH:i:sP"), t, 0 TSRMLS_CC);
 
-			fprintf(MONGODB_G(debug_fd), "[%s] %10s: %-8s> %s\n", phongo_str(dt), log_domain, mongoc_log_level_str(log_level), message);
+			fprintf(MONGODB_G(debug_fd), "[%s] %10s: %-8s> %s\n", ZSTR_VAL(dt), log_domain, mongoc_log_level_str(log_level), message);
 			fflush(MONGODB_G(debug_fd));
 			efree(dt);
 		} break;
@@ -1236,7 +1236,7 @@ mongoc_stream_t* phongo_stream_initiator(const mongoc_uri_t *uri, const mongoc_h
 	zend_restore_error_handling(&error_handling TSRMLS_CC);
 
 	if (!stream) {
-		bson_set_error (error, MONGOC_ERROR_STREAM, MONGOC_ERROR_STREAM_CONNECT, "Failed connecting to '%s:%d': %s", host->host, host->port, phongo_str(errmsg));
+		bson_set_error (error, MONGOC_ERROR_STREAM, MONGOC_ERROR_STREAM_CONNECT, "Failed connecting to '%s:%d': %s", host->host, host->port, ZSTR_VAL(errmsg));
 		efree(dsn);
 		efree(uniqid);
 		if (errmsg) {
@@ -2342,11 +2342,11 @@ ZEND_INI_MH(OnUpdateDebug)
 		MONGODB_G(debug_fd) = NULL;
 	}
 
-	if (!new_value || (new_value && !phongo_str(new_value)[0])
-		|| strcasecmp("0", phongo_str(new_value)) == 0
-		|| strcasecmp("off", phongo_str(new_value)) == 0
-		|| strcasecmp("no", phongo_str(new_value)) == 0
-		|| strcasecmp("false", phongo_str(new_value)) == 0
+	if (!new_value || (new_value && !ZSTR_VAL(new_value)[0])
+		|| strcasecmp("0", ZSTR_VAL(new_value)) == 0
+		|| strcasecmp("off", ZSTR_VAL(new_value)) == 0
+		|| strcasecmp("no", ZSTR_VAL(new_value)) == 0
+		|| strcasecmp("false", ZSTR_VAL(new_value)) == 0
 	   ) {
 		mongoc_log_trace_disable();
 		mongoc_log_set_handler(NULL, NULL);
@@ -2359,19 +2359,19 @@ ZEND_INI_MH(OnUpdateDebug)
 	}
 
 
-	if (strcasecmp(phongo_str(new_value), "stderr") == 0) {
+	if (strcasecmp(ZSTR_VAL(new_value), "stderr") == 0) {
 		MONGODB_G(debug_fd) = stderr;
-	} else if (strcasecmp(phongo_str(new_value), "stdout") == 0) {
+	} else if (strcasecmp(ZSTR_VAL(new_value), "stdout") == 0) {
 		MONGODB_G(debug_fd) = stdout;
 	} else if (
-		strcasecmp("1", phongo_str(new_value)) == 0
-		|| strcasecmp("on", phongo_str(new_value)) == 0
-		|| strcasecmp("yes", phongo_str(new_value)) == 0
-		|| strcasecmp("true", phongo_str(new_value)) == 0
+		strcasecmp("1", ZSTR_VAL(new_value)) == 0
+		|| strcasecmp("on", ZSTR_VAL(new_value)) == 0
+		|| strcasecmp("yes", ZSTR_VAL(new_value)) == 0
+		|| strcasecmp("true", ZSTR_VAL(new_value)) == 0
 	) {
 		tmp_dir = NULL;
 	} else {
-		tmp_dir = phongo_str(new_value);
+		tmp_dir = ZSTR_VAL(new_value);
 	}
 
 	if (!MONGODB_G(debug_fd)) {
@@ -2386,7 +2386,7 @@ ZEND_INI_MH(OnUpdateDebug)
 
 		fd = php_open_temporary_fd(tmp_dir, prefix, &filename TSRMLS_CC);
 		if (fd != -1) {
-			const char *path = phongo_str(filename);
+			const char *path = ZSTR_VAL(filename);
 			MONGODB_G(debug_fd) = VCWD_FOPEN(path, "a");
 		}
 		efree(filename);

src/BSON/UTCDateTime.c

@@ -140,10 +140,7 @@ PHP_METHOD(UTCDateTime, __construct)
 			php_phongo_utcdatetime_init_from_date(intern, Z_PHPDATE_P(datetime));
 #endif
 		} else {
-			phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC,
-				"Expected instance of DateTimeInterface, %s given",
-				phongo_str(Z_OBJCE_P(datetime)->name)
-			);
+			phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected instance of DateTimeInterface, %s given", ZSTR_VAL(Z_OBJCE_P(datetime)->name));
 		}
 
 		zend_restore_error_handling(&error_handling TSRMLS_CC);

src/MongoDB/Query.c

@@ -83,11 +83,7 @@ PHP_METHOD(Query, __construct)
 			zval *zread_concern = php_array_fetchc(zoptions, "readConcern");
 
 			if (Z_TYPE_P(zread_concern) != IS_OBJECT || !instanceof_function(Z_OBJCE_P(zread_concern), php_phongo_readconcern_ce TSRMLS_CC)) {
-#if PHP_VERSION_ID >= 70000
 				phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected \"readConcern\" option to be %s, %s given", ZSTR_VAL(php_phongo_readconcern_ce->name), zend_get_type_by_const(Z_TYPE_P(zread_concern)));
-#else
-				phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected \"readConcern\" option to be %s, %s given", php_phongo_readconcern_ce->name, zend_get_type_by_const(Z_TYPE_P(zread_concern)));
-#endif
 				bson_clear(&intern->query);
 				return;
 			}

src/bson.c

@@ -1012,11 +1012,7 @@ void object_to_bson(zval *object, php_phongo_bson_flags_t flags, const char *key
 			return;
 		}
 
-#if PHP_VERSION_ID >= 70000
 		phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Unexpected %s instance: %s", ZSTR_VAL(php_phongo_type_ce->name), ZSTR_VAL(Z_OBJCE_P(object)->name));
-#else
-		phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Unexpected %s instance: %s", php_phongo_type_ce->name, Z_OBJCE_P(object)->name);
-#endif
 		return;
 	}
 
@@ -1218,11 +1214,7 @@ PHONGO_API void phongo_zval_to_bson(zval *data, php_phongo_bson_flags_t flags, b
 			}
 
 			if (instanceof_function(Z_OBJCE_P(data), php_phongo_type_ce TSRMLS_CC)) {
-#if PHP_VERSION_ID >= 70000
 				phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "%s instance %s cannot be serialized as a root element", ZSTR_VAL(php_phongo_type_ce->name), ZSTR_VAL(Z_OBJCE_P(data)->name));
-#else
-				phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "%s instance %s cannot be serialized as a root element", php_phongo_type_ce->name, Z_OBJCE_P(data)->name);
-#endif
 
 				break;
 			}