PHPC-426: WC ctor should throw for invalid $w and $wtimeout args

Author: jmikola

src/MongoDB/WriteConcern.c

@@ -74,13 +74,20 @@ PHP_METHOD(WriteConcern, __construct)
 	intern->write_concern = mongoc_write_concern_new();
 
 	if (Z_TYPE_P(w) == IS_LONG) {
+		if (Z_LVAL_P(w) < -3) {
+			phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected w to be >= -3, %ld given", Z_LVAL_P(w));
+			return;
+		}
 		mongoc_write_concern_set_w(intern->write_concern, Z_LVAL_P(w));
 	} else if (Z_TYPE_P(w) == IS_STRING) {
 		if (strcmp(Z_STRVAL_P(w), PHONGO_WRITE_CONCERN_W_MAJORITY) == 0) {
 			mongoc_write_concern_set_w(intern->write_concern, MONGOC_WRITE_CONCERN_W_MAJORITY);
 		} else {
 			mongoc_write_concern_set_wtag(intern->write_concern, Z_STRVAL_P(w));
 		}
+	} else {
+		phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected w to be integer or string, %s given", zend_get_type_by_const(Z_TYPE_P(w)));
+		return;
 	}
 
 	switch(ZEND_NUM_ARGS()) {
@@ -91,9 +98,12 @@ PHP_METHOD(WriteConcern, __construct)
 			mongoc_write_concern_set_journal(intern->write_concern, journal);
 			/* fallthrough */
 		case 2:
-			if (wtimeout > 0) {
-				mongoc_write_concern_set_wtimeout(intern->write_concern, wtimeout);
+			if (wtimeout < 0) {
+				phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected wtimeout to be >= 0, %ld given", wtimeout);
+				return;
 			}
+
+			mongoc_write_concern_set_wtimeout(intern->write_concern, wtimeout);
 	}
 }
 /* }}} */

tests/writeConcern/writeconcern-ctor_error-002.phpt

@@ -0,0 +1,37 @@
+--TEST--
+MongoDB\Driver\WriteConcern construction (invalid w type)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+$tests = array(
+    1.0,
+    true,
+    array(),
+    new stdClass,
+    null,
+);
+
+foreach ($tests as $test) {
+    echo throws(function() use ($test) {
+        new MongoDB\Driver\WriteConcern($test);
+    }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n";
+}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Expected w to be integer or string, double given
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Expected w to be integer or string, boolean given
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Expected w to be integer or string, array given
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Expected w to be integer or string, object given
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Expected w to be integer or string, %r(null|NULL)%r given
+===DONE===

tests/writeConcern/writeconcern-ctor_error-003.phpt

@@ -0,0 +1,19 @@
+--TEST--
+MongoDB\Driver\WriteConcern construction (invalid w range)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+echo throws(function() {
+    new MongoDB\Driver\WriteConcern(-4);
+}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n";
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Expected w to be >= -3, -4 given
+===DONE===

tests/writeConcern/writeconcern-ctor_error-004.phpt

@@ -0,0 +1,19 @@
+--TEST--
+MongoDB\Driver\WriteConcern construction (invalid wtimeout range)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+echo throws(function() {
+    new MongoDB\Driver\WriteConcern(1, -1);
+}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n";
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Expected wtimeout to be >= 0, -1 given
+===DONE===

tests/writeConcern/writeconcern-getwtimeout-001.phpt

@@ -7,7 +7,6 @@ MongoDB\Driver\WriteConcern::getWtimeout()
 require_once __DIR__ . "/../utils/basic.inc";
 
 $tests = array(
-    -1,
     0,
     1,
 );
@@ -26,7 +25,6 @@ var_dump($wc->getWtimeout());
 <?php exit(0); ?>
 --EXPECT--
 int(0)
-int(0)
 int(1)
 int(0)
 ===DONE===