diff --git a/src/BaseClient.php b/src/BaseClient.php index cd413ed..28ddc2b 100644 --- a/src/BaseClient.php +++ b/src/BaseClient.php @@ -9,6 +9,7 @@ * @contact group@hyperf.io * @license /~https://github.com/hyperf/hyperf/blob/master/LICENSE */ + namespace Hyperf\GrpcClient; use Google\Protobuf\Internal\Message; diff --git a/src/BidiStreamingCall.php b/src/BidiStreamingCall.php index 68f9bf0..08cc289 100644 --- a/src/BidiStreamingCall.php +++ b/src/BidiStreamingCall.php @@ -9,6 +9,7 @@ * @contact group@hyperf.io * @license /~https://github.com/hyperf/hyperf/blob/master/LICENSE */ + namespace Hyperf\GrpcClient; class BidiStreamingCall extends StreamingCall diff --git a/src/ClientStreamingCall.php b/src/ClientStreamingCall.php index b91e95f..e6d0a58 100644 --- a/src/ClientStreamingCall.php +++ b/src/ClientStreamingCall.php @@ -9,6 +9,7 @@ * @contact group@hyperf.io * @license /~https://github.com/hyperf/hyperf/blob/master/LICENSE */ + namespace Hyperf\GrpcClient; use Hyperf\Grpc\StatusCode; diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php index 94f92d0..673f867 100644 --- a/src/ConfigProvider.php +++ b/src/ConfigProvider.php @@ -9,6 +9,7 @@ * @contact group@hyperf.io * @license /~https://github.com/hyperf/hyperf/blob/master/LICENSE */ + namespace Hyperf\GrpcClient; use Hyperf\GrpcClient\Listener\RegisterProtocolListener; diff --git a/src/DataFormatter.php b/src/DataFormatter.php index 46b134b..aaaf672 100644 --- a/src/DataFormatter.php +++ b/src/DataFormatter.php @@ -9,6 +9,7 @@ * @contact group@hyperf.io * @license /~https://github.com/hyperf/hyperf/blob/master/LICENSE */ + namespace Hyperf\GrpcClient; use Hyperf\Rpc\Context; diff --git a/src/Exception/GrpcClientException.php b/src/Exception/GrpcClientException.php index ed19b62..44ddd2b 100644 --- a/src/Exception/GrpcClientException.php +++ b/src/Exception/GrpcClientException.php @@ -9,6 +9,7 @@ * @contact group@hyperf.io * @license /~https://github.com/hyperf/hyperf/blob/master/LICENSE */ + namespace Hyperf\GrpcClient\Exception; use RuntimeException; diff --git a/src/GrpcClient.php b/src/GrpcClient.php index 1158416..0dfd0c8 100644 --- a/src/GrpcClient.php +++ b/src/GrpcClient.php @@ -9,6 +9,7 @@ * @contact group@hyperf.io * @license /~https://github.com/hyperf/hyperf/blob/master/LICENSE */ + namespace Hyperf\GrpcClient; use Hyperf\Coroutine\Channel\Pool as ChannelPool; diff --git a/src/GrpcNormalizer.php b/src/GrpcNormalizer.php index 93cb863..dea8b4c 100644 --- a/src/GrpcNormalizer.php +++ b/src/GrpcNormalizer.php @@ -9,6 +9,7 @@ * @contact group@hyperf.io * @license /~https://github.com/hyperf/hyperf/blob/master/LICENSE */ + namespace Hyperf\GrpcClient; use Hyperf\Contract\NormalizerInterface; diff --git a/src/GrpcPacker.php b/src/GrpcPacker.php index 3cf2aa8..5b6e163 100644 --- a/src/GrpcPacker.php +++ b/src/GrpcPacker.php @@ -9,6 +9,7 @@ * @contact group@hyperf.io * @license /~https://github.com/hyperf/hyperf/blob/master/LICENSE */ + namespace Hyperf\GrpcClient; use Hyperf\Contract\PackerInterface; diff --git a/src/GrpcTransporter.php b/src/GrpcTransporter.php index de692bc..27beba6 100644 --- a/src/GrpcTransporter.php +++ b/src/GrpcTransporter.php @@ -9,6 +9,7 @@ * @contact group@hyperf.io * @license /~https://github.com/hyperf/hyperf/blob/master/LICENSE */ + namespace Hyperf\GrpcClient; use Hyperf\Grpc\StatusCode; diff --git a/src/Listener/RegisterProtocolListener.php b/src/Listener/RegisterProtocolListener.php index d2afde5..35c6aff 100644 --- a/src/Listener/RegisterProtocolListener.php +++ b/src/Listener/RegisterProtocolListener.php @@ -9,6 +9,7 @@ * @contact group@hyperf.io * @license /~https://github.com/hyperf/hyperf/blob/master/LICENSE */ + namespace Hyperf\GrpcClient\Listener; use Hyperf\Event\Contract\ListenerInterface; diff --git a/src/Request.php b/src/Request.php index bcd726d..67648d6 100644 --- a/src/Request.php +++ b/src/Request.php @@ -9,6 +9,7 @@ * @contact group@hyperf.io * @license /~https://github.com/hyperf/hyperf/blob/master/LICENSE */ + namespace Hyperf\GrpcClient; use Google\Protobuf\Internal\Message; diff --git a/src/ServerStreamingCall.php b/src/ServerStreamingCall.php index 034fb5b..f7dc27a 100644 --- a/src/ServerStreamingCall.php +++ b/src/ServerStreamingCall.php @@ -9,6 +9,7 @@ * @contact group@hyperf.io * @license /~https://github.com/hyperf/hyperf/blob/master/LICENSE */ + namespace Hyperf\GrpcClient; use Hyperf\Grpc\StatusCode; diff --git a/src/Status.php b/src/Status.php index 0e4ff54..685abcf 100644 --- a/src/Status.php +++ b/src/Status.php @@ -9,6 +9,7 @@ * @contact group@hyperf.io * @license /~https://github.com/hyperf/hyperf/blob/master/LICENSE */ + namespace Hyperf\GrpcClient; final class Status diff --git a/src/StreamingCall.php b/src/StreamingCall.php index 4e66630..b17b300 100644 --- a/src/StreamingCall.php +++ b/src/StreamingCall.php @@ -9,6 +9,7 @@ * @contact group@hyperf.io * @license /~https://github.com/hyperf/hyperf/blob/master/LICENSE */ + namespace Hyperf\GrpcClient; use Hyperf\Grpc\Parser; diff --git a/tests/BaseClientTest.php b/tests/BaseClientTest.php index 07b1dc2..28b7a4c 100644 --- a/tests/BaseClientTest.php +++ b/tests/BaseClientTest.php @@ -9,6 +9,7 @@ * @contact group@hyperf.io * @license /~https://github.com/hyperf/hyperf/blob/master/LICENSE */ + namespace HyperfTest\GrpcClient; use Grpc\UserReply; diff --git a/tests/GPBMetadata/Grpc.php b/tests/GPBMetadata/Grpc.php index caf6999..bd8ae6f 100644 --- a/tests/GPBMetadata/Grpc.php +++ b/tests/GPBMetadata/Grpc.php @@ -13,13 +13,15 @@ namespace GPBMetadata; +use Google\Protobuf\Internal\DescriptorPool; + class Grpc { public static $is_initialized = false; public static function initOnce() { - $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool(); + $pool = DescriptorPool::getGeneratedPool(); if (static::$is_initialized == true) { return; diff --git a/tests/GPBMetadata/RouteGuide.php b/tests/GPBMetadata/RouteGuide.php index 619b1ea..a9bf0e1 100644 --- a/tests/GPBMetadata/RouteGuide.php +++ b/tests/GPBMetadata/RouteGuide.php @@ -13,13 +13,15 @@ namespace GPBMetadata; +use Google\Protobuf\Internal\DescriptorPool; + class RouteGuide { public static $is_initialized = false; public static function initOnce() { - $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool(); + $pool = DescriptorPool::getGeneratedPool(); if (static::$is_initialized == true) { return; diff --git a/tests/GPBMetadata/User.php b/tests/GPBMetadata/User.php index e314115..f9525e9 100644 Binary files a/tests/GPBMetadata/User.php and b/tests/GPBMetadata/User.php differ diff --git a/tests/GoUserServiceTest.php b/tests/GoUserServiceTest.php index ef9b27b..7dfae55 100644 --- a/tests/GoUserServiceTest.php +++ b/tests/GoUserServiceTest.php @@ -9,6 +9,7 @@ * @contact group@hyperf.io * @license /~https://github.com/hyperf/hyperf/blob/master/LICENSE */ + namespace HyperfTest\GrpcClient; use Hyperf\Context\ApplicationContext; diff --git a/tests/Grpc/Info.php b/tests/Grpc/Info.php index e7b4c10..db2d61d 100644 --- a/tests/Grpc/Info.php +++ b/tests/Grpc/Info.php @@ -14,11 +14,13 @@ namespace Grpc; use Google\Protobuf\Internal\GPBUtil; +use Google\Protobuf\Internal\Message; +use GPBMetadata\Grpc; /** * Generated from protobuf message grpc.Info. */ -class Info extends \Google\Protobuf\Internal\Message +class Info extends Message { /** * Generated from protobuf field int32 id = 1;. @@ -36,13 +38,13 @@ class Info extends \Google\Protobuf\Internal\Message * @param array $data { * Optional. Data for populating the Message object. * - * @var int $id - * @var string $name - * } + * @var int $id + * @var string $name + * } */ public function __construct($data = null) { - \GPBMetadata\Grpc::initOnce(); + Grpc::initOnce(); parent::__construct($data); } diff --git a/tests/Grpc/UserReply.php b/tests/Grpc/UserReply.php index e7bbfdc..b933848 100644 --- a/tests/Grpc/UserReply.php +++ b/tests/Grpc/UserReply.php @@ -14,11 +14,13 @@ namespace Grpc; use Google\Protobuf\Internal\GPBUtil; +use Google\Protobuf\Internal\Message; +use GPBMetadata\Grpc; /** * Generated from protobuf message grpc.UserReply. */ -class UserReply extends \Google\Protobuf\Internal\Message +class UserReply extends Message { /** * Generated from protobuf field string message = 1;. @@ -36,13 +38,13 @@ class UserReply extends \Google\Protobuf\Internal\Message * @param array $data { * Optional. Data for populating the Message object. * - * @var string $message - * @var \Grpc\Info $info - * } + * @var string $message + * @var Info $info + * } */ public function __construct($data = null) { - \GPBMetadata\Grpc::initOnce(); + Grpc::initOnce(); parent::__construct($data); } @@ -70,7 +72,7 @@ public function setMessage($var) /** * Generated from protobuf field .grpc.Info info = 2;. - * @return \Grpc\Info + * @return Info */ public function getInfo() { @@ -79,12 +81,12 @@ public function getInfo() /** * Generated from protobuf field .grpc.Info info = 2;. - * @param \Grpc\Info $var + * @param Info $var * @return $this */ public function setInfo($var) { - GPBUtil::checkMessage($var, \Grpc\Info::class); + GPBUtil::checkMessage($var, Info::class); $this->info = $var; return $this; diff --git a/tests/RequestTest.php b/tests/RequestTest.php index 0e45ddf..444b623 100644 --- a/tests/RequestTest.php +++ b/tests/RequestTest.php @@ -9,6 +9,7 @@ * @contact group@hyperf.io * @license /~https://github.com/hyperf/hyperf/blob/master/LICENSE */ + namespace HyperfTest\GrpcClient; use Grpc\Info; diff --git a/tests/RouteGuideClientTest.php b/tests/RouteGuideClientTest.php index 40ed08b..ae134b4 100644 --- a/tests/RouteGuideClientTest.php +++ b/tests/RouteGuideClientTest.php @@ -9,6 +9,7 @@ * @contact group@hyperf.io * @license /~https://github.com/hyperf/hyperf/blob/master/LICENSE */ + namespace HyperfTest\GrpcClient; use Hyperf\Context\ApplicationContext; diff --git a/tests/Routeguide/Feature.php b/tests/Routeguide/Feature.php index 488349e..b210c6f 100644 --- a/tests/Routeguide/Feature.php +++ b/tests/Routeguide/Feature.php @@ -14,6 +14,8 @@ namespace Routeguide; use Google\Protobuf\Internal\GPBUtil; +use Google\Protobuf\Internal\Message; +use GPBMetadata\RouteGuide; /** * A feature names something at a given point. @@ -21,7 +23,7 @@ * * Generated from protobuf message routeguide.Feature */ -class Feature extends \Google\Protobuf\Internal\Message +class Feature extends Message { /** * The name of the feature. @@ -43,15 +45,15 @@ class Feature extends \Google\Protobuf\Internal\Message * @param array $data { * Optional. Data for populating the Message object. * - * @var string $name - * The name of the feature - * @var \Routeguide\Point $location - * The point where the feature is detected. - * } + * @var string $name + * The name of the feature + * @var Point $location + * The point where the feature is detected. + * } */ public function __construct($data = null) { - \GPBMetadata\RouteGuide::initOnce(); + RouteGuide::initOnce(); parent::__construct($data); } @@ -85,7 +87,7 @@ public function setName($var) * The point where the feature is detected. * * Generated from protobuf field .routeguide.Point location = 2; - * @return \Routeguide\Point + * @return Point */ public function getLocation() { @@ -96,12 +98,12 @@ public function getLocation() * The point where the feature is detected. * * Generated from protobuf field .routeguide.Point location = 2; - * @param \Routeguide\Point $var + * @param Point $var * @return $this */ public function setLocation($var) { - GPBUtil::checkMessage($var, \Routeguide\Point::class); + GPBUtil::checkMessage($var, Point::class); $this->location = $var; return $this; diff --git a/tests/Routeguide/Point.php b/tests/Routeguide/Point.php index 8fcc8d8..e65e94c 100644 --- a/tests/Routeguide/Point.php +++ b/tests/Routeguide/Point.php @@ -14,6 +14,8 @@ namespace Routeguide; use Google\Protobuf\Internal\GPBUtil; +use Google\Protobuf\Internal\Message; +use GPBMetadata\RouteGuide; /** * Points are represented as latitude-longitude pairs in the E7 representation @@ -23,7 +25,7 @@ * * Generated from protobuf message routeguide.Point */ -class Point extends \Google\Protobuf\Internal\Message +class Point extends Message { /** * Generated from protobuf field int32 latitude = 1;. @@ -41,13 +43,13 @@ class Point extends \Google\Protobuf\Internal\Message * @param array $data { * Optional. Data for populating the Message object. * - * @var int $latitude - * @var int $longitude - * } + * @var int $latitude + * @var int $longitude + * } */ public function __construct($data = null) { - \GPBMetadata\RouteGuide::initOnce(); + RouteGuide::initOnce(); parent::__construct($data); } diff --git a/tests/Routeguide/Rectangle.php b/tests/Routeguide/Rectangle.php index a29fd37..38bff9e 100644 --- a/tests/Routeguide/Rectangle.php +++ b/tests/Routeguide/Rectangle.php @@ -14,6 +14,8 @@ namespace Routeguide; use Google\Protobuf\Internal\GPBUtil; +use Google\Protobuf\Internal\Message; +use GPBMetadata\RouteGuide; /** * A latitude-longitude rectangle, represented as two diagonally opposite @@ -21,7 +23,7 @@ * * Generated from protobuf message routeguide.Rectangle */ -class Rectangle extends \Google\Protobuf\Internal\Message +class Rectangle extends Message { /** * One corner of the rectangle. @@ -43,15 +45,15 @@ class Rectangle extends \Google\Protobuf\Internal\Message * @param array $data { * Optional. Data for populating the Message object. * - * @var \Routeguide\Point $lo - * One corner of the rectangle - * @var \Routeguide\Point $hi - * The other corner of the rectangle. - * } + * @var Point $lo + * One corner of the rectangle + * @var Point $hi + * The other corner of the rectangle. + * } */ public function __construct($data = null) { - \GPBMetadata\RouteGuide::initOnce(); + RouteGuide::initOnce(); parent::__construct($data); } @@ -59,7 +61,7 @@ public function __construct($data = null) * One corner of the rectangle. * * Generated from protobuf field .routeguide.Point lo = 1; - * @return \Routeguide\Point + * @return Point */ public function getLo() { @@ -70,12 +72,12 @@ public function getLo() * One corner of the rectangle. * * Generated from protobuf field .routeguide.Point lo = 1; - * @param \Routeguide\Point $var + * @param Point $var * @return $this */ public function setLo($var) { - GPBUtil::checkMessage($var, \Routeguide\Point::class); + GPBUtil::checkMessage($var, Point::class); $this->lo = $var; return $this; @@ -85,7 +87,7 @@ public function setLo($var) * The other corner of the rectangle. * * Generated from protobuf field .routeguide.Point hi = 2; - * @return \Routeguide\Point + * @return Point */ public function getHi() { @@ -96,12 +98,12 @@ public function getHi() * The other corner of the rectangle. * * Generated from protobuf field .routeguide.Point hi = 2; - * @param \Routeguide\Point $var + * @param Point $var * @return $this */ public function setHi($var) { - GPBUtil::checkMessage($var, \Routeguide\Point::class); + GPBUtil::checkMessage($var, Point::class); $this->hi = $var; return $this; diff --git a/tests/Routeguide/RouteNote.php b/tests/Routeguide/RouteNote.php index a48748a..6c21e90 100644 --- a/tests/Routeguide/RouteNote.php +++ b/tests/Routeguide/RouteNote.php @@ -14,13 +14,15 @@ namespace Routeguide; use Google\Protobuf\Internal\GPBUtil; +use Google\Protobuf\Internal\Message; +use GPBMetadata\RouteGuide; /** * A RouteNote is a message sent while at a given point. * * Generated from protobuf message routeguide.RouteNote */ -class RouteNote extends \Google\Protobuf\Internal\Message +class RouteNote extends Message { /** * The location from which the message is sent. @@ -42,15 +44,15 @@ class RouteNote extends \Google\Protobuf\Internal\Message * @param array $data { * Optional. Data for populating the Message object. * - * @var \Routeguide\Point $location - * The location from which the message is sent - * @var string $message - * The message to be sent. - * } + * @var Point $location + * The location from which the message is sent + * @var string $message + * The message to be sent. + * } */ public function __construct($data = null) { - \GPBMetadata\RouteGuide::initOnce(); + RouteGuide::initOnce(); parent::__construct($data); } @@ -58,7 +60,7 @@ public function __construct($data = null) * The location from which the message is sent. * * Generated from protobuf field .routeguide.Point location = 1; - * @return \Routeguide\Point + * @return Point */ public function getLocation() { @@ -69,12 +71,12 @@ public function getLocation() * The location from which the message is sent. * * Generated from protobuf field .routeguide.Point location = 1; - * @param \Routeguide\Point $var + * @param Point $var * @return $this */ public function setLocation($var) { - GPBUtil::checkMessage($var, \Routeguide\Point::class); + GPBUtil::checkMessage($var, Point::class); $this->location = $var; return $this; diff --git a/tests/Routeguide/RouteSummary.php b/tests/Routeguide/RouteSummary.php index c6e1b13..c652ec4 100644 --- a/tests/Routeguide/RouteSummary.php +++ b/tests/Routeguide/RouteSummary.php @@ -14,6 +14,8 @@ namespace Routeguide; use Google\Protobuf\Internal\GPBUtil; +use Google\Protobuf\Internal\Message; +use GPBMetadata\RouteGuide; /** * A RouteSummary is received in response to a RecordRoute rpc. @@ -23,7 +25,7 @@ * * Generated from protobuf message routeguide.RouteSummary */ -class RouteSummary extends \Google\Protobuf\Internal\Message +class RouteSummary extends Message { /** * The number of points received. @@ -59,19 +61,19 @@ class RouteSummary extends \Google\Protobuf\Internal\Message * @param array $data { * Optional. Data for populating the Message object. * - * @var int $point_count - * The number of points received - * @var int $feature_count - * The number of known features passed while traversing the route - * @var int $distance - * The distance covered in metres - * @var int $elapsed_time - * The duration of the traversal in seconds. - * } + * @var int $point_count + * The number of points received + * @var int $feature_count + * The number of known features passed while traversing the route + * @var int $distance + * The distance covered in metres + * @var int $elapsed_time + * The duration of the traversal in seconds. + * } */ public function __construct($data = null) { - \GPBMetadata\RouteGuide::initOnce(); + RouteGuide::initOnce(); parent::__construct($data); } diff --git a/tests/Stub/HiClient.php b/tests/Stub/HiClient.php index 3afaf11..29571fc 100644 --- a/tests/Stub/HiClient.php +++ b/tests/Stub/HiClient.php @@ -9,6 +9,7 @@ * @contact group@hyperf.io * @license /~https://github.com/hyperf/hyperf/blob/master/LICENSE */ + namespace HyperfTest\GrpcClient\Stub; use Grpc\Info; diff --git a/tests/Stub/RouteGuideClient.php b/tests/Stub/RouteGuideClient.php index 7f66db8..479d272 100644 --- a/tests/Stub/RouteGuideClient.php +++ b/tests/Stub/RouteGuideClient.php @@ -9,6 +9,7 @@ * @contact group@hyperf.io * @license /~https://github.com/hyperf/hyperf/blob/master/LICENSE */ + namespace HyperfTest\GrpcClient\Stub; use Hyperf\GrpcClient\BaseClient; diff --git a/tests/Stub/UserServiceClient.php b/tests/Stub/UserServiceClient.php index ab1a15b..c499ab7 100644 --- a/tests/Stub/UserServiceClient.php +++ b/tests/Stub/UserServiceClient.php @@ -9,6 +9,7 @@ * @contact group@hyperf.io * @license /~https://github.com/hyperf/hyperf/blob/master/LICENSE */ + namespace HyperfTest\GrpcClient\Stub; use Hyperf\GrpcClient\BaseClient; diff --git a/tests/UserService/UserId.php b/tests/UserService/UserId.php index c217eb9..7bb5280 100644 --- a/tests/UserService/UserId.php +++ b/tests/UserService/UserId.php @@ -14,11 +14,13 @@ namespace UserService; use Google\Protobuf\Internal\GPBUtil; +use Google\Protobuf\Internal\Message; +use GPBMetadata\User; /** * Generated from protobuf message UserService.UserId. */ -class UserId extends \Google\Protobuf\Internal\Message +class UserId extends Message { /** * Generated from protobuf field uint64 id = 1;. @@ -31,12 +33,12 @@ class UserId extends \Google\Protobuf\Internal\Message * @param array $data { * Optional. Data for populating the Message object. * - * @var int|string $id - * } + * @var int|string $id + * } */ public function __construct($data = null) { - \GPBMetadata\User::initOnce(); + User::initOnce(); parent::__construct($data); } diff --git a/tests/UserService/UserInfo.php b/tests/UserService/UserInfo.php index 534db69..c293201 100644 --- a/tests/UserService/UserInfo.php +++ b/tests/UserService/UserInfo.php @@ -14,11 +14,13 @@ namespace UserService; use Google\Protobuf\Internal\GPBUtil; +use Google\Protobuf\Internal\Message; +use GPBMetadata\User; /** * Generated from protobuf message UserService.UserInfo. */ -class UserInfo extends \Google\Protobuf\Internal\Message +class UserInfo extends Message { /** * Generated from protobuf field uint64 id = 1;. @@ -41,14 +43,14 @@ class UserInfo extends \Google\Protobuf\Internal\Message * @param array $data { * Optional. Data for populating the Message object. * - * @var int|string $id - * @var string $name - * @var int $gender - * } + * @var int|string $id + * @var string $name + * @var int $gender + * } */ public function __construct($data = null) { - \GPBMetadata\User::initOnce(); + User::initOnce(); parent::__construct($data); }