PHPC-2101: Default Binary constructor parameter to TYPE_GENERIC (#1362)

Author: levon80999

src/BSON/Binary.c

@@ -97,12 +97,13 @@ static PHP_METHOD(MongoDB_BSON_Binary, __construct)
 	php_phongo_binary_t* intern;
 	char*                data;
 	size_t               data_len;
-	zend_long            type;
+	zend_long            type = BSON_SUBTYPE_BINARY;
 
 	intern = Z_BINARY_OBJ_P(getThis());
 
-	PHONGO_PARSE_PARAMETERS_START(2, 2)
+	PHONGO_PARSE_PARAMETERS_START(1, 2)
 	Z_PARAM_STRING(data, data_len)
+	Z_PARAM_OPTIONAL
 	Z_PARAM_LONG(type)
 	PHONGO_PARSE_PARAMETERS_END();
 

src/BSON/Binary.stub.php

@@ -63,7 +63,7 @@ final class Binary implements BinaryInterface, \JsonSerializable, Type, \Seriali
      */
     public const TYPE_USER_DEFINED = UNKNOWN;
 
-    public final function __construct(string $data, int $type) {}
+    public final function __construct(string $data, int $type = Binary::TYPE_GENERIC) {}
 
     final public function getData(): string {}
 

src/BSON/Binary_arginfo.h

@@ -1,9 +1,9 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 7b9fd21a206d97f242415b2b2f0fc1ca847524ca */
+ * Stub hash: 5a6e8f17139479d3183b22dc9e13fd81939b8df9 */
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_MongoDB_BSON_Binary___construct, 0, 0, 2)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_MongoDB_BSON_Binary___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "MongoDB\\BSON\\Binary::TYPE_GENERIC")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_MongoDB_BSON_Binary_getData, 0, 0, IS_STRING, 0)

tests/bson/bson-binary-002.phpt

@@ -0,0 +1,16 @@
+--TEST--
+MongoDB\BSON\Binary::__construct() defaults to TYPE_GENERIC
+--FILE--
+<?php
+
+$binaryWithDefaultType = new MongoDB\BSON\Binary('randomBinaryString');
+var_dump($binaryWithDefaultType->getData() === 'randomBinaryString');
+var_dump($binaryWithDefaultType->getType() === MongoDB\BSON\Binary::TYPE_GENERIC);
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+bool(true)
+bool(true)
+===DONE===

tests/bson/bson-binary_error-001.phpt

@@ -19,7 +19,7 @@ echo throws(function() use ($binary) {
 }, MongoDB\Driver\Exception\InvalidArgumentException::class), "\n";
 
 echo throws(function() {
-    new MongoDB\BSON\Binary("random binary data without type");
+    new MongoDB\BSON\Binary();
 }, MongoDB\Driver\Exception\InvalidArgumentException::class), "\n";
 
 ?>
@@ -31,6 +31,6 @@ MongoDB\BSON\Binary::getData() expects exactly 0 %r(argument|parameter)%rs, 1 gi
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 MongoDB\BSON\Binary::getType() expects exactly 0 %r(argument|parameter)%rs, 1 given
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-MongoDB\BSON\Binary::__construct() expects exactly 2 %r(argument|parameter)%rs, 1 given
+MongoDB\BSON\Binary::__construct() expects at least 1 %r(argument|parameter)%r, 0 given
 ===DONE===