PHPC-265: BSON encoding unsupoprted types (Resource) should fail

Author: bjori

src/bson.c

@@ -723,8 +723,7 @@ void phongo_bson_append(bson_t *bson, php_phongo_bson_flags_t flags, const char
 			if (bson_utf8_validate(Z_STRVAL_P(entry), Z_STRLEN_P(entry), true)) {
 				bson_append_utf8(bson, key, key_len, Z_STRVAL_P(entry), Z_STRLEN_P(entry));
 			} else {
-				/* FIXME: Broken Broken Broken */
-				printf("BROKEN BROKEN BROKEN UTF8\n");
+				phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Got invalid UTF-8 value serializing '%s'", Z_STRVAL_P(entry));
 			}
 			break;
 
@@ -752,8 +751,7 @@ void phongo_bson_append(bson_t *bson, php_phongo_bson_flags_t flags, const char
 			break;
 
 		default:
-			/* FIXME: Resource? */
-			printf("I DON'T SUPPORT THAT TYPE!\n");
+			phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Got unsupported type '%s'", zend_get_type_by_const(entry_type));
 	}
 }
 

tests/bson/bson-unknown-001.phpt

@@ -0,0 +1,44 @@
+--TEST--
+BSON Serializing a PHP resource should throw exception
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+try {
+    $a = array("stderr" => STDERR);
+
+    $b = BSON\fromArray($a);
+} catch(MongoDB\Driver\UnexpectedValueException $e) {
+    echo $e->getMessage(), "\n";
+}
+var_dump($a);
+
+try {
+    $a = array("stderr" => STDERR, "stdout" => STDOUT);
+
+    $b = BSON\fromArray($a);
+} catch(MongoDB\Driver\UnexpectedValueException $e) {
+    echo $e->getMessage(), "\n";
+}
+var_dump($a);
+
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Got unsupported type 'resource'
+array(1) {
+  ["stderr"]=>
+  resource(3) of type (stream)
+}
+Got unsupported type 'resource'
+array(2) {
+  ["stderr"]=>
+  resource(3) of type (stream)
+  ["stdout"]=>
+  resource(2) of type (stream)
+}
+===DONE===