PHPC-380: Use the compatability macros to get the object

Author: bjori

src/MongoDB/BulkWrite.c

@@ -272,7 +272,7 @@ static zend_function_entry php_phongo_bulkwrite_me[] = {
 /* {{{ php_phongo_bulkwrite_t object handlers */
 static void php_phongo_bulkwrite_free_object(phongo_free_object_arg *object TSRMLS_DC) /* {{{ */
 {
-	php_phongo_bulkwrite_t *intern = (php_phongo_bulkwrite_t*)object;
+	php_phongo_bulkwrite_t *intern = Z_OBJ_BULKWRITE(object);
 
 	zend_object_std_dtor(&intern->std TSRMLS_CC);
 

src/MongoDB/Command.c

@@ -94,7 +94,7 @@ static zend_function_entry php_phongo_command_me[] = {
 /* {{{ php_phongo_command_t object handlers */
 static void php_phongo_command_free_object(phongo_free_object_arg *object TSRMLS_DC) /* {{{ */
 {
-	php_phongo_command_t *intern = (php_phongo_command_t*)object;
+	php_phongo_command_t *intern = Z_OBJ_COMMAND(object);
 
 	zend_object_std_dtor(&intern->std TSRMLS_CC);
 

src/MongoDB/Cursor.c

@@ -216,7 +216,7 @@ static zend_function_entry php_phongo_cursor_me[] = {
 /* {{{ php_phongo_cursor_t object handlers */
 static void php_phongo_cursor_free_object(phongo_free_object_arg *object TSRMLS_DC) /* {{{ */
 {
-	php_phongo_cursor_t *intern = (php_phongo_cursor_t*)object;
+	php_phongo_cursor_t *intern = Z_OBJ_CURSOR(object);
 
 	zend_object_std_dtor(&intern->std TSRMLS_CC);
 

src/MongoDB/CursorId.c

@@ -84,7 +84,7 @@ static zend_function_entry php_phongo_cursorid_me[] = {
 /* {{{ php_phongo_cursorid_t object handlers */
 static void php_phongo_cursorid_free_object(phongo_free_object_arg *object TSRMLS_DC) /* {{{ */
 {
-	php_phongo_cursorid_t *intern = (php_phongo_cursorid_t*)object;
+	php_phongo_cursorid_t *intern = Z_OBJ_CURSORID(object);
 
 	zend_object_std_dtor(&intern->std TSRMLS_CC);
 

src/MongoDB/Manager.c

@@ -375,7 +375,7 @@ static zend_function_entry php_phongo_manager_me[] = {
 /* {{{ php_phongo_manager_t object handlers */
 static void php_phongo_manager_free_object(phongo_free_object_arg *object TSRMLS_DC) /* {{{ */
 {
-	php_phongo_manager_t *intern = (php_phongo_manager_t*)object;
+	php_phongo_manager_t *intern = Z_OBJ_MANAGER(object);
 
 	zend_object_std_dtor(&intern->std TSRMLS_CC);
 

src/MongoDB/Query.c

@@ -123,7 +123,7 @@ static zend_function_entry php_phongo_query_me[] = {
 /* {{{ php_phongo_query_t object handlers */
 static void php_phongo_query_free_object(phongo_free_object_arg *object TSRMLS_DC) /* {{{ */
 {
-	php_phongo_query_t *intern = (php_phongo_query_t*)object;
+	php_phongo_query_t *intern = Z_OBJ_QUERY(object);
 
 	zend_object_std_dtor(&intern->std TSRMLS_CC);
 

src/MongoDB/ReadPreference.c

@@ -169,7 +169,7 @@ static zend_function_entry php_phongo_readpreference_me[] = {
 /* {{{ php_phongo_readpreference_t object handlers */
 static void php_phongo_readpreference_free_object(phongo_free_object_arg *object TSRMLS_DC) /* {{{ */
 {
-	php_phongo_readpreference_t *intern = (php_phongo_readpreference_t*)object;
+	php_phongo_readpreference_t *intern = Z_OBJ_READPREFERENCE(object);
 
 	zend_object_std_dtor(&intern->std TSRMLS_CC);
 

src/MongoDB/Server.c

@@ -509,7 +509,7 @@ static int php_phongo_server_compare_objects(zval *o1, zval *o2 TSRMLS_DC) /* {{
 /* {{{ php_phongo_server_t object handlers */
 static void php_phongo_server_free_object(phongo_free_object_arg *object TSRMLS_DC) /* {{{ */
 {
-	php_phongo_server_t *intern = (php_phongo_server_t*)object;
+	php_phongo_server_t *intern = Z_OBJ_SERVER(object);
 
 	zend_object_std_dtor(&intern->std TSRMLS_CC);
 

src/MongoDB/WriteConcern.c

@@ -208,7 +208,7 @@ static zend_function_entry php_phongo_writeconcern_me[] = {
 /* {{{ php_phongo_writeconcern_t object handlers */
 static void php_phongo_writeconcern_free_object(phongo_free_object_arg *object TSRMLS_DC) /* {{{ */
 {
-	php_phongo_writeconcern_t *intern = (php_phongo_writeconcern_t*)object;
+	php_phongo_writeconcern_t *intern = Z_OBJ_WRITECONCERN(object);
 
 	zend_object_std_dtor(&intern->std TSRMLS_CC);
 

src/MongoDB/WriteConcernError.c

@@ -129,7 +129,7 @@ static zend_function_entry php_phongo_writeconcernerror_me[] = {
 /* {{{ php_phongo_writeconcernerror_t object handlers */
 static void php_phongo_writeconcernerror_free_object(phongo_free_object_arg *object TSRMLS_DC) /* {{{ */
 {
-	php_phongo_writeconcernerror_t *intern = (php_phongo_writeconcernerror_t*)object;
+	php_phongo_writeconcernerror_t *intern = Z_OBJ_WRITECONCERNERROR(object);
 
 	zend_object_std_dtor(&intern->std TSRMLS_CC);