diff options
| author |  Adam Cozzette <acozzette@gmail.com> | 2018-06-25 15:52:29 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-06-25 15:52:29 -0700 |
| commit | d6f346b4d55ae5112934297593ec1c56c3d178a5 (patch) | |
| tree | 021b5476160e465a20ef7d4ae4c0524351667233 /php/src/Google/Protobuf/Internal/DescriptorPool.php | |
| parent | 3d603f481ed142d0be5e8e4dd6d1cb4457a51405 (diff) | |
| parent | 82d3d7d250645322f8a7343188e5ae6246a76414 (diff) | |
Merge pull request #4827 from acozzette/merge-3-6-x
Merge 3.6.x branch into master
Diffstat (limited to 'php/src/Google/Protobuf/Internal/DescriptorPool.php')
| -rw-r--r-- | php/src/Google/Protobuf/Internal/DescriptorPool.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/php/src/Google/Protobuf/Internal/DescriptorPool.php b/php/src/Google/Protobuf/Internal/DescriptorPool.php index 304c1615..9b4dcc01 100644 --- a/php/src/Google/Protobuf/Internal/DescriptorPool.php +++ b/php/src/Google/Protobuf/Internal/DescriptorPool.php @@ -92,6 +92,7 @@ class DescriptorPool $this->proto_to_class[$descriptor->getFullName()] = $descriptor->getClass(); $this->class_to_desc[$descriptor->getClass()] = $descriptor; + $this->class_to_desc[$descriptor->getLegacyClass()] = $descriptor; foreach ($descriptor->getNestedType() as $nested_type) { $this->addDescriptor($nested_type); } @@ -105,6 +106,7 @@ class DescriptorPool $this->proto_to_class[$descriptor->getFullName()] = $descriptor->getClass(); $this->class_to_enum_desc[$descriptor->getClass()] = $descriptor; + $this->class_to_enum_desc[$descriptor->getLegacyClass()] = $descriptor; } public function getDescriptorByClassName($klass) |