PHPC-272: Move exceptions into MongoDB\Driver\Exception namespace

Author: bjori

config.m4

@@ -164,19 +164,19 @@ if test "$MONGODB" != "no"; then
       src/MongoDB/WriteResult.c \
   ";
   MONGODB_MONGODB_EXCEPTIONS="\
-      src/MongoDB/Exception.c \
-      src/MongoDB/RuntimeException.c \
-      src/MongoDB/UnexpectedValueException.c \
-      src/MongoDB/InvalidArgumentException.c \
-      src/MongoDB/ConnectionException.c \
-      src/MongoDB/AuthenticationException.c \
-      src/MongoDB/SSLConnectionException.c \
-      src/MongoDB/DuplicateKeyException.c \
-      src/MongoDB/ExecutionTimeoutException.c \
-      src/MongoDB/ConnectionTimeoutException.c \
-      src/MongoDB/WriteException.c \
-      src/MongoDB/WriteConcernException.c \
-      src/MongoDB/BulkWriteException.c \
+      src/MongoDB/Exception/Exception.c \
+      src/MongoDB/Exception/RuntimeException.c \
+      src/MongoDB/Exception/UnexpectedValueException.c \
+      src/MongoDB/Exception/InvalidArgumentException.c \
+      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 \
+      src/MongoDB/Exception/WriteConcernException.c \
+      src/MongoDB/Exception/BulkWriteException.c \
   ";
 
   YAJL_SOURCES="\

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.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 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/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.c bson-writer.c", "mongodb");

src/MongoDB/AuthenticationException.c …goDB/Exception/AuthenticationException.csrc/MongoDB/AuthenticationException.c renamed to src/MongoDB/Exception/AuthenticationException.c src/MongoDB/AuthenticationException.c renamed to src/MongoDB/Exception/AuthenticationException.c

@@ -60,7 +60,7 @@ PHP_MINIT_FUNCTION(AuthenticationException)
 	zend_class_entry ce;
 	(void)type;(void)module_number;
 
-	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "AuthenticationException", php_phongo_authenticationexception_me);
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver\\Exception", "AuthenticationException", php_phongo_authenticationexception_me);
 	php_phongo_authenticationexception_ce = zend_register_internal_class_ex(&ce, php_phongo_connectionexception_ce, NULL TSRMLS_CC);
 
 	return SUCCESS;

src/MongoDB/BulkWriteException.c …c/MongoDB/Exception/BulkWriteException.csrc/MongoDB/BulkWriteException.c renamed to src/MongoDB/Exception/BulkWriteException.c src/MongoDB/BulkWriteException.c renamed to src/MongoDB/Exception/BulkWriteException.c

@@ -60,7 +60,7 @@ PHP_MINIT_FUNCTION(BulkWriteException)
 	zend_class_entry ce;
 	(void)type;(void)module_number;
 
-	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "BulkWriteException", php_phongo_bulkwriteexception_me);
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver\\Exception", "BulkWriteException", php_phongo_bulkwriteexception_me);
 	php_phongo_bulkwriteexception_ce = zend_register_internal_class_ex(&ce, php_phongo_writeexception_ce, NULL TSRMLS_CC);
 
 	return SUCCESS;

src/MongoDB/ConnectionException.c …/MongoDB/Exception/ConnectionException.csrc/MongoDB/ConnectionException.c renamed to src/MongoDB/Exception/ConnectionException.c src/MongoDB/ConnectionException.c renamed to src/MongoDB/Exception/ConnectionException.c

@@ -60,7 +60,7 @@ PHP_MINIT_FUNCTION(ConnectionException)
 	zend_class_entry ce;
 	(void)type;(void)module_number;
 
-	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "ConnectionException", php_phongo_connectionexception_me);
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver\\Exception", "ConnectionException", php_phongo_connectionexception_me);
 	php_phongo_connectionexception_ce = zend_register_internal_class_ex(&ce, php_phongo_runtimeexception_ce, NULL TSRMLS_CC);
 
 	return SUCCESS;

src/MongoDB/ConnectionTimeoutException.c …B/Exception/ConnectionTimeoutException.csrc/MongoDB/ConnectionTimeoutException.c renamed to src/MongoDB/Exception/ConnectionTimeoutException.c src/MongoDB/ConnectionTimeoutException.c renamed to src/MongoDB/Exception/ConnectionTimeoutException.c

@@ -60,7 +60,7 @@ PHP_MINIT_FUNCTION(ConnectionTimeoutException)
 	zend_class_entry ce;
 	(void)type;(void)module_number;
 
-	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "ConnectionTimeoutException", php_phongo_connectiontimeoutexception_me);
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver\\Exception", "ConnectionTimeoutException", php_phongo_connectiontimeoutexception_me);
 	php_phongo_connectiontimeoutexception_ce = zend_register_internal_class_ex(&ce, php_phongo_connectionexception_ce, NULL TSRMLS_CC);
 	PHONGO_CE_INIT(php_phongo_connectiontimeoutexception_ce);
 

src/MongoDB/DuplicateKeyException.c …ongoDB/Exception/DuplicateKeyException.csrc/MongoDB/DuplicateKeyException.c renamed to src/MongoDB/Exception/DuplicateKeyException.c src/MongoDB/DuplicateKeyException.c renamed to src/MongoDB/Exception/DuplicateKeyException.c

@@ -60,7 +60,7 @@ PHP_MINIT_FUNCTION(DuplicateKeyException)
 	zend_class_entry ce;
 	(void)type;(void)module_number;
 
-	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "DuplicateKeyException", php_phongo_duplicatekeyexception_me);
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver\\Exception", "DuplicateKeyException", php_phongo_duplicatekeyexception_me);
 	php_phongo_duplicatekeyexception_ce = zend_register_internal_class_ex(&ce, php_phongo_writeexception_ce, NULL TSRMLS_CC);
 	PHONGO_CE_INIT(php_phongo_duplicatekeyexception_ce);
 

src/MongoDB/Exception.c src/MongoDB/Exception/Exception.csrc/MongoDB/Exception.c renamed to src/MongoDB/Exception/Exception.c

@@ -60,7 +60,7 @@ PHP_MINIT_FUNCTION(Exception)
 	zend_class_entry ce;
 	(void)type;(void)module_number;
 
-	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "Exception", php_phongo_exception_me);
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver\\Exception", "Exception", php_phongo_exception_me);
 	php_phongo_exception_ce = zend_register_internal_interface(&ce TSRMLS_CC);
 
 	return SUCCESS;

src/MongoDB/ExecutionTimeoutException.c …DB/Exception/ExecutionTimeoutException.csrc/MongoDB/ExecutionTimeoutException.c renamed to src/MongoDB/Exception/ExecutionTimeoutException.c src/MongoDB/ExecutionTimeoutException.c renamed to src/MongoDB/Exception/ExecutionTimeoutException.c

@@ -60,7 +60,7 @@ PHP_MINIT_FUNCTION(ExecutionTimeoutException)
 	zend_class_entry ce;
 	(void)type;(void)module_number;
 
-	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "ExecutionTimeoutException", php_phongo_executiontimeoutexception_me);
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver\\Exception", "ExecutionTimeoutException", php_phongo_executiontimeoutexception_me);
 	php_phongo_executiontimeoutexception_ce = zend_register_internal_class_ex(&ce, php_phongo_runtimeexception_ce, NULL TSRMLS_CC);
 	PHONGO_CE_INIT(php_phongo_executiontimeoutexception_ce);
 

src/MongoDB/InvalidArgumentException.c …oDB/Exception/InvalidArgumentException.csrc/MongoDB/InvalidArgumentException.c renamed to src/MongoDB/Exception/InvalidArgumentException.c src/MongoDB/InvalidArgumentException.c renamed to src/MongoDB/Exception/InvalidArgumentException.c

@@ -60,7 +60,7 @@ PHP_MINIT_FUNCTION(InvalidArgumentException)
 	zend_class_entry ce;
 	(void)type;(void)module_number;
 
-	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "InvalidArgumentException", php_phongo_invalidargumentexception_me);
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver\\Exception", "InvalidArgumentException", php_phongo_invalidargumentexception_me);
 	php_phongo_invalidargumentexception_ce = zend_register_internal_class_ex(&ce, spl_ce_InvalidArgumentException, NULL TSRMLS_CC);
 	zend_class_implements(php_phongo_invalidargumentexception_ce TSRMLS_CC, 1, php_phongo_exception_ce);