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

1 files changed, 20 insertions, 1 deletions

diff --git a/php/src/Google/Protobuf/Internal/Descriptor.php b/php/src/Google/Protobuf/Internal/Descriptor.php
index 44225ad2..ee3a8bde 100644
--- a/php/src/Google/Protobuf/Internal/Descriptor.php
+++ b/php/src/Google/Protobuf/Internal/Descriptor.php
@@ -34,17 +34,24 @@ namespace Google\Protobuf\Internal;
 
 class Descriptor
 {
+    use HasPublicDescriptorTrait;
 
     private $full_name;
     private $field = [];
     private $json_to_field = [];
     private $name_to_field = [];
+    private $index_to_field = [];
     private $nested_type = [];
     private $enum_type = [];
     private $klass;
     private $options;
     private $oneof_decl = [];
 
+    public function __construct()
+    {
+        $this->public_desc = new \Google\Protobuf\Descriptor($this);
+    }
+
     public function addOneofDecl($oneof)
     {
         $this->oneof_decl[] = $oneof;
@@ -70,6 +77,7 @@ class Descriptor
         $this->field[$field->getNumber()] = $field;
         $this->json_to_field[$field->getJsonName()] = $field;
         $this->name_to_field[$field->getName()] = $field;
+        $this->index_to_field[] = $field;
     }
 
     public function getField()
@@ -124,6 +132,15 @@ class Descriptor
         }
     }
 
+    public function getFieldByIndex($index)
+    {
+        if (count($this->index_to_field) <= $index) {
+            return NULL;
+        } else {
+            return $this->index_to_field[$index];
+        }
+    }
+
     public function setClass($klass)
     {
         $this->klass = $klass;
@@ -179,9 +196,11 @@ class Descriptor
         }
 
         // Handle oneof fields.
+        $index = 0;
         foreach ($proto->getOneofDecl() as $oneof_proto) {
             $desc->addOneofDecl(
-                OneofDescriptor::buildFromProto($oneof_proto, $desc));
+                OneofDescriptor::buildFromProto($oneof_proto, $desc, $index));
+            $index++;
         }
 
         return $desc;