Merge pull request #350

Author: jmikola

src/BSON/Binary.c

@@ -131,6 +131,22 @@ PHP_METHOD(Binary, __set_state)
 }
 /* }}} */
 
+/* {{{ proto string Binary::__toString()
+   Return the Binary's data string. */
+PHP_METHOD(Binary, __toString)
+{
+	php_phongo_binary_t *intern;
+
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
+	}
+
+	intern = Z_BINARY_OBJ_P(getThis());
+
+	PHONGO_RETURN_STRINGL(intern->data, intern->data_len);
+}
+/* }}} */
+
 /* {{{ proto void Binary::__wakeup()
 */
 PHP_METHOD(Binary, __wakeup)
@@ -201,6 +217,7 @@ ZEND_END_ARG_INFO()
 static zend_function_entry php_phongo_binary_me[] = {
 	PHP_ME(Binary, __construct, ai_Binary___construct, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(Binary, __set_state, ai_Binary___set_state, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	PHP_ME(Binary, __toString, ai_Binary_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(Binary, __wakeup, ai_Binary_void, ZEND_ACC_PUBLIC)
 	PHP_ME(Binary, getData, ai_Binary_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(Binary, getType, ai_Binary_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)

src/BSON/Javascript.c

@@ -146,6 +146,22 @@ PHP_METHOD(Javascript, __set_state)
 }
 /* }}} */
 
+/* {{{ proto string Javascript::__toString()
+   Return the Javascript's code string. */
+PHP_METHOD(Javascript, __toString)
+{
+	php_phongo_javascript_t *intern;
+
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
+	}
+
+	intern = Z_JAVASCRIPT_OBJ_P(getThis());
+
+	PHONGO_RETURN_STRINGL(intern->code, intern->code_len);
+}
+/* }}} */
+
 /* {{{ proto void Javascript::__wakeup()
 */
 PHP_METHOD(Javascript, __wakeup)
@@ -181,6 +197,7 @@ ZEND_END_ARG_INFO()
 static zend_function_entry php_phongo_javascript_me[] = {
 	PHP_ME(Javascript, __construct, ai_Javascript___construct, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(Javascript, __set_state, ai_Javascript___set_state, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	PHP_ME(Javascript, __toString, ai_Javascript_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(Javascript, __wakeup, ai_Javascript_void, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };

tests/bson/bson-binary-tostring-001.phpt

@@ -0,0 +1,14 @@
+--TEST--
+MongoDB\BSON\Binary::__toString()
+--FILE--
+<?php
+
+$binary = new MongoDB\BSON\Binary('foobar', MongoDB\BSON\Binary::TYPE_GENERIC);
+var_dump((string) $binary);
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+string(6) "foobar"
+===DONE===

tests/bson/bson-javascript-tostring-001.phpt

@@ -0,0 +1,18 @@
+--TEST--
+MongoDB\BSON\Javascript::__toString()
+--FILE--
+<?php
+
+$js = new MongoDB\BSON\Javascript('function foo() { return 1; }');
+var_dump((string) $js);
+
+$js = new MongoDB\BSON\Javascript('function foo() { return bar; }', ['bar' => 1]);
+var_dump((string) $js);
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+string(28) "function foo() { return 1; }"
+string(30) "function foo() { return bar; }"
+===DONE===