aboutsummaryrefslogtreecommitdiff
path: root/php/src/Google/Protobuf/Internal/UninterpretedOption_NamePart.php
diff options
context:
space:
mode:
authorBrent Shaffer <betterbrent@google.com>2018-05-02 14:40:15 -0700
committerBo Yang <teboring@google.com>2018-05-25 13:03:58 -0700
commitc9b404d23bdf3dd8f1556b19a27dcba40565e3e4 (patch)
treee62606471c739037a4f7e40757c26f0225b15649 /php/src/Google/Protobuf/Internal/UninterpretedOption_NamePart.php
parent7eba62465375b15a28d3f7bbd08f4f517b90b076 (diff)
downloadprotobuf-c9b404d23bdf3dd8f1556b19a27dcba40565e3e4.tar.gz
protobuf-c9b404d23bdf3dd8f1556b19a27dcba40565e3e4.tar.bz2
protobuf-c9b404d23bdf3dd8f1556b19a27dcba40565e3e4.zip
PHP array constructors for protobuf messages (#4530)
* PHP array constructors for protobuf messages * removes Descriptor from error message * allows mergeFrom to accept an array * only use initWithDescriptor if instanceof MapEntry * adds doc comments * removes ability for constructors to take arrays for submessages * Revert "allows mergeFrom to accept an array" This reverts commit b7b72182d561634af12c5c5c56a7cda3b33241f9. * makes mergeFromArray protected and fixes mergeFrom whitespace * Separates merging from JSON and merging from PHP array * removes well-known types and json keys from array construction * Addresses PR review comments * cleans up tests * fixes exception messages
Diffstat (limited to 'php/src/Google/Protobuf/Internal/UninterpretedOption_NamePart.php')
-rw-r--r--php/src/Google/Protobuf/Internal/UninterpretedOption_NamePart.php14
1 files changed, 12 insertions, 2 deletions
diff --git a/php/src/Google/Protobuf/Internal/UninterpretedOption_NamePart.php b/php/src/Google/Protobuf/Internal/UninterpretedOption_NamePart.php
index c9a6fc3c..d4369fda 100644
--- a/php/src/Google/Protobuf/Internal/UninterpretedOption_NamePart.php
+++ b/php/src/Google/Protobuf/Internal/UninterpretedOption_NamePart.php
@@ -32,9 +32,19 @@ class UninterpretedOption_NamePart extends \Google\Protobuf\Internal\Message
private $is_extension = false;
private $has_is_extension = false;
- public function __construct() {
+ /**
+ * Constructor.
+ *
+ * @param array $data {
+ * Optional. Data for populating the Message object.
+ *
+ * @type string $name_part
+ * @type bool $is_extension
+ * }
+ */
+ public function __construct($data = NULL) {
\GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
- parent::__construct();
+ parent::__construct($data);
}
/**