PHPC-369: Additional Z_<CLASSNAME>_OBJ_P() macros

Author: jmikola

php_phongo.c

@@ -264,7 +264,7 @@ void phongo_readpreference_init(zval *return_value, const mongoc_read_prefs_t *r
 
 	object_init_ex(return_value, php_phongo_readpreference_ce);
 
-	intern = (php_phongo_readpreference_t *)zend_object_store_get_object(return_value TSRMLS_CC);
+	intern = Z_READPREFERENCE_OBJ_P(return_value);
 	intern->read_preference = mongoc_read_prefs_copy(read_prefs);
 }
 /* }}} */
@@ -275,7 +275,7 @@ void phongo_writeconcern_init(zval *return_value, const mongoc_write_concern_t *
 
 	object_init_ex(return_value, php_phongo_writeconcern_ce);
 
-	intern = (php_phongo_writeconcern_t *)zend_object_store_get_object(return_value TSRMLS_CC);
+	intern = Z_WRITECONCERN_OBJ_P(return_value);
 	intern->write_concern = mongoc_write_concern_copy(write_concern);
 }
 /* }}} */

src/BSON/Javascript.c

@@ -149,7 +149,7 @@ HashTable *php_phongo_javascript_get_debug_info(zval *object, int *is_temp TSRML
 
 
 	*is_temp = 1;
-	intern = (php_phongo_javascript_t *)zend_object_store_get_object(object TSRMLS_CC);
+	intern =  Z_JAVASCRIPT_OBJ_P(object);
 
 	array_init(&retval);
 

src/BSON/Regex.c

@@ -215,7 +215,7 @@ HashTable *php_phongo_regex_get_debug_info(zval *object, int *is_temp TSRMLS_DC)
 
 
 	*is_temp = 1;
-	intern = (php_phongo_regex_t *)zend_object_store_get_object(object TSRMLS_CC);
+	intern =  Z_REGEX_OBJ_P(object);
 
 	array_init(&retval);
 

src/BSON/Timestamp.c

@@ -158,7 +158,7 @@ HashTable *php_phongo_timestamp_get_debug_info(zval *object, int *is_temp TSRMLS
 
 
 	*is_temp = 1;
-	intern = (php_phongo_timestamp_t *)zend_object_store_get_object(object TSRMLS_CC);
+	intern =  Z_TIMESTAMP_OBJ_P(object);
 
 	array_init(&retval);
 

src/BSON/UTCDateTime.c

@@ -189,7 +189,7 @@ HashTable *php_phongo_utcdatetime_get_debug_info(zval *object, int *is_temp TSRM
 #endif
 
 	*is_temp = 1;
-	intern = (php_phongo_utcdatetime_t *)zend_object_store_get_object(object TSRMLS_CC);
+	intern =  Z_UTCDATETIME_OBJ_P(object);
 
 	array_init(&retval);
 

src/MongoDB/ReadPreference.c

@@ -102,7 +102,7 @@ PHP_METHOD(ReadPreference, getMode)
 	php_phongo_readpreference_t *intern;
 	(void)return_value_ptr; (void)return_value_used;
 
-	intern = (php_phongo_readpreference_t *)zend_object_store_get_object(getThis() TSRMLS_CC);
+	intern = Z_READPREFERENCE_OBJ_P(getThis());
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
@@ -119,7 +119,7 @@ PHP_METHOD(ReadPreference, getTagSets)
 	php_phongo_readpreference_t *intern;
 	(void)return_value_ptr; (void)return_value_used;
 
-	intern = (php_phongo_readpreference_t *)zend_object_store_get_object(getThis() TSRMLS_CC);
+	intern = Z_READPREFERENCE_OBJ_P(getThis());
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;

src/MongoDB/WriteConcern.c

@@ -112,7 +112,7 @@ PHP_METHOD(WriteConcern, getW)
 	const char *wtag;
 	(void)return_value_ptr; (void)return_value_used;
 
-	intern = (php_phongo_writeconcern_t *)zend_object_store_get_object(getThis() TSRMLS_CC);
+	intern = Z_WRITECONCERN_OBJ_P(getThis());
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
@@ -143,7 +143,7 @@ PHP_METHOD(WriteConcern, getWtimeout)
 	php_phongo_writeconcern_t *intern;
 	(void)return_value_ptr; (void)return_value_used;
 
-	intern = (php_phongo_writeconcern_t *)zend_object_store_get_object(getThis() TSRMLS_CC);
+	intern = Z_WRITECONCERN_OBJ_P(getThis());
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
@@ -160,7 +160,7 @@ PHP_METHOD(WriteConcern, getJournal)
 	php_phongo_writeconcern_t *intern;
 	(void)return_value_ptr; (void)return_value_used;
 
-	intern = (php_phongo_writeconcern_t *)zend_object_store_get_object(getThis() TSRMLS_CC);
+	intern = Z_WRITECONCERN_OBJ_P(getThis());
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;