Merge pull request #62

Author: jmikola

src/BSON/Binary.c

@@ -69,7 +69,23 @@ PHP_METHOD(Binary, __construct)
 	intern->subtype = subtype;
 }
 /* }}} */
-/* {{{ proto void Binary::getSubType()
+/* {{{ proto string Binary::getData()
+    */
+PHP_METHOD(Binary, getData)
+{
+	php_phongo_binary_t      *intern;
+
+
+	intern = (php_phongo_binary_t *)zend_object_store_get_object(getThis() TSRMLS_CC);
+
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
+	}
+
+	RETURN_STRINGL(intern->data, intern->data_len, 1);
+}
+/* }}} */
+/* {{{ proto integer Binary::getSubType()
     */
 PHP_METHOD(Binary, getSubType)
 {
@@ -94,12 +110,16 @@ ZEND_BEGIN_ARG_INFO_EX(ai_Binary___construct, 0, 0, 2)
 	ZEND_ARG_INFO(0, subtype)
 ZEND_END_ARG_INFO();
 
+ZEND_BEGIN_ARG_INFO_EX(ai_Binary_getData, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
 ZEND_BEGIN_ARG_INFO_EX(ai_Binary_getSubType, 0, 0, 0)
 ZEND_END_ARG_INFO();
 
 
 static zend_function_entry php_phongo_binary_me[] = {
 	PHP_ME(Binary, __construct, ai_Binary___construct, ZEND_ACC_PUBLIC)
+	PHP_ME(Binary, getData, ai_Binary_getData, ZEND_ACC_PUBLIC)
 	PHP_ME(Binary, getSubType, ai_Binary_getSubType, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };

tests/bson/bson-binary-001.phpt

@@ -21,6 +21,7 @@ $types = array(
 $tests = array();
 foreach($types as $type) {
     $binary = new $classname("random binary data", $type);
+    var_dump($binary->getData() == "random binary data");
     var_dump($binary->getSubType() == $type);
     $tests[] = array("binary" => $binary);
 }
@@ -41,6 +42,7 @@ foreach($tests as $n => $test) {
     var_dump((object)$test == (object)$testagain);
 }
 
+$binary->getData(2);
 $binary->getSubType(2);
 ?>
 ===DONE===
@@ -54,6 +56,14 @@ bool(true)
 bool(true)
 bool(true)
 bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Test#0 { "binary" : { "$type" : "00", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }
 string(73) "{ "binary" : { "$type" : "00", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }"
@@ -88,5 +98,7 @@ string(73) "{ "binary" : { "$type" : "85", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh
 string(73) "{ "binary" : { "$type" : "85", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }"
 bool(true)
 
+Warning: %s\Binary::getData() expects exactly 0 parameters, 1 given in %s on line %d
+
 Warning: %s\Binary::getSubType() expects exactly 0 parameters, 1 given in %s on line %d
 ===DONE===