From 21b0e5587c01948927ede9be789671ff116b7ad4 Mon Sep 17 00:00:00 2001
From: michaelbausor <michaelbausor@google.com>
Date: Fri, 4 Aug 2017 16:35:22 -0700
Subject: Update PHP descriptors (#3391)

* Add descriptors test

* Update descriptors tests

* Add public descriptors

* Add test_desriptors.proto to test script

* Update composer files

* Remove references to GPBType, update tests to be compatible with c

* Update for c extension compatibility

* Remove nested enums for descriptor, update tests

* Strip leading '.' from descriptor name

* Update tests with test for getClass, fix OneofDescriptor

* Add new files to Makefile.am
---
 php/src/Google/Protobuf/Internal/FieldDescriptor.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'php/src/Google/Protobuf/Internal/FieldDescriptor.php')

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;
-- 
cgit v1.2.3