Php 7.3 fix (#5434) * Inherit from message instead of implement When regestering class (implmenets other class) during MINIT, zend_class_implements would call zend_class_entry->interface_gets_implemented(). In PHP-7.3 interface_gets_implemented shares the same location with create_object. However, during MINIT, the global object storeage hasn't been initialized. And thus, caused segment fault in php 7.3. * Use zend_string_init where interned string may be the value. zend_string_dup will keep using the existing interned string. In php 7.3, interned string cannot be destroyed from user's code. * Uncommment debug code * Use latest phpunit for each php versions * Revert change in Dockerfile * Update php test to use the new docker image * Update composer * Change docker organization * Update phpunit * Debug phpunit * Store phpunit into bin dir in docker image * Install valgrind to docker * Fix compatibility test * Remove generated_service_test from compatibility c extension test * Update 32bit php test to the new docker image * Install bison * Fix build.sh * Fix DOCKERIMAGE_PREFIX * Fix basename * Add comment to build_and_run_docker2.sh * Remove commented code * Fix comments
diff --git a/php/ext/google/protobuf/message.c b/php/ext/google/protobuf/message.c index 2843321..08a4793 100644 --- a/php/ext/google/protobuf/message.c +++ b/php/ext/google/protobuf/message.c
@@ -1231,7 +1231,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\Any", Any, any) - zend_class_implements(any_type TSRMLS_CC, 1, message_type); zend_declare_property_string(any_type, "type_url", strlen("type_url"), "" ,ZEND_ACC_PRIVATE TSRMLS_CC); zend_declare_property_string(any_type, "value", strlen("value"), @@ -1421,7 +1420,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\Duration", Duration, duration) - zend_class_implements(duration_type TSRMLS_CC, 1, message_type); zend_declare_property_long(duration_type, "seconds", strlen("seconds"), 0 ,ZEND_ACC_PRIVATE TSRMLS_CC); zend_declare_property_long(duration_type, "nanos", strlen("nanos"), @@ -1457,7 +1455,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\Timestamp", Timestamp, timestamp) - zend_class_implements(timestamp_type TSRMLS_CC, 1, message_type); zend_declare_property_long(timestamp_type, "seconds", strlen("seconds"), 0 ,ZEND_ACC_PRIVATE TSRMLS_CC); zend_declare_property_long(timestamp_type, "nanos", strlen("nanos"), @@ -1650,7 +1647,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\Api", Api, api) - zend_class_implements(api_type TSRMLS_CC, 1, message_type); zend_declare_property_null(api_type, "name", strlen("name"), ZEND_ACC_PRIVATE TSRMLS_CC); zend_declare_property_null(api_type, "methods", strlen("methods"), @@ -1697,7 +1693,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\BoolValue", BoolValue, bool_value) - zend_class_implements(bool_value_type TSRMLS_CC, 1, message_type); zend_declare_property_null(bool_value_type, "value", strlen("value"), ZEND_ACC_PRIVATE TSRMLS_CC); PHP_PROTO_INIT_SUBMSGCLASS_END @@ -1726,7 +1721,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\BytesValue", BytesValue, bytes_value) - zend_class_implements(bytes_value_type TSRMLS_CC, 1, message_type); zend_declare_property_null(bytes_value_type, "value", strlen("value"), ZEND_ACC_PRIVATE TSRMLS_CC); PHP_PROTO_INIT_SUBMSGCLASS_END @@ -1755,7 +1749,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\DoubleValue", DoubleValue, double_value) - zend_class_implements(double_value_type TSRMLS_CC, 1, message_type); zend_declare_property_null(double_value_type, "value", strlen("value"), ZEND_ACC_PRIVATE TSRMLS_CC); PHP_PROTO_INIT_SUBMSGCLASS_END @@ -1792,7 +1785,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\Enum", Enum, enum) - zend_class_implements(enum_type TSRMLS_CC, 1, message_type); zend_declare_property_null(enum_type, "name", strlen("name"), ZEND_ACC_PRIVATE TSRMLS_CC); zend_declare_property_null(enum_type, "enumvalue", strlen("enumvalue"), @@ -1837,7 +1829,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\EnumValue", EnumValue, enum_value) - zend_class_implements(enum_value_type TSRMLS_CC, 1, message_type); zend_declare_property_null(enum_value_type, "name", strlen("name"), ZEND_ACC_PRIVATE TSRMLS_CC); zend_declare_property_null(enum_value_type, "number", strlen("number"), @@ -1872,7 +1863,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\FieldMask", FieldMask, field_mask) - zend_class_implements(field_mask_type TSRMLS_CC, 1, message_type); zend_declare_property_null(field_mask_type, "paths", strlen("paths"), ZEND_ACC_PRIVATE TSRMLS_CC); PHP_PROTO_INIT_SUBMSGCLASS_END @@ -1919,7 +1909,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\Field", Field, field) - zend_class_implements(field_type TSRMLS_CC, 1, message_type); zend_declare_property_null(field_type, "kind", strlen("kind"), ZEND_ACC_PRIVATE TSRMLS_CC); zend_declare_property_null(field_type, "cardinality", strlen("cardinality"), @@ -1975,7 +1964,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\FloatValue", FloatValue, float_value) - zend_class_implements(float_value_type TSRMLS_CC, 1, message_type); zend_declare_property_null(float_value_type, "value", strlen("value"), ZEND_ACC_PRIVATE TSRMLS_CC); PHP_PROTO_INIT_SUBMSGCLASS_END @@ -2002,7 +1990,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\GPBEmpty", GPBEmpty, empty) - zend_class_implements(empty_type TSRMLS_CC, 1, message_type); PHP_PROTO_INIT_SUBMSGCLASS_END PHP_METHOD(GPBEmpty, __construct) { @@ -2028,7 +2015,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\Int32Value", Int32Value, int32_value) - zend_class_implements(int32_value_type TSRMLS_CC, 1, message_type); zend_declare_property_null(int32_value_type, "value", strlen("value"), ZEND_ACC_PRIVATE TSRMLS_CC); PHP_PROTO_INIT_SUBMSGCLASS_END @@ -2057,7 +2043,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\Int64Value", Int64Value, int64_value) - zend_class_implements(int64_value_type TSRMLS_CC, 1, message_type); zend_declare_property_null(int64_value_type, "value", strlen("value"), ZEND_ACC_PRIVATE TSRMLS_CC); PHP_PROTO_INIT_SUBMSGCLASS_END @@ -2086,7 +2071,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\ListValue", ListValue, list_value) - zend_class_implements(list_value_type TSRMLS_CC, 1, message_type); zend_declare_property_null(list_value_type, "values", strlen("values"), ZEND_ACC_PRIVATE TSRMLS_CC); PHP_PROTO_INIT_SUBMSGCLASS_END @@ -2127,7 +2111,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\Method", Method, method) - zend_class_implements(method_type TSRMLS_CC, 1, message_type); zend_declare_property_null(method_type, "name", strlen("name"), ZEND_ACC_PRIVATE TSRMLS_CC); zend_declare_property_null(method_type, "request_type_url", strlen("request_type_url"), @@ -2176,7 +2159,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\Mixin", Mixin, mixin) - zend_class_implements(mixin_type TSRMLS_CC, 1, message_type); zend_declare_property_null(mixin_type, "name", strlen("name"), ZEND_ACC_PRIVATE TSRMLS_CC); zend_declare_property_null(mixin_type, "root", strlen("root"), @@ -2210,7 +2192,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\Option", Option, option) - zend_class_implements(option_type TSRMLS_CC, 1, message_type); zend_declare_property_null(option_type, "name", strlen("name"), ZEND_ACC_PRIVATE TSRMLS_CC); zend_declare_property_null(option_type, "value", strlen("value"), @@ -2242,7 +2223,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\SourceContext", SourceContext, source_context) - zend_class_implements(source_context_type TSRMLS_CC, 1, message_type); zend_declare_property_null(source_context_type, "file_name", strlen("file_name"), ZEND_ACC_PRIVATE TSRMLS_CC); PHP_PROTO_INIT_SUBMSGCLASS_END @@ -2271,7 +2251,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\StringValue", StringValue, string_value) - zend_class_implements(string_value_type TSRMLS_CC, 1, message_type); zend_declare_property_null(string_value_type, "value", strlen("value"), ZEND_ACC_PRIVATE TSRMLS_CC); PHP_PROTO_INIT_SUBMSGCLASS_END @@ -2300,7 +2279,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\Struct", Struct, struct) - zend_class_implements(struct_type TSRMLS_CC, 1, message_type); zend_declare_property_null(struct_type, "fields", strlen("fields"), ZEND_ACC_PRIVATE TSRMLS_CC); PHP_PROTO_INIT_SUBMSGCLASS_END @@ -2339,7 +2317,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\Type", Type, type) - zend_class_implements(type_type TSRMLS_CC, 1, message_type); zend_declare_property_null(type_type, "name", strlen("name"), ZEND_ACC_PRIVATE TSRMLS_CC); zend_declare_property_null(type_type, "fields", strlen("fields"), @@ -2383,7 +2360,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\UInt32Value", UInt32Value, u_int32_value) - zend_class_implements(u_int32_value_type TSRMLS_CC, 1, message_type); zend_declare_property_null(u_int32_value_type, "value", strlen("value"), ZEND_ACC_PRIVATE TSRMLS_CC); PHP_PROTO_INIT_SUBMSGCLASS_END @@ -2412,7 +2388,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\UInt64Value", UInt64Value, u_int64_value) - zend_class_implements(u_int64_value_type TSRMLS_CC, 1, message_type); zend_declare_property_null(u_int64_value_type, "value", strlen("value"), ZEND_ACC_PRIVATE TSRMLS_CC); PHP_PROTO_INIT_SUBMSGCLASS_END @@ -2452,7 +2427,6 @@ // Init class entry. PHP_PROTO_INIT_SUBMSGCLASS_START("Google\\Protobuf\\Value", Value, value) - zend_class_implements(value_type TSRMLS_CC, 1, message_type); zend_declare_property_null(value_type, "kind", strlen("kind"), ZEND_ACC_PRIVATE TSRMLS_CC); PHP_PROTO_INIT_SUBMSGCLASS_END
diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index 0045358..5cbf348 100644 --- a/php/ext/google/protobuf/protobuf.h +++ b/php/ext/google/protobuf/protobuf.h
@@ -137,7 +137,8 @@ const char* class_name = CLASSNAME; \ INIT_CLASS_ENTRY_EX(class_type, CLASSNAME, strlen(CLASSNAME), \ LOWWERNAME##_methods); \ - LOWWERNAME##_type = zend_register_internal_class(&class_type TSRMLS_CC); \ + LOWWERNAME##_type = zend_register_internal_class_ex( \ + &class_type, message_type, NULL TSRMLS_CC); \ LOWWERNAME##_type->create_object = message_create; \ zend_do_inheritance(LOWWERNAME##_type, message_type TSRMLS_CC); #define PHP_PROTO_INIT_SUBMSGCLASS_END \ @@ -404,7 +405,8 @@ const char* class_name = CLASSNAME; \ INIT_CLASS_ENTRY_EX(class_type, CLASSNAME, strlen(CLASSNAME), \ LOWWERNAME##_methods); \ - LOWWERNAME##_type = zend_register_internal_class(&class_type TSRMLS_CC); \ + LOWWERNAME##_type = zend_register_internal_class_ex( \ + &class_type, message_type TSRMLS_CC); \ zend_do_inheritance(LOWWERNAME##_type, message_type TSRMLS_CC); #define PHP_PROTO_INIT_SUBMSGCLASS_END \ }
diff --git a/php/ext/google/protobuf/storage.c b/php/ext/google/protobuf/storage.c index a60fbe3..93a16dd 100644 --- a/php/ext/google/protobuf/storage.c +++ b/php/ext/google/protobuf/storage.c
@@ -180,7 +180,8 @@ PHP_PROTO_ZVAL_STRINGL(DEREF(memory, zval*), Z_STRVAL_P(value), Z_STRLEN_P(value), 1); #else - *(zend_string**)memory = zend_string_dup(Z_STR_P(value), 0); + *(zend_string**)memory = + zend_string_init(Z_STRVAL_P(value), Z_STRLEN_P(value), 0); #endif break; } @@ -231,7 +232,8 @@ PHP_PROTO_ZVAL_STRINGL(DEREF(memory, zval*), Z_STRVAL_P(value), Z_STRLEN_P(value), 1); #else - *(zend_string**)memory = zend_string_dup(Z_STR_P(value), 0); + *(zend_string**)memory = + zend_string_init(Z_STRVAL_P(value), Z_STRLEN_P(value), 0); #endif break; }
diff --git a/php/tests/array_test.php b/php/tests/array_test.php index 36a649e..b008433 100644 --- a/php/tests/array_test.php +++ b/php/tests/array_test.php
@@ -7,7 +7,7 @@ use Foo\TestMessage; use Foo\TestMessage\Sub; -class RepeatedFieldTest extends PHPUnit_Framework_TestCase +class RepeatedFieldTest extends \PHPUnit\Framework\TestCase { #########################################################
diff --git a/php/tests/compatibility_test.sh b/php/tests/compatibility_test.sh index dc8de5d..f4af524 100755 --- a/php/tests/compatibility_test.sh +++ b/php/tests/compatibility_test.sh
@@ -123,8 +123,12 @@ sed -i.bak '/php_implementation_test.php/d' phpunit.xml sed -i.bak '/generated_phpdoc_test.php/d' phpunit.xml sed -i.bak 's/generated_phpdoc_test.php//g' tests/test.sh +sed -i.bak 's/generated_service_test.php//g' tests/test.sh sed -i.bak '/memory_leak_test.php/d' tests/test.sh sed -i.bak '/^ public function testTimestamp()$/,/^ }$/d' tests/well_known_test.php +sed -i.bak 's/PHPUnit_Framework_TestCase/\\PHPUnit\\Framework\\TestCase/g' tests/array_test.php +sed -i.bak 's/PHPUnit_Framework_TestCase/\\PHPUnit\\Framework\\TestCase/g' tests/map_field_test.php +sed -i.bak 's/PHPUnit_Framework_TestCase/\\PHPUnit\\Framework\\TestCase/g' tests/test_base.php for t in "${tests[@]}" do remove_error_test tests/$t
diff --git a/php/tests/encode_decode_test.php b/php/tests/encode_decode_test.php index 8168eeb..06f9a90 100644 --- a/php/tests/encode_decode_test.php +++ b/php/tests/encode_decode_test.php
@@ -31,6 +31,7 @@ { $m = new TestMessage(); $m->mergeFromJsonString("{\"optionalInt32\":1}"); + $this->assertEquals(1, $m->getOptionalInt32()); } public function testDecodeTopLevelBoolValue() @@ -276,6 +277,7 @@ $to = new TestPackedMessage(); $to->mergeFromString(TestUtil::getGoldenTestPackedMessage()); TestUtil::assertTestPackedMessage($to); + $this->assertTrue(true); } public function testPackedDecodeUnpacked() @@ -283,6 +285,7 @@ $to = new TestPackedMessage(); $to->mergeFromString(TestUtil::getGoldenTestUnpackedMessage()); TestUtil::assertTestPackedMessage($to); + $this->assertTrue(true); } public function testUnpackedEncode() @@ -298,6 +301,7 @@ $to = new TestUnpackedMessage(); $to->mergeFromString(TestUtil::getGoldenTestPackedMessage()); TestUtil::assertTestPackedMessage($to); + $this->assertTrue(true); } public function testUnpackedDecodeUnpacked() @@ -305,6 +309,7 @@ $to = new TestUnpackedMessage(); $to->mergeFromString(TestUtil::getGoldenTestUnpackedMessage()); TestUtil::assertTestPackedMessage($to); + $this->assertTrue(true); } public function testDecodeInt64() @@ -361,6 +366,7 @@ $data = hex2bin('c80501'); $m = new TestMessage(); $m->mergeFromString($data); + $this->assertTrue(true); } public function testEncodeNegativeInt32()
diff --git a/php/tests/generated_class_test.php b/php/tests/generated_class_test.php index 96dad22..38c3809 100644 --- a/php/tests/generated_class_test.php +++ b/php/tests/generated_class_test.php
@@ -260,12 +260,14 @@ { $m = new TestMessage(); $m->setOptionalNestedEnum(NestedEnum::ZERO); + $this->assertTrue(true); } public function testLegacyNestedEnum() { $m = new TestMessage(); $m->setOptionalNestedEnum(\Foo\TestMessage_NestedEnum::ZERO); + $this->assertTrue(true); } public function testLegacyTypehintWithNestedEnums() @@ -405,6 +407,7 @@ $m = new TestMessage(); $hex = hex2bin("ff"); $m->setOptionalBytes($hex); + $this->assertTrue(true); } ######################################################### @@ -709,6 +712,8 @@ // test nested messages $sub = new NoNamespaceMessage\NestedMessage(); $n->setNestedMessage($sub); + + $this->assertTrue(true); } public function testEnumWithoutNamespace() @@ -718,6 +723,7 @@ $repeatedNoNamespaceEnum = $m->getRepeatedNoNamespaceEnum(); $repeatedNoNamespaceEnum[] = NoNameSpaceEnum::VALUE_A; $m->setRepeatedNoNamespaceEnum($repeatedNoNamespaceEnum); + $this->assertTrue(true); } ######################################################### @@ -1262,6 +1268,8 @@ $m = \Upper_enum_value\NotAllowed::NULL; $m = \Upper_enum_value\NotAllowed::VOID; $m = \Upper_enum_value\NotAllowed::ITERABLE; + + $this->assertTrue(true); } ######################################################### @@ -1297,6 +1305,7 @@ { $m = new testLowerCaseMessage(); $n = testLowerCaseEnum::VALUE; + $this->assertTrue(true); } ######################################################### @@ -1363,6 +1372,7 @@ ]); TestUtil::assertTestMessage($m); + $this->assertTrue(true); } #########################################################
diff --git a/php/tests/map_field_test.php b/php/tests/map_field_test.php index 447bdd9..0260879 100644 --- a/php/tests/map_field_test.php +++ b/php/tests/map_field_test.php
@@ -7,7 +7,7 @@ use Foo\TestMessage; use Foo\TestMessage\Sub; -class MapFieldTest extends PHPUnit_Framework_TestCase { +class MapFieldTest extends \PHPUnit\Framework\TestCase { ######################################################### # Test int32 field.
diff --git a/php/tests/test_base.php b/php/tests/test_base.php index 80f603c..27efc87 100644 --- a/php/tests/test_base.php +++ b/php/tests/test_base.php
@@ -4,7 +4,7 @@ use Foo\TestEnum; use Foo\TestMessage\Sub; -class TestBase extends PHPUnit_Framework_TestCase +class TestBase extends \PHPUnit\Framework\TestCase { public function setFields(TestMessage $m) @@ -338,5 +338,6 @@ // This test is to avoid the warning of no test by php unit. public function testNone() { + $this->assertTrue(true); } }
diff --git a/php/tests/well_known_test.php b/php/tests/well_known_test.php index db5d5a7..a16e070 100644 --- a/php/tests/well_known_test.php +++ b/php/tests/well_known_test.php
@@ -48,6 +48,7 @@ public function testImportDescriptorProto() { $msg = new TestImportDescriptorProto(); + $this->assertTrue(true); } public function testAny()