diff options
author | Yilun Chong <chongyilun250@sina.com> | 2017-06-30 17:38:50 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-30 17:38:50 -0700 |
commit | e82ba0b8026eb16c40ceba861f02c643c36e8232 (patch) | |
tree | 2aa89a917c6091923682221026507aa9eea1aba4 /php/src/Google/Protobuf/Internal/OneofDescriptorProto.php | |
parent | 726ba33d98cd06c268f88b7dedf2a9a7916d978d (diff) | |
parent | ecca6ea95d56a6f70ff7b223ec3f904758acc8b1 (diff) | |
download | protobuf-e82ba0b8026eb16c40ceba861f02c643c36e8232.tar.gz protobuf-e82ba0b8026eb16c40ceba861f02c643c36e8232.tar.bz2 protobuf-e82ba0b8026eb16c40ceba861f02c643c36e8232.zip |
Merge branch 'master' into ConformanceTestYilunChong
Diffstat (limited to 'php/src/Google/Protobuf/Internal/OneofDescriptorProto.php')
-rw-r--r-- | php/src/Google/Protobuf/Internal/OneofDescriptorProto.php | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/php/src/Google/Protobuf/Internal/OneofDescriptorProto.php b/php/src/Google/Protobuf/Internal/OneofDescriptorProto.php index 744ca638..0d4f3bdc 100644 --- a/php/src/Google/Protobuf/Internal/OneofDescriptorProto.php +++ b/php/src/Google/Protobuf/Internal/OneofDescriptorProto.php @@ -12,21 +12,19 @@ use Google\Protobuf\Internal\InputStream; use Google\Protobuf\Internal\GPBUtil; /** - * <pre> * Describes a oneof. - * </pre> * - * Protobuf type <code>google.protobuf.OneofDescriptorProto</code> + * Generated from protobuf message <code>google.protobuf.OneofDescriptorProto</code> */ class OneofDescriptorProto extends \Google\Protobuf\Internal\Message { /** - * <code>optional string name = 1;</code> + * Generated from protobuf field <code>optional string name = 1;</code> */ private $name = ''; private $has_name = false; /** - * <code>optional .google.protobuf.OneofOptions options = 2;</code> + * Generated from protobuf field <code>optional .google.protobuf.OneofOptions options = 2;</code> */ private $options = null; private $has_options = false; @@ -37,7 +35,8 @@ class OneofDescriptorProto extends \Google\Protobuf\Internal\Message } /** - * <code>optional string name = 1;</code> + * Generated from protobuf field <code>optional string name = 1;</code> + * @return string */ public function getName() { @@ -45,7 +44,9 @@ class OneofDescriptorProto extends \Google\Protobuf\Internal\Message } /** - * <code>optional string name = 1;</code> + * Generated from protobuf field <code>optional string name = 1;</code> + * @param string $var + * @return $this */ public function setName($var) { @@ -62,7 +63,8 @@ class OneofDescriptorProto extends \Google\Protobuf\Internal\Message } /** - * <code>optional .google.protobuf.OneofOptions options = 2;</code> + * Generated from protobuf field <code>optional .google.protobuf.OneofOptions options = 2;</code> + * @return \Google\Protobuf\Internal\OneofOptions */ public function getOptions() { @@ -70,7 +72,9 @@ class OneofDescriptorProto extends \Google\Protobuf\Internal\Message } /** - * <code>optional .google.protobuf.OneofOptions options = 2;</code> + * Generated from protobuf field <code>optional .google.protobuf.OneofOptions options = 2;</code> + * @param \Google\Protobuf\Internal\OneofOptions $var + * @return $this */ public function setOptions(&$var) { |