Merge pull request #638

Author: jmikola

config.m4

@@ -173,7 +173,6 @@ if test "$MONGODB" != "no"; then
     src/BSON/Timestamp.c \
     src/BSON/TimestampInterface.c \
     src/BSON/Type.c \
-    src/BSON/TypeWrapper.c \
     src/BSON/Unserializable.c \
     src/BSON/UTCDateTime.c \
     src/BSON/UTCDateTimeInterface.c \

config.w32

@@ -84,7 +84,7 @@ if (PHP_MONGODB != "no") {
 
   EXTENSION("mongodb", "php_phongo.c phongo_compat.c", null, PHP_MONGODB_CFLAGS);
   ADD_SOURCES(configure_module_dirname + "/src", "bson.c bson-encode.c", "mongodb");
-  ADD_SOURCES(configure_module_dirname + "/src/BSON", "Binary.c BinaryInterface.c Decimal128.c Decimal128Interface.c Javascript.c JavascriptInterface.c MaxKey.c MaxKeyInterface.c MinKey.c MinKeyInterface.c ObjectID.c ObjectIDInterface.c Persistable.c Regex.c RegexInterface.c Serializable.c Timestamp.c TimestampInterface.c Type.c TypeWrapper.c Unserializable.c UTCDateTime.c UTCDateTimeInterface.c functions.c", "mongodb");
+  ADD_SOURCES(configure_module_dirname + "/src/BSON", "Binary.c BinaryInterface.c Decimal128.c Decimal128Interface.c Javascript.c JavascriptInterface.c MaxKey.c MaxKeyInterface.c MinKey.c MinKeyInterface.c ObjectID.c ObjectIDInterface.c Persistable.c Regex.c RegexInterface.c Serializable.c Timestamp.c TimestampInterface.c Type.c Unserializable.c UTCDateTime.c UTCDateTimeInterface.c functions.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/MongoDB", "BulkWrite.c Command.c Cursor.c CursorId.c Manager.c Query.c ReadConcern.c ReadPreference.c Server.c WriteConcern.c WriteConcernError.c WriteError.c WriteResult.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/MongoDB/Exception", "AuthenticationException.c BulkWriteException.c ConnectionException.c ConnectionTimeoutException.c Exception.c ExecutionTimeoutException.c InvalidArgumentException.c LogicException.c RuntimeException.c SSLConnectionException.c UnexpectedValueException.c WriteException.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/MongoDB/Monitoring", "CommandFailedEvent.c CommandStartedEvent.c CommandSubscriber.c CommandSucceededEvent.c Subscriber.c functions.c", "mongodb");

php_bson.h

@@ -47,15 +47,6 @@ typedef struct {
 	zend_class_entry              *array;
 	php_phongo_bson_typemap_types  root_type;
 	zend_class_entry              *root;
-	zend_class_entry              *binary;
-	zend_class_entry              *decimal128;
-	zend_class_entry              *javascript;
-	zend_class_entry              *maxkey;
-	zend_class_entry              *minkey;
-	zend_class_entry              *objectid;
-	zend_class_entry              *regex;
-	zend_class_entry              *timestamp;
-	zend_class_entry              *utcdatetime;
 } php_phongo_bson_typemap;
 
 typedef struct {
@@ -70,9 +61,9 @@ typedef struct {
 } php_phongo_bson_state;
 
 #if PHP_VERSION_ID >= 70000
-#define PHONGO_BSON_STATE_INITIALIZER  { {{ 0 }}, { PHONGO_TYPEMAP_NONE, NULL, PHONGO_TYPEMAP_NONE, NULL, PHONGO_TYPEMAP_NONE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, NULL, 0 }
+#define PHONGO_BSON_STATE_INITIALIZER  { {{ 0 }}, { PHONGO_TYPEMAP_NONE, NULL, PHONGO_TYPEMAP_NONE, NULL, PHONGO_TYPEMAP_NONE, NULL }, NULL, 0 }
 #else
-#define PHONGO_BSON_STATE_INITIALIZER  { NULL, { PHONGO_TYPEMAP_NONE, NULL, PHONGO_TYPEMAP_NONE, NULL, PHONGO_TYPEMAP_NONE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, NULL, 0 }
+#define PHONGO_BSON_STATE_INITIALIZER  { NULL, { PHONGO_TYPEMAP_NONE, NULL, PHONGO_TYPEMAP_NONE, NULL, PHONGO_TYPEMAP_NONE, NULL }, NULL, 0 }
 #endif
 
 void php_phongo_zval_to_bson(zval *data, php_phongo_bson_flags_t flags, bson_t *bson, bson_t **bson_out TSRMLS_DC);

php_phongo.c

@@ -2354,7 +2354,6 @@ PHP_MINIT_FUNCTION(mongodb)
 	php_phongo_persistable_init_ce(INIT_FUNC_ARGS_PASSTHRU);
 	php_phongo_regex_init_ce(INIT_FUNC_ARGS_PASSTHRU);
 	php_phongo_timestamp_init_ce(INIT_FUNC_ARGS_PASSTHRU);
-	php_phongo_typewrapper_init_ce(INIT_FUNC_ARGS_PASSTHRU);
 	php_phongo_utcdatetime_init_ce(INIT_FUNC_ARGS_PASSTHRU);
 
 	php_phongo_bulkwrite_init_ce(INIT_FUNC_ARGS_PASSTHRU);

php_phongo_classes.h

@@ -243,7 +243,6 @@ extern zend_class_entry *php_phongo_writeexception_ce;
 extern zend_class_entry *php_phongo_bulkwriteexception_ce;
 
 extern zend_class_entry *php_phongo_type_ce;
-extern zend_class_entry *php_phongo_typewrapper_ce;
 extern zend_class_entry *php_phongo_persistable_ce;
 extern zend_class_entry *php_phongo_unserializable_ce;
 extern zend_class_entry *php_phongo_serializable_ce;
@@ -284,7 +283,6 @@ extern void php_phongo_regex_init_ce(INIT_FUNC_ARGS);
 extern void php_phongo_serializable_init_ce(INIT_FUNC_ARGS);
 extern void php_phongo_timestamp_init_ce(INIT_FUNC_ARGS);
 extern void php_phongo_type_init_ce(INIT_FUNC_ARGS);
-extern void php_phongo_typewrapper_init_ce(INIT_FUNC_ARGS);
 extern void php_phongo_utcdatetime_init_ce(INIT_FUNC_ARGS);
 extern void php_phongo_unserializable_init_ce(INIT_FUNC_ARGS);
 

src/BSON/TypeWrapper.c

@@ -45,9 +45,6 @@
 #undef MONGOC_LOG_DOMAIN
 #define MONGOC_LOG_DOMAIN "PHONGO-BSON"
 
-/* Forward declarations */
-static void php_phongo_bson_append(bson_t *bson, php_phongo_bson_flags_t flags, const char *key, long key_len, zval *entry TSRMLS_DC);
-
 /* Determines whether the argument should be serialized as a BSON array or
  * document. IS_ARRAY is returned if the argument's keys are a sequence of
  * integers starting at zero; otherwise, IS_OBJECT is returned. */
@@ -121,33 +118,6 @@ static void php_phongo_bson_append_object(bson_t *bson, php_phongo_bson_flags_t
 		return;
 	}
 
-	if (Z_TYPE_P(object) == IS_OBJECT && instanceof_function(Z_OBJCE_P(object), php_phongo_typewrapper_ce TSRMLS_CC)) {
-#if PHP_VERSION_ID >= 70000
-		zval retval;
-
-		zend_call_method_with_0_params(object, NULL, NULL, "toBSONType", &retval);
-#else
-		zval *retval;
-
-		zend_call_method_with_0_params(&object, NULL, NULL, "toBSONType", &retval);
-#endif
-
-		if (Z_ISUNDEF(retval)) {
-			/* zend_call_method() failed */
-			return;
-		}
-
-#if PHP_VERSION_ID >= 70000
-		php_phongo_bson_append(bson, flags, key, key_len, &retval TSRMLS_CC);
-#else
-		php_phongo_bson_append(bson, flags, key, key_len, retval TSRMLS_CC);
-#endif
-
-		zval_ptr_dtor(&retval);
-
-		return;
-	}
-
 	if (Z_TYPE_P(object) == IS_OBJECT && instanceof_function(Z_OBJCE_P(object), php_phongo_type_ce TSRMLS_CC)) {
 		if (instanceof_function(Z_OBJCE_P(object), php_phongo_serializable_ce TSRMLS_CC)) {
 #if PHP_VERSION_ID >= 70000