PHON-98: Implement and properly throw MongoDB\ConnectionException

Author: bjori

config.m4

@@ -172,6 +172,7 @@ if test "$PHONGO" != "no"; then
   PHONGO_MONGODB_EXCEPTIONS="\
       src/MongoDB/Exception.c \
       src/MongoDB/RuntimeException.c \
+      src/MongoDB/ConnectionException.c \
       src/MongoDB/WriteException.c \
   ";
 

php_phongo.c

@@ -81,8 +81,7 @@ zend_class_entry* phongo_exception_from_phongo_domain(php_phongo_error_domain_t
 		case PHONGO_ERROR_WRITE_FAILED:
 			return php_phongo_writeexception_ce;
 		case PHONGO_ERROR_CONNECTION_FAILED:
-			/* FIXME: Add ConnectionException */
-			return php_phongo_writeexception_ce;
+			return php_phongo_connectionexception_ce;
 	}
 
 	mongoc_log(MONGOC_LOG_LEVEL_ERROR, MONGOC_LOG_DOMAIN, "Resolving unknown exception domain!!!");
@@ -97,6 +96,7 @@ zend_class_entry* phongo_exception_from_mongoc_domain(uint32_t /* mongoc_error_d
 		case MONGOC_ERROR_STREAM_SOCKET:
 		case MONGOC_ERROR_STREAM_CONNECT:
 		case MONGOC_ERROR_STREAM_NOT_ESTABLISHED:
+			return php_phongo_connectionexception_ce;
 		case MONGOC_ERROR_CLIENT_NOT_READY:
 		case MONGOC_ERROR_CLIENT_TOO_BIG:
 		case MONGOC_ERROR_CLIENT_TOO_SMALL:
@@ -561,10 +561,13 @@ bool phongo_execute_write(mongoc_client_t *client, char *namespace, mongoc_bulk_
 	hint = mongoc_bulk_operation_execute(batch, &reply, &error);
 
 	if (!hint) {
-		zval *e = phongo_throw_exception(PHONGO_ERROR_WRITE_FAILED TSRMLS_CC, "%s", error.message);
+		/* If no exception has been thrown already, for example connection exception */
+		if (!EG(exception)) {
+			zval *e = phongo_throw_exception(PHONGO_ERROR_WRITE_FAILED TSRMLS_CC, "%s", error.message);
 
-		if (Z_OBJCE_P(e) == php_phongo_writeexception_ce) {
-			phongo_writeexception_init(e, &reply, hint TSRMLS_CC);
+			if (Z_OBJCE_P(e) == php_phongo_writeexception_ce) {
+				phongo_writeexception_init(e, &reply, hint TSRMLS_CC);
+			}
 		}
 		bson_destroy(&reply);
 
@@ -1399,6 +1402,7 @@ PHP_MINIT_FUNCTION(phongo)
 
 	PHP_MINIT(Exception)(INIT_FUNC_ARGS_PASSTHRU);
 	PHP_MINIT(RuntimeException)(INIT_FUNC_ARGS_PASSTHRU);
+	PHP_MINIT(ConnectionException)(INIT_FUNC_ARGS_PASSTHRU);
 	PHP_MINIT(WriteException)(INIT_FUNC_ARGS_PASSTHRU);
 
 	PHP_MINIT(Type)(INIT_FUNC_ARGS_PASSTHRU);

php_phongo_classes.h

@@ -190,6 +190,7 @@ extern PHONGO_API zend_class_entry *php_phongo_writeresult_ce;
 
 extern PHONGO_API zend_class_entry *php_phongo_exception_ce;
 extern PHONGO_API zend_class_entry *php_phongo_runtimeexception_ce;
+extern PHONGO_API zend_class_entry *php_phongo_connectionexception_ce;
 extern PHONGO_API zend_class_entry *php_phongo_writeexception_ce;
 
 extern PHONGO_API zend_class_entry *php_phongo_type_ce;
@@ -223,6 +224,7 @@ PHP_MINIT_FUNCTION(WriteResult);
 
 PHP_MINIT_FUNCTION(Exception);
 PHP_MINIT_FUNCTION(RuntimeException);
+PHP_MINIT_FUNCTION(ConnectionException);
 PHP_MINIT_FUNCTION(WriteException);
 
 PHP_MINIT_FUNCTION(Type);

src/MongoDB/ConnectionException.c

@@ -0,0 +1,80 @@
+/*
+  +---------------------------------------------------------------------------+
+  | PHP Driver for MongoDB                                                    |
+  +---------------------------------------------------------------------------+
+  | Copyright 2013-2014 MongoDB, Inc.                                         |
+  |                                                                           |
+  | Licensed under the Apache License, Version 2.0 (the "License");           |
+  | you may not use this file except in compliance with the License.          |
+  | You may obtain a copy of the License at                                   |
+  |                                                                           |
+  | http://www.apache.org/licenses/LICENSE-2.0                                |
+  |                                                                           |
+  | Unless required by applicable law or agreed to in writing, software       |
+  | distributed under the License is distributed on an "AS IS" BASIS,         |
+  | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  |
+  | See the License for the specific language governing permissions and       |
+  | limitations under the License.                                            |
+  +---------------------------------------------------------------------------+
+  | Copyright (c) 2014, MongoDB, Inc.                                         |
+  +---------------------------------------------------------------------------+
+*/
+
+#ifdef HAVE_CONFIG_H
+#	include "config.h"
+#endif
+
+/* External libs */
+#include <bson.h>
+#include <mongoc.h>
+
+/* PHP Core stuff */
+#include <php.h>
+#include <php_ini.h>
+#include <ext/standard/info.h>
+#include <Zend/zend_interfaces.h>
+#include <ext/spl/spl_iterators.h>
+/* Our Compatability header */
+#include "php_compat_53.h"
+
+/* Our stuffz */
+#include "php_phongo.h"
+#include "php_bson.h"
+#include <ext/spl/spl_exceptions.h>
+
+
+PHONGO_API zend_class_entry *php_phongo_connectionexception_ce;
+
+/* {{{ MongoDB\ConnectionException */
+
+static zend_function_entry php_phongo_connectionexception_me[] = {
+	PHP_FE_END
+};
+
+/* }}} */
+
+
+/* {{{ PHP_MINIT_FUNCTION */
+PHP_MINIT_FUNCTION(ConnectionException)
+{
+	(void)type;
+	(void)module_number;
+	zend_class_entry ce;
+
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB", "ConnectionException", php_phongo_connectionexception_me);
+	php_phongo_connectionexception_ce = zend_register_internal_class_ex(&ce, php_phongo_runtimeexception_ce, NULL TSRMLS_CC);
+
+	return SUCCESS;
+}
+/* }}} */
+
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */