PHPC-1442: Remove PHONGO_ZEND_OBJECT_* macros

Author: alcaeus

php_phongo_structs.h

@@ -21,38 +21,30 @@
 
 #include "php_bson.h"
 
-#define PHONGO_ZEND_OBJECT_PRE
-#define PHONGO_ZEND_OBJECT_POST zend_object std;
-#define PHONGO_STRUCT_ZVAL zval
-
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
 	mongoc_bulk_operation_t* bulk;
 	size_t                   num_ops;
 	bool                     ordered;
 	int                      bypass;
 	char*                    database;
 	char*                    collection;
 	bool                     executed;
-	PHONGO_ZEND_OBJECT_POST
+	zend_object              std;
 } php_phongo_bulkwrite_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
 	mongoc_client_encryption_t* client_encryption;
-	PHONGO_ZEND_OBJECT_POST
+	zend_object                 std;
 } php_phongo_clientencryption_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
-	bson_t*  bson;
-	uint32_t max_await_time_ms;
-	uint32_t batch_size;
-	PHONGO_ZEND_OBJECT_POST
+	bson_t*     bson;
+	uint32_t    max_await_time_ms;
+	uint32_t    batch_size;
+	zend_object std;
 } php_phongo_command_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
 	mongoc_cursor_t*      cursor;
 	mongoc_client_t*      client;
 	int                   created_by_pid;
@@ -63,242 +55,211 @@ typedef struct {
 	long                  current;
 	char*                 database;
 	char*                 collection;
-	PHONGO_STRUCT_ZVAL    query;
-	PHONGO_STRUCT_ZVAL    command;
-	PHONGO_STRUCT_ZVAL    read_preference;
-	PHONGO_STRUCT_ZVAL    session;
-	PHONGO_ZEND_OBJECT_POST
+	zval                  query;
+	zval                  command;
+	zval                  read_preference;
+	zval                  session;
+	zend_object           std;
 } php_phongo_cursor_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
-	int64_t id;
-	PHONGO_ZEND_OBJECT_POST
+	int64_t     id;
+	zend_object std;
 } php_phongo_cursorid_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
 	mongoc_client_t* client;
 	int              created_by_pid;
 	char*            client_hash;
 	size_t           client_hash_len;
-	PHONGO_ZEND_OBJECT_POST
+	zend_object      std;
 } php_phongo_manager_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
 	bson_t*                filter;
 	bson_t*                opts;
 	mongoc_read_concern_t* read_concern;
 	uint32_t               max_await_time_ms;
-	PHONGO_ZEND_OBJECT_POST
+	zend_object            std;
 } php_phongo_query_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
 	mongoc_read_concern_t* read_concern;
 	HashTable*             properties;
-	PHONGO_ZEND_OBJECT_POST
+	zend_object            std;
 } php_phongo_readconcern_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
 	mongoc_read_prefs_t* read_preference;
 	HashTable*           properties;
-	PHONGO_ZEND_OBJECT_POST
+	zend_object          std;
 } php_phongo_readpreference_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
 	mongoc_client_t* client;
 	int              created_by_pid;
 	uint32_t         server_id;
-	PHONGO_ZEND_OBJECT_POST
+	zend_object      std;
 } php_phongo_server_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
 	mongoc_client_session_t* client_session;
 	mongoc_client_t*         client;
 	int                      created_by_pid;
-	PHONGO_ZEND_OBJECT_POST
+	zend_object              std;
 } php_phongo_session_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
 	HashTable*              properties;
 	mongoc_write_concern_t* write_concern;
-	PHONGO_ZEND_OBJECT_POST
+	zend_object             std;
 } php_phongo_writeconcern_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
-	int                code;
-	char*              message;
-	PHONGO_STRUCT_ZVAL info;
-	PHONGO_ZEND_OBJECT_POST
+	int         code;
+	char*       message;
+	zval        info;
+	zend_object std;
 } php_phongo_writeconcernerror_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
-	int                code;
-	char*              message;
-	PHONGO_STRUCT_ZVAL info;
-	uint32_t           index;
-	PHONGO_ZEND_OBJECT_POST
+	int         code;
+	char*       message;
+	zval        info;
+	uint32_t    index;
+	zend_object std;
 } php_phongo_writeerror_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
 	mongoc_write_concern_t* write_concern;
 	bson_t*                 reply;
 	mongoc_client_t*        client;
 	uint32_t                server_id;
-	PHONGO_ZEND_OBJECT_POST
+	zend_object             std;
 } php_phongo_writeresult_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
-	char*      data;
-	int        data_len;
-	uint8_t    type;
-	HashTable* properties;
-	PHONGO_ZEND_OBJECT_POST
+	char*       data;
+	int         data_len;
+	uint8_t     type;
+	HashTable*  properties;
+	zend_object std;
 } php_phongo_binary_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
-	char*      ref;
-	size_t     ref_len;
-	char       id[25];
-	HashTable* properties;
-	PHONGO_ZEND_OBJECT_POST
+	char*       ref;
+	size_t      ref_len;
+	char        id[25];
+	HashTable*  properties;
+	zend_object std;
 } php_phongo_dbpointer_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
 	bool              initialized;
 	bson_decimal128_t decimal;
 	HashTable*        properties;
-	PHONGO_ZEND_OBJECT_POST
+	zend_object       std;
 } php_phongo_decimal128_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
-	bool       initialized;
-	int64_t    integer;
-	HashTable* properties;
-	PHONGO_ZEND_OBJECT_POST
+	bool        initialized;
+	int64_t     integer;
+	HashTable*  properties;
+	zend_object std;
 } php_phongo_int64_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
-	char*      code;
-	size_t     code_len;
-	bson_t*    scope;
-	HashTable* properties;
-	PHONGO_ZEND_OBJECT_POST
+	char*       code;
+	size_t      code_len;
+	bson_t*     scope;
+	HashTable*  properties;
+	zend_object std;
 } php_phongo_javascript_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
-	PHONGO_ZEND_OBJECT_POST
+	zend_object std;
 } php_phongo_maxkey_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
-	PHONGO_ZEND_OBJECT_POST
+	zend_object std;
 } php_phongo_minkey_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
-	bool       initialized;
-	char       oid[25];
-	HashTable* properties;
-	PHONGO_ZEND_OBJECT_POST
+	bool        initialized;
+	char        oid[25];
+	HashTable*  properties;
+	zend_object std;
 } php_phongo_objectid_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
-	char*      pattern;
-	int        pattern_len;
-	char*      flags;
-	int        flags_len;
-	HashTable* properties;
-	PHONGO_ZEND_OBJECT_POST
+	char*       pattern;
+	int         pattern_len;
+	char*       flags;
+	int         flags_len;
+	HashTable*  properties;
+	zend_object std;
 } php_phongo_regex_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
-	char*      symbol;
-	size_t     symbol_len;
-	HashTable* properties;
-	PHONGO_ZEND_OBJECT_POST
+	char*       symbol;
+	size_t      symbol_len;
+	HashTable*  properties;
+	zend_object std;
 } php_phongo_symbol_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
-	bool       initialized;
-	uint32_t   increment;
-	uint32_t   timestamp;
-	HashTable* properties;
-	PHONGO_ZEND_OBJECT_POST
+	bool        initialized;
+	uint32_t    increment;
+	uint32_t    timestamp;
+	HashTable*  properties;
+	zend_object std;
 } php_phongo_timestamp_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
-	PHONGO_ZEND_OBJECT_POST
+	zend_object std;
 } php_phongo_undefined_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
-	bool       initialized;
-	int64_t    milliseconds;
-	HashTable* properties;
-	PHONGO_ZEND_OBJECT_POST
+	bool        initialized;
+	int64_t     milliseconds;
+	HashTable*  properties;
+	zend_object std;
 } php_phongo_utcdatetime_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
-	mongoc_client_t*   client;
-	char*              command_name;
-	uint32_t           server_id;
-	uint64_t           operation_id;
-	uint64_t           request_id;
-	uint64_t           duration_micros;
-	bson_t*            reply;
-	PHONGO_STRUCT_ZVAL z_error;
-	PHONGO_ZEND_OBJECT_POST
+	mongoc_client_t* client;
+	char*            command_name;
+	uint32_t         server_id;
+	uint64_t         operation_id;
+	uint64_t         request_id;
+	uint64_t         duration_micros;
+	bson_t*          reply;
+	zval             z_error;
+	zend_object      std;
 } php_phongo_commandfailedevent_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
 	mongoc_client_t* client;
 	char*            command_name;
 	uint32_t         server_id;
 	uint64_t         operation_id;
 	uint64_t         request_id;
 	bson_t*          command;
 	char*            database_name;
-	PHONGO_ZEND_OBJECT_POST
+	zend_object      std;
 } php_phongo_commandstartedevent_t;
 
 typedef struct {
-	PHONGO_ZEND_OBJECT_PRE
 	mongoc_client_t* client;
 	char*            command_name;
 	uint32_t         server_id;
 	uint64_t         operation_id;
 	uint64_t         request_id;
 	uint64_t         duration_micros;
 	bson_t*          reply;
-	PHONGO_ZEND_OBJECT_POST
+	zend_object      std;
 } php_phongo_commandsucceededevent_t;
 
-#undef PHONGO_ZEND_OBJECT_PRE
-#undef PHONGO_ZEND_OBJECT_POST
-#undef PHONGO_STRUCT_ZVAL
-
 #endif /* PHONGO_STRUCTS */
 
 /*