v3.13.0.1

Author: TeBoring

src/GPBMetadata/Google/Protobuf/Internal/Descriptor.php

@@ -97,4 +97,12 @@ public function getOneofDeclCount()
     {
         return count($this->internal_desc->getOneofDecl());
     }
+
+    /**
+     * @return int Number of real oneofs in message
+     */
+    public function getRealOneofDeclCount()
+    {
+        return $this->internal_desc->getRealOneofDeclCount();
+    }
 }

src/GPBMetadata/Google/Protobuf/Struct.php

@@ -114,4 +114,12 @@ public function isMap()
     {
         return $this->internal_desc->isMap();
     }
+
+    /**
+     * @return boolean
+     */
+    public function hasOptionalKeyword()
+    {
+        return $this->internal_desc->hasOptionalKeyword();
+    }
 }

src/Google/Protobuf/Any.php

@@ -220,7 +220,7 @@ public function readVarintSizeAsInt(&$var)
     }
 
     /**
-     * Read 32-bit unsiged integer to $var. If the buffer has less than 4 bytes,
+     * Read 32-bit unsigned integer to $var. If the buffer has less than 4 bytes,
      * return false. Advance buffer with consumed bytes.
      * @param $var.
      */
@@ -236,7 +236,7 @@ public function readLittleEndian32(&$var)
     }
 
     /**
-     * Read 64-bit unsiged integer to $var. If the buffer has less than 8 bytes,
+     * Read 64-bit unsigned integer to $var. If the buffer has less than 8 bytes,
      * return false. Advance buffer with consumed bytes.
      * @param $var.
      */
@@ -283,7 +283,7 @@ public function readTag()
         }
 
         $result = 0;
-        // The larget tag is 2^29 - 1, which can be represented by int32.
+        // The largest tag is 2^29 - 1, which can be represented by int32.
         $success = $this->readVarint32($result);
         if ($success) {
             return $result;
@@ -299,8 +299,12 @@ public function readRaw($size, &$buffer)
             return false;
         }
 
-        $buffer = substr($this->buffer, $this->current, $size);
-        $this->advance($size);
+        if ($size === 0) {
+          $buffer = "";
+        } else {
+          $buffer = substr($this->buffer, $this->current, $size);
+          $this->advance($size);
+        }
 
         return true;
     }

src/Google/Protobuf/Descriptor.php

@@ -185,8 +185,8 @@ public static function buildFromProto($proto, $file_proto, $containing)
             $containing,
             $file_proto,
             $message_name_without_package,
-            $legacy_classname,
             $classname,
+            $legacy_classname,
             $fullname);
         $desc->setFullName($fullname);
         $desc->setClass($classname);

src/Google/Protobuf/FieldDescriptor.php

@@ -55,26 +55,29 @@ public static function getGeneratedPool()
         return self::$pool;
     }
 
-    public function internalAddGeneratedFile($data)
+    public function internalAddGeneratedFile($data, $use_nested = false)
     {
         $files = new FileDescriptorSet();
         $files->mergeFromString($data);
-        $file = FileDescriptor::buildFromProto($files->getFile()[0]);
 
-        foreach ($file->getMessageType() as $desc) {
-            $this->addDescriptor($desc);
-        }
-        unset($desc);
+        foreach($files->getFile() as $file_proto) {
+            $file = FileDescriptor::buildFromProto($file_proto);
 
-        foreach ($file->getEnumType() as $desc) {
-            $this->addEnumDescriptor($desc);
-        }
-        unset($desc);
+            foreach ($file->getMessageType() as $desc) {
+                $this->addDescriptor($desc);
+            }
+            unset($desc);
 
-        foreach ($file->getMessageType() as $desc) {
-            $this->crossLink($desc);
+            foreach ($file->getEnumType() as $desc) {
+                $this->addEnumDescriptor($desc);
+            }
+            unset($desc);
+
+            foreach ($file->getMessageType() as $desc) {
+                $this->crossLink($desc);
+            }
+            unset($desc);
         }
-        unset($desc);
     }
 
     public function addMessage($name, $klass)
@@ -149,11 +152,22 @@ private function crossLink(Descriptor $desc)
             switch ($field->getType()) {
                 case GPBType::MESSAGE:
                     $proto = $field->getMessageType();
-                    $field->setMessageType(
-                        $this->getDescriptorByProtoName($proto));
+                    if ($proto[0] == '.') {
+                      $proto = substr($proto, 1);
+                    }
+                    $subdesc = $this->getDescriptorByProtoName($proto);
+                    if (is_null($subdesc)) {
+                        trigger_error(
+                            'proto not added: ' . $proto
+                            . " for " . $desc->getFullName(), E_ERROR);
+                    }
+                    $field->setMessageType($subdesc);
                     break;
                 case GPBType::ENUM:
                     $proto = $field->getEnumType();
+                    if ($proto[0] == '.') {
+                      $proto = substr($proto, 1);
+                    }
                     $field->setEnumType(
                         $this->getEnumDescriptorByProtoName($proto));
                     break;