aboutsummaryrefslogtreecommitdiff
path: root/php/src/Google/Protobuf/Option.php
diff options
context:
space:
mode:
authorBrent Shaffer <betterbrent@google.com>2018-05-23 16:43:30 -0700
committerBo Yang <teboring@google.com>2018-05-25 13:04:19 -0700
commit2774e5441d8508b7d61cc3786b69149dc43d9f42 (patch)
tree5415e227b9f454a402caf23d71bafadef2627dc4 /php/src/Google/Protobuf/Option.php
parent8b336f8c5a77ca4932b00203e485f9266f6f0c30 (diff)
downloadprotobuf-2774e5441d8508b7d61cc3786b69149dc43d9f42.tar.gz
protobuf-2774e5441d8508b7d61cc3786b69149dc43d9f42.tar.bz2
protobuf-2774e5441d8508b7d61cc3786b69149dc43d9f42.zip
PHP namespaces for nested messages and enums (#4536)
* uses namespaces for nested messages and enums * fixes namespaces for PHP dist * fixes namespace for Descriptors, adds Cardinality and Kind * fixes nested namespaces for reserved words and adds tests * adds tests and generator fix for php class prefixes * fixes escaping of protobuf packages, enum comments, misc others * nice refactor of generated code * adds class files for backwards compatibility * simplifies code with templates * adds compatibility files to makefile * cleanup of generator and fixes nested namespace bug * regenerates proto types * remove internal BC classes * adds deprecated warning, adds methods back * simplifies if statement * fixes dist files * addresses review comments * adds back TYPE_URL_PREFIX constant * adds @deprecated to old nested class files * skips tests which require a separate process when protobuf.so is enabled * Adds tests for legacy nested classes that do not require separate processes to test * uses legacy names for GPBUtil message check * adds block for IDE @deprecated message * Namespace for nested message/enum in c extension * Remove unused code
Diffstat (limited to 'php/src/Google/Protobuf/Option.php')
-rw-r--r--php/src/Google/Protobuf/Option.php22
1 files changed, 20 insertions, 2 deletions
diff --git a/php/src/Google/Protobuf/Option.php b/php/src/Google/Protobuf/Option.php
index f8038681..22ecfc5f 100644
--- a/php/src/Google/Protobuf/Option.php
+++ b/php/src/Google/Protobuf/Option.php
@@ -35,9 +35,27 @@ class Option extends \Google\Protobuf\Internal\Message
*/
private $value = null;
- public function __construct() {
+ /**
+ * Constructor.
+ *
+ * @param array $data {
+ * Optional. Data for populating the Message object.
+ *
+ * @type string $name
+ * The option's name. For protobuf built-in options (options defined in
+ * descriptor.proto), this is the short name. For example, `"map_entry"`.
+ * For custom options, it should be the fully-qualified name. For example,
+ * `"google.api.http"`.
+ * @type \Google\Protobuf\Any $value
+ * The option's value packed in an Any message. If the value is a primitive,
+ * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+ * should be used. If the value is an enum, it should be stored as an int32
+ * value using the google.protobuf.Int32Value type.
+ * }
+ */
+ public function __construct($data = NULL) {
\GPBMetadata\Google\Protobuf\Type::initOnce();
- parent::__construct();
+ parent::__construct($data);
}
/**