Skip to content

Commit e04fe69

Browse files
bshaffercopybara-github
authored andcommitted
feat(php): improve return typehint when repeatedfield (#11734)
Adds the type of the `RepeatedField` to the PHPDoc, e.g. ```php /** * @return \Google\Protobuf\Internal\RepeatedField<int> */ ``` Whereas before, the `<int>` part was not included. This is the "getter" counterpart for #4533 Closes #11734 PiperOrigin-RevId: 726881276
1 parent 4f5968a commit e04fe69

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+570
-503
lines changed

php/BUILD.bazel

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,13 @@ _RUNTIME_SOURCES = [
4747
"src/Google/Protobuf/Internal/MessageBuilderContext.php",
4848
"src/Google/Protobuf/Internal/OneofDescriptor.php",
4949
"src/Google/Protobuf/Internal/OneofField.php",
50-
"src/Google/Protobuf/PrintOptions.php",
5150
"src/Google/Protobuf/Internal/RawInputStream.php",
5251
"src/Google/Protobuf/Internal/RepeatedField.php",
5352
"src/Google/Protobuf/Internal/RepeatedFieldIter.php",
5453
"src/Google/Protobuf/Internal/TimestampBase.php",
5554
"src/Google/Protobuf/OneofDescriptor.php",
55+
"src/Google/Protobuf/PrintOptions.php",
56+
"src/Google/Protobuf/RepeatedField.php",
5657
]
5758

5859
filegroup(

php/ext/google/protobuf/array.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ void Array_ModuleInit() {
646646
zend_object_handlers* h;
647647

648648
// RepeatedField.
649-
INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Internal\\RepeatedField",
649+
INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\RepeatedField",
650650
repeated_field_methods);
651651

652652
RepeatedField_class_entry = zend_register_internal_class(&tmp_ce);
@@ -663,6 +663,12 @@ void Array_ModuleInit() {
663663
h->get_properties = RepeatedField_GetProperties;
664664
h->get_property_ptr_ptr = RepeatedField_GetPropertyPtrPtr;
665665

666+
// RepeatedField alias (for backwards compatibility).
667+
zend_register_class_alias_ex(
668+
"Google\\Protobuf\\Internal\\RepeatedField",
669+
strlen("Google\\Protobuf\\Internal\\RepeatedField"),
670+
RepeatedField_class_entry, true);
671+
666672
// RepeatedFieldIter
667673
INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Internal\\RepeatedFieldIter",
668674
repeated_field_iter_methods);

php/src/Google/Protobuf/Any.php

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

php/src/Google/Protobuf/Api.php

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

php/src/Google/Protobuf/BoolValue.php

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

php/src/Google/Protobuf/BytesValue.php

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

php/src/Google/Protobuf/DoubleValue.php

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

php/src/Google/Protobuf/Duration.php

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

php/src/Google/Protobuf/Enum.php

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

php/src/Google/Protobuf/EnumValue.php

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

php/src/Google/Protobuf/Field.php

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

php/src/Google/Protobuf/FieldMask.php

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

php/src/Google/Protobuf/FloatValue.php

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

php/src/Google/Protobuf/GPBEmpty.php

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

php/src/Google/Protobuf/Int32Value.php

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

php/src/Google/Protobuf/Int64Value.php

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)