Cleanup

danog · danog · commit f8f1dcf54aa2 · 2025-07-17T14:55:44.000+02:00
diff --git a/src/BSON/Binary.c b/src/BSON/Binary.c
@@ -212,11 +212,6 @@ static void php_phongo_binary_free_object(zend_object* object)
 	if (intern->data) {
 		efree(intern->data);
 	}
-
-	if (intern->properties) {
-		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
-	}
 }
 
 static zend_object* php_phongo_binary_create_object(zend_class_entry* class_type)
diff --git a/src/BSON/DBPointer.c b/src/BSON/DBPointer.c
@@ -175,11 +175,6 @@ static void php_phongo_dbpointer_free_object(zend_object* object)
 	if (intern->ref) {
 		efree(intern->ref);
 	}
-
-	if (intern->properties) {
-		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
-	}
 }
 
 zend_object* php_phongo_dbpointer_create_object(zend_class_entry* class_type)
diff --git a/src/BSON/Decimal128.c b/src/BSON/Decimal128.c
@@ -167,11 +167,6 @@ static void php_phongo_decimal128_free_object(zend_object* object)
 	php_phongo_decimal128_t* intern = Z_OBJ_DECIMAL128(object);
 
 	zend_object_std_dtor(&intern->std);
-
-	if (intern->properties) {
-		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
-	}
 }
 
 static zend_object* php_phongo_decimal128_create_object(zend_class_entry* class_type)
diff --git a/src/BSON/Document.c b/src/BSON/Document.c
@@ -445,11 +445,6 @@ static void php_phongo_document_free_object(zend_object* object)
 	if (intern->bson) {
 		bson_destroy(intern->bson);
 	}
-
-	if (intern->properties) {
-		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
-	}
 }
 
 static zend_object* php_phongo_document_create_object(zend_class_entry* class_type)
diff --git a/src/BSON/Int64.c b/src/BSON/Int64.c
@@ -174,11 +174,6 @@ static void php_phongo_int64_free_object(zend_object* object)
 	php_phongo_int64_t* intern = Z_OBJ_INT64(object);
 
 	zend_object_std_dtor(&intern->std);
-
-	if (intern->properties) {
-		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
-	}
 }
 
 zend_object* php_phongo_int64_create_object(zend_class_entry* class_type)
diff --git a/src/BSON/Iterator.c b/src/BSON/Iterator.c
@@ -248,11 +248,6 @@ static void php_phongo_iterator_free_object(zend_object* object)
 
 	zend_object_std_dtor(&intern->std);
 
-	if (intern->properties) {
-		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
-	}
-
 	php_phongo_iterator_free_current(intern);
 
 	zval_ptr_dtor(&intern->bson);
diff --git a/src/BSON/Javascript.c b/src/BSON/Javascript.c
@@ -257,11 +257,6 @@ static void php_phongo_javascript_free_object(zend_object* object)
 		bson_destroy(intern->scope);
 		intern->scope = NULL;
 	}
-
-	if (intern->properties) {
-		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
-	}
 }
 
 zend_object* php_phongo_javascript_create_object(zend_class_entry* class_type)
diff --git a/src/BSON/ObjectId.c b/src/BSON/ObjectId.c
@@ -201,11 +201,6 @@ static void php_phongo_objectid_free_object(zend_object* object)
 	php_phongo_objectid_t* intern = Z_OBJ_OBJECTID(object);
 
 	zend_object_std_dtor(&intern->std);
-
-	if (intern->properties) {
-		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
-	}
 }
 
 static zend_object* php_phongo_objectid_create_object(zend_class_entry* class_type)
diff --git a/src/BSON/PackedArray.c b/src/BSON/PackedArray.c
@@ -429,11 +429,6 @@ static void php_phongo_packedarray_free_object(zend_object* object)
 	if (intern->bson) {
 		bson_destroy(intern->bson);
 	}
-
-	if (intern->properties) {
-		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
-	}
 }
 
 static zend_object* php_phongo_packedarray_create_object(zend_class_entry* class_type)
diff --git a/src/BSON/Regex.c b/src/BSON/Regex.c
@@ -227,11 +227,6 @@ static void php_phongo_regex_free_object(zend_object* object)
 	if (intern->flags) {
 		efree(intern->flags);
 	}
-
-	if (intern->properties) {
-		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
-	}
 }
 
 static zend_object* php_phongo_regex_create_object(zend_class_entry* class_type)
diff --git a/src/BSON/Symbol.c b/src/BSON/Symbol.c
@@ -149,11 +149,6 @@ static void php_phongo_symbol_free_object(zend_object* object)
 	if (intern->symbol) {
 		efree(intern->symbol);
 	}
-
-	if (intern->properties) {
-		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
-	}
 }
 
 zend_object* php_phongo_symbol_create_object(zend_class_entry* class_type)
diff --git a/src/BSON/Timestamp.c b/src/BSON/Timestamp.c
@@ -260,11 +260,6 @@ static void php_phongo_timestamp_free_object(zend_object* object)
 	php_phongo_timestamp_t* intern = Z_OBJ_TIMESTAMP(object);
 
 	zend_object_std_dtor(&intern->std);
-
-	if (intern->properties) {
-		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
-	}
 }
 
 static zend_object* php_phongo_timestamp_create_object(zend_class_entry* class_type)
diff --git a/src/BSON/UTCDateTime.c b/src/BSON/UTCDateTime.c
@@ -300,11 +300,6 @@ static void php_phongo_utcdatetime_free_object(zend_object* object)
 	php_phongo_utcdatetime_t* intern = Z_OBJ_UTCDATETIME(object);
 
 	zend_object_std_dtor(&intern->std);
-
-	if (intern->properties) {
-		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
-	}
 }
 
 static zend_object* php_phongo_utcdatetime_create_object(zend_class_entry* class_type)
diff --git a/src/MongoDB/ReadConcern.c b/src/MongoDB/ReadConcern.c
@@ -183,11 +183,6 @@ static void php_phongo_readconcern_free_object(zend_object* object)
 
 	zend_object_std_dtor(&intern->std);
 
-	if (intern->properties) {
-		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
-	}
-
 	if (intern->read_concern) {
 		mongoc_read_concern_destroy(intern->read_concern);
 	}
diff --git a/src/MongoDB/ReadPreference.c b/src/MongoDB/ReadPreference.c
@@ -483,11 +483,6 @@ static void php_phongo_readpreference_free_object(zend_object* object)
 
 	zend_object_std_dtor(&intern->std);
 
-	if (intern->properties) {
-		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
-	}
-
 	if (intern->read_preference) {
 		mongoc_read_prefs_destroy(intern->read_preference);
 	}
diff --git a/src/MongoDB/ServerApi.c b/src/MongoDB/ServerApi.c
@@ -211,11 +211,6 @@ static void php_phongo_serverapi_free_object(zend_object* object)
 
 	zend_object_std_dtor(&intern->std);
 
-	if (intern->properties) {
-		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
-	}
-
 	if (intern->server_api) {
 		mongoc_server_api_destroy(intern->server_api);
 	}
diff --git a/src/MongoDB/ServerDescription.c b/src/MongoDB/ServerDescription.c
@@ -158,11 +158,6 @@ static void php_phongo_serverdescription_free_object(zend_object* object)
 
 	zend_object_std_dtor(&intern->std);
 
-	if (intern->properties) {
-		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
-	}
-
 	if (intern->server_description) {
 		mongoc_server_description_destroy(intern->server_description);
 	}
diff --git a/src/MongoDB/TopologyDescription.c b/src/MongoDB/TopologyDescription.c
@@ -107,11 +107,6 @@ static void php_phongo_topologydescription_free_object(zend_object* object)
 
 	zend_object_std_dtor(&intern->std);
 
-	if (intern->properties) {
-		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
-	}
-
 	if (intern->topology_description) {
 		mongoc_topology_description_destroy(intern->topology_description);
 	}
diff --git a/src/MongoDB/WriteConcern.c b/src/MongoDB/WriteConcern.c
@@ -368,11 +368,6 @@ static void php_phongo_writeconcern_free_object(zend_object* object)
 
 	zend_object_std_dtor(&intern->std);
 
-	if (intern->properties) {
-		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
-	}
-
 	if (intern->write_concern) {
 		mongoc_write_concern_destroy(intern->write_concern);
 	}
diff --git a/src/phongo_structs.h b/src/phongo_structs.h
@@ -121,13 +121,11 @@ typedef struct {
 
 typedef struct {
 	mongoc_read_concern_t* read_concern;
-	HashTable*             properties;
 	zend_object            std;
 } php_phongo_readconcern_t;
 
 typedef struct {
 	mongoc_read_prefs_t* read_preference;
-	HashTable*           properties;
 	zend_object          std;
 } php_phongo_readpreference_t;
 
@@ -140,13 +138,11 @@ typedef struct {
 
 typedef struct {
 	mongoc_server_api_t* server_api;
-	HashTable*           properties;
 	zend_object          std;
 } php_phongo_serverapi_t;
 
 typedef struct {
 	mongoc_server_description_t* server_description;
-	HashTable*                   properties;
 	zend_object                  std;
 } php_phongo_serverdescription_t;
 
@@ -159,12 +155,10 @@ typedef struct {
 
 typedef struct {
 	mongoc_topology_description_t* topology_description;
-	HashTable*                     properties;
 	zend_object                    std;
 } php_phongo_topologydescription_t;
 
 typedef struct {
-	HashTable*              properties;
 	mongoc_write_concern_t* write_concern;
 	zend_object             std;
 } php_phongo_writeconcern_t;
@@ -196,19 +190,16 @@ typedef struct {
 	char*       data;
 	int         data_len;
 	uint8_t     type;
-	HashTable*  properties;
 	zend_object std;
 } php_phongo_binary_t;
 
 typedef struct {
 	bson_t*     bson;
-	HashTable*  properties;
 	zend_object std;
 } php_phongo_packedarray_t;
 
 typedef struct {
 	bson_t*     bson;
-	HashTable*  properties;
 	zend_object std;
 } php_phongo_document_t;
 
@@ -219,37 +210,32 @@ typedef struct {
 	bool        is_array;
 	size_t      key;
 	zval        current;
-	HashTable*  properties;
 	zend_object std;
 } php_phongo_iterator_t;
 
 typedef struct {
 	char*       ref;
 	size_t      ref_len;
 	char        id[25];
-	HashTable*  properties;
 	zend_object std;
 } php_phongo_dbpointer_t;
 
 typedef struct {
 	bool              initialized;
 	bson_decimal128_t decimal;
-	HashTable*        properties;
 	zend_object       std;
 } php_phongo_decimal128_t;
 
 typedef struct {
 	bool        initialized;
 	int64_t     integer;
-	HashTable*  properties;
 	zend_object std;
 } php_phongo_int64_t;
 
 typedef struct {
 	char*       code;
 	size_t      code_len;
 	bson_t*     scope;
-	HashTable*  properties;
 	zend_object std;
 } php_phongo_javascript_t;
 
@@ -264,7 +250,6 @@ typedef struct {
 typedef struct {
 	bool        initialized;
 	char        oid[25];
-	HashTable*  properties;
 	zend_object std;
 } php_phongo_objectid_t;
 
@@ -273,22 +258,19 @@ typedef struct {
 	int         pattern_len;
 	char*       flags;
 	int         flags_len;
-	HashTable*  properties;
 	zend_object std;
 } php_phongo_regex_t;
 
 typedef struct {
 	char*       symbol;
 	size_t      symbol_len;
-	HashTable*  properties;
 	zend_object std;
 } php_phongo_symbol_t;
 
 typedef struct {
 	bool        initialized;
 	uint32_t    increment;
 	uint32_t    timestamp;
-	HashTable*  properties;
 	zend_object std;
 } php_phongo_timestamp_t;
 
@@ -299,7 +281,6 @@ typedef struct {
 typedef struct {
 	bool        initialized;
 	int64_t     milliseconds;
-	HashTable*  properties;
 	zend_object std;
 } php_phongo_utcdatetime_t;
 

Original file line number	Diff line number	Diff line change
`@@ -212,11 +212,6 @@ static void php_phongo_binary_free_object(zend_object* object)`
`212`	`212`	`if (intern->data) {`
`213`	`213`	`efree(intern->data);`
`214`	`214`	`}`
`215`		`-`
`216`		`- if (intern->properties) {`
`217`		`- zend_hash_destroy(intern->properties);`
`218`		`- FREE_HASHTABLE(intern->properties);`
`219`		`- }`
`220`	`215`	`}`
`221`	`216`
`222`	`217`	`static zend_object* php_phongo_binary_create_object(zend_class_entry* class_type)`
Original file line number	Diff line number	Diff line change
`@@ -175,11 +175,6 @@ static void php_phongo_dbpointer_free_object(zend_object* object)`
`175`	`175`	`if (intern->ref) {`
`176`	`176`	`efree(intern->ref);`
`177`	`177`	`}`
`178`		`-`
`179`		`- if (intern->properties) {`
`180`		`- zend_hash_destroy(intern->properties);`
`181`		`- FREE_HASHTABLE(intern->properties);`
`182`		`- }`
`183`	`178`	`}`
`184`	`179`
`185`	`180`	`zend_object* php_phongo_dbpointer_create_object(zend_class_entry* class_type)`
Original file line number	Diff line number	Diff line change
`@@ -445,11 +445,6 @@ static void php_phongo_document_free_object(zend_object* object)`
`445`	`445`	`if (intern->bson) {`
`446`	`446`	`bson_destroy(intern->bson);`
`447`	`447`	`}`
`448`		`-`
`449`		`- if (intern->properties) {`
`450`		`- zend_hash_destroy(intern->properties);`
`451`		`- FREE_HASHTABLE(intern->properties);`
`452`		`- }`
`453`	`448`	`}`
`454`	`449`
`455`	`450`	`static zend_object* php_phongo_document_create_object(zend_class_entry* class_type)`
Original file line number	Diff line number	Diff line change
`@@ -257,11 +257,6 @@ static void php_phongo_javascript_free_object(zend_object* object)`
`257`	`257`	`bson_destroy(intern->scope);`
`258`	`258`	`intern->scope = NULL;`
`259`	`259`	`}`
`260`		`-`
`261`		`- if (intern->properties) {`
`262`		`- zend_hash_destroy(intern->properties);`
`263`		`- FREE_HASHTABLE(intern->properties);`
`264`		`- }`
`265`	`260`	`}`
`266`	`261`
`267`	`262`	`zend_object* php_phongo_javascript_create_object(zend_class_entry* class_type)`
Original file line number	Diff line number	Diff line change
`@@ -429,11 +429,6 @@ static void php_phongo_packedarray_free_object(zend_object* object)`
`429`	`429`	`if (intern->bson) {`
`430`	`430`	`bson_destroy(intern->bson);`
`431`	`431`	`}`
`432`		`-`
`433`		`- if (intern->properties) {`
`434`		`- zend_hash_destroy(intern->properties);`
`435`		`- FREE_HASHTABLE(intern->properties);`
`436`		`- }`
`437`	`432`	`}`
`438`	`433`
`439`	`434`	`static zend_object* php_phongo_packedarray_create_object(zend_class_entry* class_type)`
Original file line number	Diff line number	Diff line change
`@@ -227,11 +227,6 @@ static void php_phongo_regex_free_object(zend_object* object)`
`227`	`227`	`if (intern->flags) {`
`228`	`228`	`efree(intern->flags);`
`229`	`229`	`}`
`230`		`-`
`231`		`- if (intern->properties) {`
`232`		`- zend_hash_destroy(intern->properties);`
`233`		`- FREE_HASHTABLE(intern->properties);`
`234`		`- }`
`235`	`230`	`}`
`236`	`231`
`237`	`232`	`static zend_object* php_phongo_regex_create_object(zend_class_entry* class_type)`