diff options
author | 2017-08-07 11:47:29 -0700 | |
---|---|---|
committer | 2017-08-07 11:47:29 -0700 | |
commit | 3afcded28a6aa9c44adf801ca5bff2133fcf3030 (patch) | |
tree | cebd73fdf090a98c32ad1a1c996af9cc8f1f8ad6 /php/src/Google/Protobuf/Internal/FieldDescriptor.php | |
parent | 176713d6fbbf72056b009f76e7625f267273bd75 (diff) | |
parent | 8f4b8e430a0cf087af423be434cf8d837027c651 (diff) |
Merge pull request #3461 from TeBoring/3.4.x
Merge master into 3.4.x
Diffstat (limited to 'php/src/Google/Protobuf/Internal/FieldDescriptor.php')
-rw-r--r-- | php/src/Google/Protobuf/Internal/FieldDescriptor.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/php/src/Google/Protobuf/Internal/FieldDescriptor.php b/php/src/Google/Protobuf/Internal/FieldDescriptor.php index f18bf810..1443c6fd 100644 --- a/php/src/Google/Protobuf/Internal/FieldDescriptor.php +++ b/php/src/Google/Protobuf/Internal/FieldDescriptor.php @@ -34,6 +34,7 @@ namespace Google\Protobuf\Internal; class FieldDescriptor { + use HasPublicDescriptorTrait; private $name; private $json_name; @@ -48,6 +49,11 @@ class FieldDescriptor private $is_map; private $oneof_index = -1; + public function __construct() + { + $this->public_desc = new \Google\Protobuf\FieldDescriptor($this); + } + public function setOneofIndex($index) { $this->oneof_index = $index; |