Implement mergeFrom for hhvm

Author: TeBoring

php/ext/google/protobuf/hhvm/ext_protobuf.php

@@ -13,6 +13,8 @@ public function __construct(): void;
   <<__Native>>
   public function serializeToString(): string;
   <<__Native>>
+  public function mergeFrom(Message $other): void;
+  <<__Native>>
   public function mergeFromString(string $data): void;
   <<__Native>>
   public function writeProperty(string $name, mixed $value): void;

php/ext/google/protobuf/hhvm/message_hhvm.cpp

@@ -291,6 +291,7 @@ static Variant Message_unset(const Object& obj, const String& name) {
 
 void HHVM_METHOD(Message, __construct);
 String HHVM_METHOD(Message, serializeToString);
+void HHVM_METHOD(Message, mergeFrom, const Variant& other);
 void HHVM_METHOD(Message, mergeFromString, const String& data);
 void HHVM_METHOD(Message, writeProperty, const String& name,
                  const Variant& value);
@@ -307,6 +308,8 @@ void Message_init() {
                 __construct, HHVM_MN(Message, __construct));
   HHVM_NAMED_ME(Google\\Protobuf\\Internal\\Message,
                 serializeToString, HHVM_MN(Message, serializeToString));
+  HHVM_NAMED_ME(Google\\Protobuf\\Internal\\Message,
+                mergeFrom, HHVM_MN(Message, mergeFrom));
   HHVM_NAMED_ME(Google\\Protobuf\\Internal\\Message,
                 mergeFromString, HHVM_MN(Message, mergeFromString));
   HHVM_NAMED_ME(Google\\Protobuf\\Internal\\Message,
@@ -349,6 +352,12 @@ String HHVM_METHOD(Message, serializeToString) {
   return return_value;
 }
 
+void HHVM_METHOD(Message, mergeFrom, const Variant& other) {
+  Message* from = Native::data<Message>(other.toObject());
+  Message* to = Native::data<Message>(this_);
+  Message_mergeFrom(from, to);
+}
+
 void HHVM_METHOD(Message, mergeFromString, const String& data) {
   Message* intern = Native::data<Message>(this_);
   Message_mergeFromString(intern, data.c_str(), data.length());

php/ext/google/protobuf/hhvm/test.sh

@@ -34,34 +34,34 @@ run_tests()
 
 PROTOC=../../../../../src/protoc
 
-# # Test HHVM
-# echo "****************************"
-# echo "* Test HHVM"
-# echo "****************************"
-# rm -rf generated
-# mkdir generated
-# 
-# $PROTOC --php_out=hhvm:generated             \
-#   proto/test.proto                           \
-#   proto/test_include.proto                   \
-#   proto/test_no_namespace.proto              \
-#   proto/test_prefix.proto                    \
-#   proto/test_php_namespace.proto             \
-#   proto/test_empty_php_namespace.proto       \
-#   proto/test_reserved_enum_lower.proto       \
-#   proto/test_reserved_enum_upper.proto       \
-#   proto/test_reserved_enum_value_lower.proto \
-#   proto/test_reserved_enum_value_upper.proto \
-#   proto/test_reserved_message_lower.proto    \
-#   proto/test_reserved_message_upper.proto    \
-#   proto/test_service.proto                   \
-#   proto/test_service_namespace.proto         \
-#   proto/test_descriptors.proto
-# 
-# # make clean; hphpize; cmake . && make && hhvm -d extension_dir=. -d hhvm.extensions[]=protobuf.so test_hhvm.php
-# phpunit --version
-# make clean; hphpize; cmake . && TMPDIR=~/tmp make
-# run_tests hhvm
+# Test HHVM
+echo "****************************"
+echo "* Test HHVM"
+echo "****************************"
+rm -rf generated
+mkdir generated
+
+$PROTOC --php_out=hhvm:generated             \
+  proto/test.proto                           \
+  proto/test_include.proto                   \
+  proto/test_no_namespace.proto              \
+  proto/test_prefix.proto                    \
+  proto/test_php_namespace.proto             \
+  proto/test_empty_php_namespace.proto       \
+  proto/test_reserved_enum_lower.proto       \
+  proto/test_reserved_enum_upper.proto       \
+  proto/test_reserved_enum_value_lower.proto \
+  proto/test_reserved_enum_value_upper.proto \
+  proto/test_reserved_message_lower.proto    \
+  proto/test_reserved_message_upper.proto    \
+  proto/test_service.proto                   \
+  proto/test_service_namespace.proto         \
+  proto/test_descriptors.proto
+
+# make clean; hphpize; cmake . && make && hhvm -d extension_dir=. -d hhvm.extensions[]=protobuf.so test_hhvm.php
+phpunit --version
+make clean; hphpize; cmake . && TMPDIR=~/tmp make
+run_tests hhvm
 
 # Test PHP
 rm -rf generated