diff options
| author |  Paul Yang <TeBoring@users.noreply.github.com> | 2018-05-25 13:43:22 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-05-25 13:43:22 -0700 |
| commit | 4885b8058a93c1a16efe41fd1830d321e9bb2ce6 (patch) | |
| tree | 0069b72edfd5639db022fb985b8a4e57abf6967c /php/src/Google/Protobuf/Internal/FileDescriptorSet.php | |
| parent | 449e532b087e43a45ca6d8eae640a6019e547aca (diff) | |
| parent | dadc95438ff732cb0c1d2961ce7bcf0d99d179b1 (diff) | |
Merge pull request #4675 from TeBoring/3.6.x
Cherry-pick php generated code changes into 3.6.x
Diffstat (limited to 'php/src/Google/Protobuf/Internal/FileDescriptorSet.php')
| -rw-r--r-- | php/src/Google/Protobuf/Internal/FileDescriptorSet.php | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/php/src/Google/Protobuf/Internal/FileDescriptorSet.php b/php/src/Google/Protobuf/Internal/FileDescriptorSet.php index 0b2cf957..9907b17d 100644 --- a/php/src/Google/Protobuf/Internal/FileDescriptorSet.php +++ b/php/src/Google/Protobuf/Internal/FileDescriptorSet.php @@ -24,9 +24,18 @@ class FileDescriptorSet extends \Google\Protobuf\Internal\Message private $file; private $has_file = false; - public function __construct() { + /** + * Constructor. + * + * @param array $data { + * Optional. Data for populating the Message object. + * + * @type \Google\Protobuf\Internal\FileDescriptorProto[]|\Google\Protobuf\Internal\RepeatedField $file + * } + */ + public function __construct($data = NULL) { \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce(); - parent::__construct(); + parent::__construct($data); } /** |