Skip to content

P
protobuf
Commit 9df89cca authored by Ryan Gordon's avatar Ryan Gordon Committed by Paul Yang
Browse files
Options

Fixing HHVM Compatibility (#3437)

parent c15a3269
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
php/src/Google/Protobuf/Internal/Message.php
View file @ 9df89cca
......@@ -841,7 +841,6 @@ class Message
if (is_null($value)) {
continue;
}
$getter = $field->getGetter();
$key_field = $field->getMessageType()->getFieldByNumber(1);
$value_field = $field->getMessageType()->getFieldByNumber(2);
foreach ($value as $tmp_key => $tmp_value) {
......@@ -858,13 +857,12 @@ class Message
$this->convertJsonValueToProtoValue(
$tmp_value,
$value_field);
$this->$getter()[$proto_key] = $proto_value;
self::kvUpdateHelper($field, $proto_key, $proto_value);
}
} else if ($field->isRepeated()) {
if (is_null($value)) {
continue;
}
$getter = $field->getGetter();
foreach ($value as $tmp) {
if (is_null($tmp)) {
throw new \Exception(
......@@ -872,7 +870,7 @@ class Message
}
$proto_value =
$this->convertJsonValueToProtoValue($tmp, $field);
$this->$getter()[] = $proto_value;
self::appendHelper($field, $proto_value);
}
} else {
$setter = $field->getSetter();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment