فهرست منبع

Use fully qualifed name for DescriptorPool in Any.php to avoid name (#3886)

conflict
Paul Yang 7 سال پیش
والد
کامیت
857a021645
1فایلهای تغییر یافته به همراه3 افزوده شده و 4 حذف شده
  1. 3 4
      php/src/Google/Protobuf/Any.php

+ 3 - 4
php/src/Google/Protobuf/Any.php

@@ -4,7 +4,6 @@
 
 
 namespace Google\Protobuf;
 namespace Google\Protobuf;
 
 
-use Google\Protobuf\Internal\DescriptorPool;
 use Google\Protobuf\Internal\GPBType;
 use Google\Protobuf\Internal\GPBType;
 use Google\Protobuf\Internal\GPBUtil;
 use Google\Protobuf\Internal\GPBUtil;
 use Google\Protobuf\Internal\Message;
 use Google\Protobuf\Internal\Message;
@@ -217,7 +216,7 @@ class Any extends \Google\Protobuf\Internal\Message
             substr($this->type_url, $url_prifix_len);
             substr($this->type_url, $url_prifix_len);
 
 
         // Create message according to fully qualified name.
         // Create message according to fully qualified name.
-        $pool = DescriptorPool::getGeneratedPool();
+        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
         $desc = $pool->getDescriptorByProtoName( ".".$fully_qualifed_name);
         $desc = $pool->getDescriptorByProtoName( ".".$fully_qualifed_name);
         if (is_null($desc)) {
         if (is_null($desc)) {
             throw new \Exception("Class ".$fully_qualifed_name
             throw new \Exception("Class ".$fully_qualifed_name
@@ -248,7 +247,7 @@ class Any extends \Google\Protobuf\Internal\Message
         $this->value = $msg->serializeToString();
         $this->value = $msg->serializeToString();
 
 
         // Set type url.
         // Set type url.
-        $pool = DescriptorPool::getGeneratedPool();
+        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
         $desc = $pool->getDescriptorByClassName(get_class($msg));
         $desc = $pool->getDescriptorByClassName(get_class($msg));
         $fully_qualifed_name = $desc->getFullName();
         $fully_qualifed_name = $desc->getFullName();
         $this->type_url = GPBUtil::TYPE_URL_PREFIX.substr(
         $this->type_url = GPBUtil::TYPE_URL_PREFIX.substr(
@@ -262,7 +261,7 @@ class Any extends \Google\Protobuf\Internal\Message
      */
      */
     public function is($klass)
     public function is($klass)
     {
     {
-        $pool = DescriptorPool::getGeneratedPool();
+        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
         $desc = $pool->getDescriptorByClassName($klass);
         $desc = $pool->getDescriptorByClassName($klass);
         $fully_qualifed_name = $desc->getFullName();
         $fully_qualifed_name = $desc->getFullName();
         $type_url = GPBUtil::TYPE_URL_PREFIX.substr(
         $type_url = GPBUtil::TYPE_URL_PREFIX.substr(