diff options
| author | Paul Yang <TeBoring@users.noreply.github.com> | 2019-05-24 10:00:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-24 10:00:09 -0700 |
| commit | 9a8ef05a34dab7583b6f253daca294d6b1bfb187 (patch) | |
| tree | 6ac09ab42aad71c4c490987d5fbba82dac16f55d /php/tests/proto/test_wrapper_type_setters.proto | |
| parent | e038b1e7c0901d6abeaf02a893299487b15beb66 (diff) | |
| download | protobuf-9a8ef05a34dab7583b6f253daca294d6b1bfb187.tar.gz | |
Append field number to accessors if there is conflict (#6169)
Previously, foo_value and foo (wrapper field) will both have get/setFooValue
Diffstat (limited to 'php/tests/proto/test_wrapper_type_setters.proto')
| -rw-r--r-- | php/tests/proto/test_wrapper_type_setters.proto | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/php/tests/proto/test_wrapper_type_setters.proto b/php/tests/proto/test_wrapper_type_setters.proto index 41ca7f3f3..119bd2547 100644 --- a/php/tests/proto/test_wrapper_type_setters.proto +++ b/php/tests/proto/test_wrapper_type_setters.proto @@ -24,3 +24,14 @@ message TestWrapperSetters { map<string, google.protobuf.StringValue> map_string_value = 13; } + +message TestWrapperAccessorConflicts { + int32 normal_vs_wrapper_value = 1; + google.protobuf.Int32Value normal_vs_wrapper = 2; + + int32 normal_vs_normal_value = 3; + int32 normal_vs_normal = 4; + + google.protobuf.Int32Value wrapper_vs_wrapper_value = 5; + google.protobuf.Int32Value wrapper_vs_wrapper = 6; +} |