Merge pull request #127

Author: jmikola

config.m4

@@ -178,7 +178,6 @@ if test "$MONGODB" != "no"; then
       src/MongoDB/Exception/ConnectionException.c \
       src/MongoDB/Exception/AuthenticationException.c \
       src/MongoDB/Exception/SSLConnectionException.c \
-      src/MongoDB/Exception/DuplicateKeyException.c \
       src/MongoDB/Exception/ExecutionTimeoutException.c \
       src/MongoDB/Exception/ConnectionTimeoutException.c \
       src/MongoDB/Exception/WriteException.c \

config.w32

@@ -10,7 +10,7 @@ if (PHP_MONGODB != "no") {
   ADD_SOURCES(configure_module_dirname + "/src", "bson.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/BSON", "Type.c Unserializable.c Serializable.c Persistable.c Binary.c Javascript.c MaxKey.c MinKey.c ObjectID.c Regex.c Timestamp.c UTCDateTime.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/MongoDB", "Command.c Cursor.c CursorId.c Manager.c Query.c ReadPreference.c Server.c BulkWrite.c WriteConcern.c WriteConcernError.c WriteError.c WriteResult.c", "mongodb");
-  ADD_SOURCES(configure_module_dirname + "/src/MongoDB/Exception", "Exception.c LogicException.c RuntimeException.c UnexpectedValueException.c InvalidArgumentException.c ConnectionException.c AuthenticationException.c SSLConnectionException.c DuplicateKeyException.c ExecutionTimeoutException.c ConnectionTimeoutException.c WriteException.c WriteConcernException.c BulkWriteException.c", "mongodb");
+  ADD_SOURCES(configure_module_dirname + "/src/MongoDB/Exception", "Exception.c LogicException.c RuntimeException.c UnexpectedValueException.c InvalidArgumentException.c ConnectionException.c AuthenticationException.c SSLConnectionException.c ExecutionTimeoutException.c ConnectionTimeoutException.c WriteException.c WriteConcernException.c BulkWriteException.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/contrib/", "php-ssl.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/libbson/src/yajl", "yajl_version.c yajl.c yajl_encode.c yajl_lex.c yajl_parser.c yajl_buf.c yajl_tree.c yajl_alloc.c yajl_gen.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/libbson/src/bson", "bcon.c bson.c bson-atomic.c bson-clock.c bson-context.c bson-error.c bson-iter.c bson-iso8601.c bson-json.c bson-keys.c bson-md5.c bson-memory.c bson-oid.c bson-reader.c bson-string.c bson-timegm.c bson-utf8.c bson-value.c bson-version-functions.c bson-writer.c", "mongodb");

php_phongo.c

@@ -118,8 +118,6 @@ zend_class_entry* phongo_exception_from_mongoc_domain(uint32_t /* mongoc_error_d
 			return php_phongo_executiontimeoutexception_ce;
 		case MONGOC_ERROR_STREAM_SOCKET:
 			return php_phongo_connectiontimeoutexception_ce;
-		case 11000: /* DuplicateKey */
-			return php_phongo_duplicatekeyexception_ce;
 		case MONGOC_ERROR_CLIENT_AUTHENTICATE:
 			return php_phongo_authenticationexception_ce;
 
@@ -2375,7 +2373,6 @@ PHP_MINIT_FUNCTION(mongodb)
 	PHP_MINIT(WriteException)(INIT_FUNC_ARGS_PASSTHRU);
 	PHP_MINIT(WriteConcernException)(INIT_FUNC_ARGS_PASSTHRU);
 	PHP_MINIT(BulkWriteException)(INIT_FUNC_ARGS_PASSTHRU);
-	PHP_MINIT(DuplicateKeyException)(INIT_FUNC_ARGS_PASSTHRU);
 	PHP_MINIT(ExecutionTimeoutException)(INIT_FUNC_ARGS_PASSTHRU);
 	PHP_MINIT(ConnectionTimeoutException)(INIT_FUNC_ARGS_PASSTHRU);
 

php_phongo_classes.h

@@ -183,7 +183,6 @@ extern PHONGO_API zend_class_entry *php_phongo_invalidargumentexception_ce;
 extern PHONGO_API zend_class_entry *php_phongo_connectionexception_ce;
 extern PHONGO_API zend_class_entry *php_phongo_authenticationexception_ce;
 extern PHONGO_API zend_class_entry *php_phongo_sslconnectionexception_ce;
-extern PHONGO_API zend_class_entry *php_phongo_duplicatekeyexception_ce;
 extern PHONGO_API zend_class_entry *php_phongo_executiontimeoutexception_ce;
 extern PHONGO_API zend_class_entry *php_phongo_connectiontimeoutexception_ce;
 extern PHONGO_API zend_class_entry *php_phongo_writeexception_ce;
@@ -233,7 +232,6 @@ PHP_MINIT_FUNCTION(InvalidArgumentException);
 PHP_MINIT_FUNCTION(ConnectionException);
 PHP_MINIT_FUNCTION(AuthenticationException);
 PHP_MINIT_FUNCTION(SSLConnectionException);
-PHP_MINIT_FUNCTION(DuplicateKeyException);
 PHP_MINIT_FUNCTION(ExecutionTimeoutException);
 PHP_MINIT_FUNCTION(ConnectionTimeoutException);
 PHP_MINIT_FUNCTION(WriteException);