Refactor

danog · danog · commit 5324acff699b · 2025-07-17T14:52:00.000+02:00
diff --git a/php_phongo.c b/php_phongo.c
@@ -159,7 +159,7 @@ static HashTable* php_phongo_std_get_gc(zend_object* object, zval** table, int*
 {
 	*table = NULL;
 	*n     = 0;
-	return zend_std_get_properties(object);
+	return object->handlers->get_properties(object);
 }
 
 PHP_MINIT_FUNCTION(mongodb) /* {{{ */
diff --git a/php_phongo.h b/php_phongo.h
@@ -60,28 +60,6 @@ ZEND_TSRMLS_CACHE_EXTERN()
 
 zend_object_handlers* phongo_get_std_object_handlers(void);
 
-#define PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, size) \
-	do {                                                                  \
-		if (is_temp) {                                                    \
-			ALLOC_HASHTABLE(props);                                       \
-			zend_hash_init((props), (size), NULL, ZVAL_PTR_DTOR, 0);      \
-		} else if ((intern)->properties) {                                \
-			(props) = (intern)->properties;                               \
-		} else {                                                          \
-			ALLOC_HASHTABLE(props);                                       \
-			zend_hash_init((props), (size), NULL, ZVAL_PTR_DTOR, 0);      \
-			(intern)->properties = (props);                               \
-		}                                                                 \
-	} while (0)
-
-#define PHONGO_GET_PROPERTY_HASH_FREE_PROPS(is_temp, props) \
-	do {                                                    \
-		if (is_temp) {                                      \
-			zend_hash_destroy((props));                     \
-			FREE_HASHTABLE(props);                          \
-		}                                                   \
-	} while (0)
-
 #define PHONGO_ZVAL_EXCEPTION_NAME(e) (ZSTR_VAL(e->ce->name))
 
 #define PHONGO_SET_CREATED_BY_PID(intern)          \
diff --git a/src/BSON/Binary.c b/src/BSON/Binary.c
@@ -70,7 +70,7 @@ static HashTable* php_phongo_binary_get_properties_hash(zend_object* object, boo
 
 	intern = Z_OBJ_BINARY(object);
 
-	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 2);
+	props = zend_std_get_properties(object);
 
 	if (!intern->data) {
 		return props;
diff --git a/src/BSON/DBPointer.c b/src/BSON/DBPointer.c
@@ -71,7 +71,7 @@ HashTable* php_phongo_dbpointer_get_properties_hash(zend_object* object, bool is
 
 	intern = Z_OBJ_DBPOINTER(object);
 
-	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 2);
+	props = zend_std_get_properties(object);
 
 	if (!intern->ref) {
 		return props;
diff --git a/src/BSON/Decimal128.c b/src/BSON/Decimal128.c
@@ -61,7 +61,7 @@ static HashTable* php_phongo_decimal128_get_properties_hash(zend_object* object,
 
 	intern = Z_OBJ_DECIMAL128(object);
 
-	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 1);
+	props = zend_std_get_properties(object);
 
 	if (!intern->initialized) {
 		return props;
diff --git a/src/BSON/Document.c b/src/BSON/Document.c
@@ -62,7 +62,7 @@ static HashTable* php_phongo_document_get_properties_hash(zend_object* object, b
 
 	intern = Z_OBJ_DOCUMENT(object);
 
-	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, size);
+	props = zend_std_get_properties(object);
 
 	if (!intern->bson) {
 		return props;
@@ -514,17 +514,13 @@ static HashTable* php_phongo_document_get_debug_info(zend_object* object, int* i
 		state.map.document.type = PHONGO_TYPEMAP_BSON;
 		if (!php_phongo_bson_to_zval_ex(intern->bson, &state)) {
 			zval_ptr_dtor(&state.zchild);
-			goto failure;
+			return NULL;
 		}
 
 		zend_hash_str_update(props, "value", sizeof("value") - 1, &state.zchild);
 	}
 
 	return props;
-
-failure:
-	PHONGO_GET_PROPERTY_HASH_FREE_PROPS(is_temp, props);
-	return NULL;
 }
 
 static HashTable* php_phongo_document_get_properties(zend_object* object)
diff --git a/src/BSON/Int64.c b/src/BSON/Int64.c
@@ -69,7 +69,7 @@ HashTable* php_phongo_int64_get_properties_hash(zend_object* object, bool is_tem
 
 	intern = Z_OBJ_INT64(object);
 
-	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 2);
+	props = zend_std_get_properties(object);
 
 	if (!intern->initialized) {
 		return props;
diff --git a/src/BSON/Iterator.c b/src/BSON/Iterator.c
@@ -160,7 +160,7 @@ static HashTable* php_phongo_iterator_get_properties_hash(zend_object* object, b
 
 	intern = Z_OBJ_ITERATOR(object);
 
-	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 1);
+	props = zend_std_get_properties(object);
 
 	zend_hash_str_update(props, "bson", sizeof("bson") - 1, &intern->bson);
 	Z_TRY_ADDREF(intern->bson);
diff --git a/src/BSON/Javascript.c b/src/BSON/Javascript.c
@@ -76,7 +76,7 @@ HashTable* php_phongo_javascript_get_properties_hash(zend_object* object, bool i
 
 	intern = Z_OBJ_JAVASCRIPT(object);
 
-	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 2);
+	props = zend_std_get_properties(object);
 
 	if (!intern->code) {
 		return props;
@@ -94,7 +94,7 @@ HashTable* php_phongo_javascript_get_properties_hash(zend_object* object, bool i
 			PHONGO_BSON_INIT_STATE(state);
 			if (!php_phongo_bson_to_zval_ex(intern->scope, &state)) {
 				zval_ptr_dtor(&state.zchild);
-				goto failure;
+				return NULL;
 			}
 
 			zend_hash_str_update(props, "scope", sizeof("scope") - 1, &state.zchild);
@@ -107,10 +107,6 @@ HashTable* php_phongo_javascript_get_properties_hash(zend_object* object, bool i
 	}
 
 	return props;
-
-failure:
-	PHONGO_GET_PROPERTY_HASH_FREE_PROPS(is_temp, props);
-	return NULL;
 }
 
 /* Construct a new BSON Javascript type. The scope is a document mapping
diff --git a/src/BSON/ObjectId.c b/src/BSON/ObjectId.c
@@ -84,7 +84,7 @@ static HashTable* php_phongo_objectid_get_properties_hash(zend_object* object, b
 
 	intern = Z_OBJ_OBJECTID(object);
 
-	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 1);
+	props = zend_std_get_properties(object);
 
 	if (!intern->initialized) {
 		return props;
diff --git a/src/BSON/PackedArray.c b/src/BSON/PackedArray.c
@@ -63,7 +63,7 @@ static HashTable* php_phongo_packedarray_get_properties_hash(zend_object* object
 
 	intern = Z_OBJ_PACKEDARRAY(object);
 
-	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, size);
+	props = zend_std_get_properties(object);
 
 	if (!intern->bson) {
 		return props;
@@ -499,17 +499,13 @@ static HashTable* php_phongo_packedarray_get_debug_info(zend_object* object, int
 		state.map.document.type = PHONGO_TYPEMAP_BSON;
 		if (!php_phongo_bson_to_zval_ex(intern->bson, &state)) {
 			zval_ptr_dtor(&state.zchild);
-			goto failure;
+			return NULL;
 		}
 
 		zend_hash_str_update(props, "value", sizeof("value") - 1, &state.zchild);
 	}
 
 	return props;
-
-failure:
-	PHONGO_GET_PROPERTY_HASH_FREE_PROPS(is_temp, props);
-	return NULL;
 }
 
 static HashTable* php_phongo_packedarray_get_properties(zend_object* object)
diff --git a/src/BSON/Regex.c b/src/BSON/Regex.c
@@ -85,7 +85,7 @@ static HashTable* php_phongo_regex_get_properties_hash(zend_object* object, bool
 
 	intern = Z_OBJ_REGEX(object);
 
-	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 2);
+	props = zend_std_get_properties(object);
 
 	if (!intern->pattern) {
 		return props;
diff --git a/src/BSON/Symbol.c b/src/BSON/Symbol.c
@@ -59,7 +59,7 @@ HashTable* php_phongo_symbol_get_properties_hash(zend_object* object, bool is_te
 
 	intern = Z_OBJ_SYMBOL(object);
 
-	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 2);
+	props = zend_std_get_properties(object);
 
 	if (!intern->symbol) {
 		return props;
diff --git a/src/BSON/Timestamp.c b/src/BSON/Timestamp.c
@@ -96,7 +96,7 @@ static HashTable* php_phongo_timestamp_get_properties_hash(zend_object* object,
 
 	intern = Z_OBJ_TIMESTAMP(object);
 
-	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 2);
+	props = zend_std_get_properties(object);
 
 	if (!intern->initialized) {
 		return props;
diff --git a/src/BSON/UTCDateTime.c b/src/BSON/UTCDateTime.c
@@ -128,7 +128,7 @@ static HashTable* php_phongo_utcdatetime_get_properties_hash(zend_object* object
 
 	intern = Z_OBJ_UTCDATETIME(object);
 
-	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 1);
+	props = zend_std_get_properties(object);
 
 	if (!intern->initialized) {
 		return props;
diff --git a/src/MongoDB/ReadConcern.c b/src/MongoDB/ReadConcern.c
@@ -130,7 +130,7 @@ static HashTable* php_phongo_readconcern_get_properties_hash(zend_object* object
 
 	intern = Z_OBJ_READCONCERN(object);
 
-	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 1);
+	props = zend_std_get_properties(object);
 
 	if (!intern->read_concern) {
 		return props;
diff --git a/src/MongoDB/ReadPreference.c b/src/MongoDB/ReadPreference.c
@@ -389,7 +389,7 @@ static HashTable* php_phongo_readpreference_get_properties_hash(zend_object* obj
 
 	intern = Z_OBJ_READPREFERENCE(object);
 
-	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 4);
+	props = zend_std_get_properties(object);
 
 	if (!intern->read_preference) {
 		return props;
diff --git a/src/MongoDB/ServerApi.c b/src/MongoDB/ServerApi.c
@@ -146,7 +146,7 @@ static HashTable* php_phongo_serverapi_get_properties_hash(zend_object* object,
 
 	intern = Z_OBJ_SERVERAPI(object);
 
-	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 1);
+	props = zend_std_get_properties(object);
 
 	ZVAL_STRING(&version, mongoc_server_api_version_to_string(mongoc_server_api_get_version(intern->server_api)));
 	zend_hash_str_add(props, "version", sizeof("version") - 1, &version);
diff --git a/src/MongoDB/ServerDescription.c b/src/MongoDB/ServerDescription.c
@@ -187,7 +187,7 @@ HashTable* php_phongo_serverdescription_get_properties_hash(zend_object* object,
 
 	intern = Z_OBJ_SERVERDESCRIPTION(object);
 
-	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_debug, intern, props, 6);
+	props = zend_std_get_properties(object);
 
 	if (!intern->server_description) {
 		return props;
diff --git a/src/MongoDB/TopologyDescription.c b/src/MongoDB/TopologyDescription.c
@@ -136,7 +136,7 @@ HashTable* php_phongo_topologydescription_get_properties_hash(zend_object* objec
 
 	intern = Z_OBJ_TOPOLOGYDESCRIPTION(object);
 
-	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_debug, intern, props, 2);
+	props = zend_std_get_properties(object);
 
 	if (!intern->topology_description) {
 		return props;
diff --git a/src/MongoDB/WriteConcern.c b/src/MongoDB/WriteConcern.c
@@ -272,7 +272,7 @@ static HashTable* php_phongo_writeconcern_get_properties_hash(zend_object* objec
 
 	intern = Z_OBJ_WRITECONCERN(object);
 
-	PHONGO_GET_PROPERTY_HASH_INIT_PROPS(is_temp, intern, props, 4);
+	props = zend_std_get_properties(object);
 
 	if (!intern->write_concern) {
 		return props;
diff --git a/tests/bson/bug1598-002.phpt b/tests/bson/bug1598-002.phpt
@@ -1,8 +1,5 @@
 --TEST--
 PHPC-1598: BSON type get_gc should delegate to zend_std_get_properties
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php skip_if_php_version('>=', '8.1.99'); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/readConcern/bug1598-002.phpt b/tests/readConcern/bug1598-002.phpt
@@ -1,8 +1,5 @@
 --TEST--
 PHPC-1598: ReadConcern get_gc should delegate to zend_std_get_properties
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php skip_if_php_version('>=', '8.1.99'); ?>
 --FILE--
 <?php
 
diff --git a/tests/readPreference/bug1598-002.phpt b/tests/readPreference/bug1598-002.phpt
@@ -1,8 +1,5 @@
 --TEST--
 PHPC-1598: ReadPreference get_gc should delegate to zend_std_get_properties
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php skip_if_php_version('>=', '8.1.99'); ?>
 --FILE--
 <?php
 
diff --git a/tests/writeConcern/bug1598-002.phpt b/tests/writeConcern/bug1598-002.phpt
@@ -1,8 +1,5 @@
 --TEST--
 PHPC-1598: WriteConcern get_gc should delegate to zend_std_get_properties
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php skip_if_php_version('>=', '8.1.99'); ?>
 --FILE--
 <?php
 

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ static HashTable* php_phongo_std_get_gc(zend_object* object, zval** table, int*`
`159`	`159`	`{`
`160`	`160`	`*table = NULL;`
`161`	`161`	`*n = 0;`
`162`		`- return zend_std_get_properties(object);`
	`162`	`+ return object->handlers->get_properties(object);`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`PHP_MINIT_FUNCTION(mongodb) /* {{{ */`