PHPC-440: WriteErrorException extends abstract WriteException

This makes WriteException a common base class of WriteConcernException and WriteErrorException. BulkWriteException, which may contain multiple write and/or write concern errors, will continue to inherit WriteException.

Author: jmikola

config.m4

@@ -182,6 +182,7 @@ if test "$MONGODB" != "no"; then
       src/MongoDB/Exception/ConnectionTimeoutException.c \
       src/MongoDB/Exception/WriteException.c \
       src/MongoDB/Exception/WriteConcernException.c \
+      src/MongoDB/Exception/WriteErrorException.c \
       src/MongoDB/Exception/BulkWriteException.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 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 WriteErrorException.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

@@ -101,7 +101,7 @@ zend_class_entry* phongo_exception_from_phongo_domain(php_phongo_error_domain_t
 		case PHONGO_ERROR_WRITE_FAILED:
 			return php_phongo_bulkwriteexception_ce;
 		case PHONGO_ERROR_WRITE_SINGLE_FAILED:
-			return php_phongo_writeexception_ce;
+			return php_phongo_writeerrorexception_ce;
 		case PHONGO_ERROR_WRITECONCERN_FAILED:
 			return php_phongo_writeconcernexception_ce;
 		case PHONGO_ERROR_CONNECTION_FAILED:
@@ -2372,6 +2372,7 @@ PHP_MINIT_FUNCTION(mongodb)
 	PHP_MINIT(SSLConnectionException)(INIT_FUNC_ARGS_PASSTHRU);
 	PHP_MINIT(WriteException)(INIT_FUNC_ARGS_PASSTHRU);
 	PHP_MINIT(WriteConcernException)(INIT_FUNC_ARGS_PASSTHRU);
+	PHP_MINIT(WriteErrorException)(INIT_FUNC_ARGS_PASSTHRU);
 	PHP_MINIT(BulkWriteException)(INIT_FUNC_ARGS_PASSTHRU);
 	PHP_MINIT(ExecutionTimeoutException)(INIT_FUNC_ARGS_PASSTHRU);
 	PHP_MINIT(ConnectionTimeoutException)(INIT_FUNC_ARGS_PASSTHRU);

php_phongo_classes.h

@@ -187,6 +187,7 @@ 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;
 extern PHONGO_API zend_class_entry *php_phongo_writeconcernexception_ce;
+extern PHONGO_API zend_class_entry *php_phongo_writeerrorexception_ce;
 extern PHONGO_API zend_class_entry *php_phongo_bulkwriteexception_ce;
 
 extern PHONGO_API zend_class_entry *php_phongo_type_ce;
@@ -236,6 +237,7 @@ PHP_MINIT_FUNCTION(ExecutionTimeoutException);
 PHP_MINIT_FUNCTION(ConnectionTimeoutException);
 PHP_MINIT_FUNCTION(WriteException);
 PHP_MINIT_FUNCTION(WriteConcernException);
+PHP_MINIT_FUNCTION(WriteErrorException);
 PHP_MINIT_FUNCTION(BulkWriteException);
 
 PHP_MINIT_FUNCTION(Type);

src/MongoDB/Exception/WriteErrorException.c

@@ -0,0 +1,79 @@
+/*
+  +---------------------------------------------------------------------------+
+  | PHP Driver for MongoDB                                                    |
+  +---------------------------------------------------------------------------+
+  | Copyright 2013-2015 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-2015 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 "phongo_compat.h"
+
+/* Our stuffz */
+#include "php_phongo.h"
+#include "php_bson.h"
+#include <ext/spl/spl_exceptions.h>
+
+
+PHONGO_API zend_class_entry *php_phongo_writeerrorexception_ce;
+
+/* {{{ MongoDB\Driver\WriteErrorException */
+
+static zend_function_entry php_phongo_writeerrorexception_me[] = {
+	PHP_FE_END
+};
+
+/* }}} */
+
+
+/* {{{ PHP_MINIT_FUNCTION */
+PHP_MINIT_FUNCTION(WriteErrorException)
+{
+	zend_class_entry ce;
+	(void)type;(void)module_number;
+
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver\\Exception", "WriteErrorException", php_phongo_writeerrorexception_me);
+	php_phongo_writeerrorexception_ce = zend_register_internal_class_ex(&ce, php_phongo_writeexception_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
+ */

src/MongoDB/Exception/WriteException.c

@@ -89,6 +89,7 @@ PHP_MINIT_FUNCTION(WriteException)
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver\\Exception", "WriteException", php_phongo_writeexception_me);
 	php_phongo_writeexception_ce = zend_register_internal_class_ex(&ce, php_phongo_runtimeexception_ce, NULL TSRMLS_CC);
+	php_phongo_writeexception_ce->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS;
 
 	zend_declare_property_null(php_phongo_writeexception_ce, ZEND_STRL("writeResult"), ZEND_ACC_PROTECTED TSRMLS_CC);