Merge pull request #7944 from haberman/php-wkt

[PHP] Native C well-known types
pull/7993/head^2
Joshua Haberman 4 years ago committed by GitHub
commit c5f7b4b0b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      Makefile.am
  2. 46
      php/ext/google/protobuf/bundled_php.h
  3. 2
      php/ext/google/protobuf/config.m4
  4. 106
      php/ext/google/protobuf/def.c
  5. 6
      php/ext/google/protobuf/def.h
  6. 62
      php/ext/google/protobuf/make-preload.php
  7. 352
      php/ext/google/protobuf/message.c
  8. 34
      php/ext/google/protobuf/protobuf.c
  9. 3232
      php/ext/google/protobuf/wkt.inc
  10. 13
      php/generate_descriptor_protos.sh
  11. 10
      php/src/GPBMetadata/Google/Protobuf/Any.php
  12. 27
      php/src/GPBMetadata/Google/Protobuf/Api.php
  13. 11
      php/src/GPBMetadata/Google/Protobuf/Duration.php
  14. 11
      php/src/GPBMetadata/Google/Protobuf/FieldMask.php
  15. 10
      php/src/GPBMetadata/Google/Protobuf/GPBEmpty.php
  16. 12
      php/src/GPBMetadata/Google/Protobuf/SourceContext.php
  17. 2
      php/src/GPBMetadata/Google/Protobuf/Struct.php
  18. 11
      php/src/GPBMetadata/Google/Protobuf/Timestamp.php
  19. 56
      php/src/GPBMetadata/Google/Protobuf/Type.php
  20. 18
      php/src/GPBMetadata/Google/Protobuf/Wrappers.php
  21. 101
      php/src/Google/Protobuf/Any.php
  22. 20
      php/src/Google/Protobuf/Api.php
  23. 2
      php/src/Google/Protobuf/BoolValue.php
  24. 2
      php/src/Google/Protobuf/BytesValue.php
  25. 2
      php/src/Google/Protobuf/DoubleValue.php
  26. 6
      php/src/Google/Protobuf/Duration.php
  27. 18
      php/src/Google/Protobuf/Enum.php
  28. 4
      php/src/Google/Protobuf/EnumValue.php
  29. 22
      php/src/Google/Protobuf/Field.php
  30. 1
      php/src/Google/Protobuf/Field/Cardinality.php
  31. 1
      php/src/Google/Protobuf/Field/Kind.php
  32. 42
      php/src/Google/Protobuf/FieldMask.php
  33. 2
      php/src/Google/Protobuf/FloatValue.php
  34. 2
      php/src/Google/Protobuf/Int32Value.php
  35. 2
      php/src/Google/Protobuf/Int64Value.php
  36. 86
      php/src/Google/Protobuf/Internal/AnyBase.php
  37. 32
      php/src/Google/Protobuf/Internal/TimestampBase.php
  38. 12
      php/src/Google/Protobuf/Method.php
  39. 4
      php/src/Google/Protobuf/Mixin.php
  40. 16
      php/src/Google/Protobuf/Option.php
  41. 2
      php/src/Google/Protobuf/SourceContext.php
  42. 2
      php/src/Google/Protobuf/StringValue.php
  43. 1
      php/src/Google/Protobuf/Syntax.php
  44. 68
      php/src/Google/Protobuf/Timestamp.php
  45. 18
      php/src/Google/Protobuf/Type.php
  46. 2
      php/src/Google/Protobuf/UInt32Value.php
  47. 2
      php/src/Google/Protobuf/UInt64Value.php
  48. 1
      php/tests/compile_extension.sh
  49. 764
      src/google/protobuf/compiler/php/php_generator.cc
  50. 6
      src/google/protobuf/compiler/php/php_generator.h

@ -772,13 +772,11 @@ php_EXTRA_DIST= \
php/ext/google/protobuf/arena.h \
php/ext/google/protobuf/array.c \
php/ext/google/protobuf/array.h \
php/ext/google/protobuf/bundled_php.h \
php/ext/google/protobuf/config.m4 \
php/ext/google/protobuf/convert.c \
php/ext/google/protobuf/convert.h \
php/ext/google/protobuf/def.c \
php/ext/google/protobuf/def.h \
php/ext/google/protobuf/make-preload.php \
php/ext/google/protobuf/map.c \
php/ext/google/protobuf/map.h \
php/ext/google/protobuf/message.c \
@ -790,6 +788,7 @@ php_EXTRA_DIST= \
php/ext/google/protobuf/php-upb.h \
php/ext/google/protobuf/protobuf.c \
php/ext/google/protobuf/protobuf.h \
php/ext/google/protobuf/wkt.inc \
php/generate_descriptor_protos.sh \
php/phpunit.xml \
php/release.sh \
@ -827,6 +826,7 @@ php_EXTRA_DIST= \
php/src/Google/Protobuf/GPBEmpty.php \
php/src/Google/Protobuf/Int32Value.php \
php/src/Google/Protobuf/Int64Value.php \
php/src/Google/Protobuf/Internal/AnyBase.php \
php/src/Google/Protobuf/Internal/CodedInputStream.php \
php/src/Google/Protobuf/Internal/CodedOutputStream.php \
php/src/Google/Protobuf/Internal/Descriptor.php \
@ -886,6 +886,7 @@ php_EXTRA_DIST= \
php/src/Google/Protobuf/Internal/ServiceOptions.php \
php/src/Google/Protobuf/Internal/SourceCodeInfo.php \
php/src/Google/Protobuf/Internal/SourceCodeInfo/Location.php \
php/src/Google/Protobuf/Internal/TimestampBase.php \
php/src/Google/Protobuf/Internal/UninterpretedOption.php \
php/src/Google/Protobuf/Internal/UninterpretedOption/NamePart.php \
php/src/Google/Protobuf/Internal/DescriptorProto_ExtensionRange.php \

@ -1,46 +0,0 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef PHP_PROTOBUF_BUNDLED_PHP_H_
#define PHP_PROTOBUF_BUNDLED_PHP_H_
// We embed PHP source code into the binary for things we don't want to
// implement in C. This struct serves as a table of contents for all of
// the embedded files.
typedef struct {
const char *filename;
const char *contents;
} BundledPhp_File;
// An array of all the embedded file structs. This array is terminated with a
// {NULL, NULL} entry.
extern BundledPhp_File *bundled_files;
#endif // PHP_PROTOBUF_BUNDLED_PHP_H_

@ -4,7 +4,7 @@ if test "$PHP_PROTOBUF" != "no"; then
PHP_NEW_EXTENSION(
protobuf,
arena.c array.c bundled_php.c convert.c def.c map.c message.c names.c php-upb.c protobuf.c,
arena.c array.c convert.c def.c map.c message.c names.c php-upb.c protobuf.c,
$ext_shared)
fi

@ -772,6 +772,7 @@ upb_symtab *DescriptorPool_GetSymbolTable() {
return intern->symtab;
}
/*
* DescriptorPool::getGeneratedPool()
*
@ -906,13 +907,38 @@ static void add_name_mappings(const upb_filedef *file) {
}
}
static void add_descriptor(DescriptorPool *pool,
const google_protobuf_FileDescriptorProto *file) {
upb_strview name = google_protobuf_FileDescriptorProto_name(file);
upb_status status;
const upb_filedef *file_def;
upb_status_clear(&status);
if (upb_symtab_lookupfile2(pool->symtab, name.data, name.size)) {
// Already added.
fprintf(stderr, "WARNING: file was already added\n");
return;
}
// The PHP code generator currently special-cases descriptor.proto. It
// doesn't add it as a dependency even if the proto file actually does
// depend on it.
if (depends_on_descriptor(file)) {
google_protobuf_FileDescriptorProto_getmsgdef(pool->symtab);
}
file_def = upb_symtab_addfile(pool->symtab, file, &status);
CheckUpbStatus(&status, "Unable to load descriptor");
add_name_mappings(file_def);
}
/*
* add_name_mappings()
* add_descriptor()
*
* Adds the given descriptor data to this DescriptorPool.
*/
static void add_descriptor(DescriptorPool *pool, const char *data,
int data_len, upb_arena *arena) {
static void add_descriptor_set(DescriptorPool *pool, const char *data,
int data_len, upb_arena *arena) {
size_t i, n;
google_protobuf_FileDescriptorSet *set;
const google_protobuf_FileDescriptorProto* const* files;
@ -928,27 +954,28 @@ static void add_descriptor(DescriptorPool *pool, const char *data,
for (i = 0; i < n; i++) {
const google_protobuf_FileDescriptorProto* file = files[i];
upb_strview name = google_protobuf_FileDescriptorProto_name(file);
upb_status status;
const upb_filedef *file_def;
upb_status_clear(&status);
if (upb_symtab_lookupfile2(pool->symtab, name.data, name.size)) {
// Already added.
continue;
}
add_descriptor(pool, file);
}
}
// The PHP code generator currently special-cases descriptor.proto. It
// doesn't add it as a dependency even if the proto file actually does
// depend on it.
if (depends_on_descriptor(file)) {
google_protobuf_FileDescriptorProto_getmsgdef(pool->symtab);
}
bool DescriptorPool_HasFile(const char *filename) {
DescriptorPool *intern = GetPool(get_generated_pool());
return upb_symtab_lookupfile(intern->symtab, filename) != NULL;
}
void DescriptorPool_AddDescriptor(const char *filename, const char *data,
int size) {
upb_arena *arena = upb_arena_new();
const google_protobuf_FileDescriptorProto *file =
google_protobuf_FileDescriptorProto_parse(data, size, arena);
file_def = upb_symtab_addfile(pool->symtab, file, &status);
CheckUpbStatus(&status, "Unable to load descriptor");
add_name_mappings(file_def);
if (!file) {
zend_error(E_ERROR, "Failed to parse binary descriptor for %s\n", filename);
return;
}
add_descriptor(GetPool(get_generated_pool()), file);
upb_arena_free(arena);
}
/*
@ -969,7 +996,7 @@ PHP_METHOD(DescriptorPool, internalAddGeneratedFile) {
}
arena = upb_arena_new();
add_descriptor(intern, data, data_len, arena);
add_descriptor_set(intern, data, data_len, arena);
upb_arena_free(arena);
}
@ -983,6 +1010,35 @@ static zend_function_entry DescriptorPool_methods[] = {
ZEND_FE_END
};
// -----------------------------------------------------------------------------
// InternalDescriptorPool
// -----------------------------------------------------------------------------
// For the C extension, Google\Protobuf\Internal\DescriptorPool is not a
// separate instantiable object, it just returns a
// Google\Protobuf\DescriptorPool.
zend_class_entry *InternalDescriptorPool_class_entry;
/*
* InternalDescriptorPool::getGeneratedPool()
*
* Returns the generated DescriptorPool. Note that this is identical to
* DescriptorPool::getGeneratedPool(), and in fact returns a DescriptorPool
* instance.
*/
PHP_METHOD(InternalDescriptorPool, getGeneratedPool) {
zval ret;
ZVAL_COPY(&ret, get_generated_pool());
RETURN_ZVAL(&ret, 0, 1);
}
static zend_function_entry InternalDescriptorPool_methods[] = {
PHP_ME(InternalDescriptorPool, getGeneratedPool, NULL,
ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
ZEND_FE_END
};
// -----------------------------------------------------------------------------
// GPBType
// -----------------------------------------------------------------------------
@ -1044,7 +1100,7 @@ void Def_ModuleInit() {
h = &FieldDescriptor_object_handlers;
memcpy(h, &std_object_handlers, sizeof(zend_object_handlers));
INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Internal\\DescriptorPool",
INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\DescriptorPool",
DescriptorPool_methods);
DescriptorPool_class_entry = zend_register_internal_class(&tmp_ce);
DescriptorPool_class_entry->ce_flags |= ZEND_ACC_FINAL;
@ -1053,6 +1109,10 @@ void Def_ModuleInit() {
memcpy(h, &std_object_handlers, sizeof(zend_object_handlers));
h->dtor_obj = DescriptorPool_destructor;
INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Internal\\DescriptorPool",
InternalDescriptorPool_methods);
InternalDescriptorPool_class_entry = zend_register_internal_class(&tmp_ce);
// GPBType.
#define STR(str) (str), strlen(str)
zend_class_entry class_type;

@ -49,6 +49,12 @@ upb_symtab *DescriptorPool_Steal(zval *zv);
upb_symtab *DescriptorPool_GetSymbolTable();
// Returns true if the global descriptor pool already has the given filename.
bool DescriptorPool_HasFile(const char *filename);
// Adds the given descriptor with the given filename to the global pool.
void DescriptorPool_AddDescriptor(const char *filename, const char *data, int size);
typedef struct Descriptor {
zend_object std;
const upb_msgdef *msgdef;

@ -1,62 +0,0 @@
<?php
$cwd = dirname($argv[0]) . "/../../../src";
chdir($cwd);
$cmd = "grep -r -l 'Generated by the protocol buffer' * | grep 'php$' | grep -v Internal";
$handle = popen($cmd, 'r');
$filenames = explode("\n", stream_get_contents($handle));
array_pop($filenames); // empty string after last '\n'
$filenames[] = "Google/Protobuf/DescriptorPool.php";
$output = "../ext/google/protobuf/bundled_php.c";
function stripSuffix($str, $suffix) {
return substr($str, 0, strlen($str) - strlen($suffix));
}
function toClassName($filename) {
# Google/Protobuf/BoolValue.php -> Google\\Protobuf\\BoolValue
$ret = stripSuffix($filename, ".php");
return str_replace("/", "\\\\", $ret);
}
function toCSymbolName($filename) {
# Google/Protobuf/BoolValue.php -> Google__Protobuf__BoolValue
$ret = stripSuffix($filename, ".php");
return str_replace("/", "__", $ret);
}
$f = fopen($output, "w");
fwrite($f, "#include \"bundled_php.h\"\n");
fwrite($f, "#include \"stdlib.h\"\n");
foreach ($filenames as $filename) {
print("Reading $filename...\n");
$contents = file_get_contents($filename);
$contents = substr($contents, 5); // Strip <?php
$c_symbol_name = toCSymbolName($filename);
fwrite($f, "static const char {$c_symbol_name}[] = {");
for ($i = 0; $i < strlen($contents); $i++) {
if ($i % 10 == 0) {
fwrite($f, "\n");
}
fprintf($f, " 0x%02x,", ord($contents[$i]));
}
fwrite($f, "0};\n");
}
fwrite($f, "static BundledPhp_File php[] = {\n");
foreach ($filenames as $filename) {
$class_name = toClassName($filename);
$c_symbol_name = toCSymbolName($filename);
fwrite($f, " {\"$class_name\", $c_symbol_name},\n");
}
fwrite($f, " {NULL, NULL}\n");
fwrite($f, "};\n");
fwrite($f, "BundledPhp_File *bundled_files = &php[0];\n");
fclose($f);
print("Wrote $output\n");
?>

@ -36,6 +36,7 @@
// This is not self-contained: it must be after other Zend includes.
#include <Zend/zend_exceptions.h>
#include <Zend/zend_inheritance.h>
#include "arena.h"
#include "array.h"
@ -108,6 +109,43 @@ static const upb_fielddef *get_field(Message *msg, PROTO_STR *member) {
return f;
}
static void Message_get(Message *intern, const upb_fielddef *f, zval *rv) {
upb_arena *arena = Arena_Get(&intern->arena);
if (upb_fielddef_ismap(f)) {
upb_mutmsgval msgval = upb_msg_mutable(intern->msg, f, arena);
MapField_GetPhpWrapper(rv, msgval.map, f, &intern->arena);
} else if (upb_fielddef_isseq(f)) {
upb_mutmsgval msgval = upb_msg_mutable(intern->msg, f, arena);
RepeatedField_GetPhpWrapper(rv, msgval.array, f, &intern->arena);
} else {
upb_msgval msgval = upb_msg_get(intern->msg, f);
const Descriptor *subdesc = Descriptor_GetFromFieldDef(f);
Convert_UpbToPhp(msgval, rv, upb_fielddef_type(f), subdesc, &intern->arena);
}
}
static bool Message_set(Message *intern, const upb_fielddef *f, zval *val) {
upb_arena *arena = Arena_Get(&intern->arena);
upb_msgval msgval;
if (upb_fielddef_ismap(f)) {
msgval.map_val = MapField_GetUpbMap(val, f, arena);
if (!msgval.map_val) return false;
} else if (upb_fielddef_isseq(f)) {
msgval.array_val = RepeatedField_GetUpbArray(val, f, arena);
if (!msgval.array_val) return false;
} else {
upb_fieldtype_t type = upb_fielddef_type(f);
const Descriptor *subdesc = Descriptor_GetFromFieldDef(f);
bool ok = Convert_PhpToUpb(val, &msgval, type, subdesc, arena);
if (!ok) return false;
}
upb_msg_set(intern->msg, f, msgval, arena);
return true;
}
static bool MessageEq(const upb_msg *m1, const upb_msg *m2, const upb_msgdef *m);
/**
@ -271,6 +309,7 @@ static void Message_unset_property(PROTO_VAL *obj, PROTO_STR *member,
upb_msg_clearfield(intern->msg, f);
}
/**
* Message_read_property()
*
@ -293,22 +332,9 @@ static zval *Message_read_property(PROTO_VAL *obj, PROTO_STR *member,
int type, void **cache_slot, zval *rv) {
Message* intern = PROTO_MSG_P(obj);
const upb_fielddef *f = get_field(intern, member);
upb_arena *arena = Arena_Get(&intern->arena);
if (!f) return NULL;
if (upb_fielddef_ismap(f)) {
upb_mutmsgval msgval = upb_msg_mutable(intern->msg, f, arena);
MapField_GetPhpWrapper(rv, msgval.map, f, &intern->arena);
} else if (upb_fielddef_isseq(f)) {
upb_mutmsgval msgval = upb_msg_mutable(intern->msg, f, arena);
RepeatedField_GetPhpWrapper(rv, msgval.array, f, &intern->arena);
} else {
upb_msgval msgval = upb_msg_get(intern->msg, f);
const Descriptor *subdesc = Descriptor_GetFromFieldDef(f);
Convert_UpbToPhp(msgval, rv, upb_fielddef_type(f), subdesc, &intern->arena);
}
Message_get(intern, f, rv);
return rv;
}
@ -337,37 +363,20 @@ static PROTO_RETURN_VAL Message_write_property(
PROTO_VAL *obj, PROTO_STR *member, zval *val, void **cache_slot) {
Message* intern = PROTO_MSG_P(obj);
const upb_fielddef *f = get_field(intern, member);
upb_arena *arena = Arena_Get(&intern->arena);
upb_msgval msgval;
if (!f) goto error;
if (upb_fielddef_ismap(f)) {
msgval.map_val = MapField_GetUpbMap(val, f, arena);
if (!msgval.map_val) goto error;
} else if (upb_fielddef_isseq(f)) {
msgval.array_val = RepeatedField_GetUpbArray(val, f, arena);
if (!msgval.array_val) goto error;
} else {
upb_fieldtype_t type = upb_fielddef_type(f);
const Descriptor *subdesc = Descriptor_GetFromFieldDef(f);
bool ok = Convert_PhpToUpb(val, &msgval, type, subdesc, arena);
if (!ok) goto error;
}
upb_msg_set(intern->msg, f, msgval, arena);
if (f && Message_set(intern, f, val)) {
#if PHP_VERSION_ID < 70400
return;
return;
#else
return val;
return val;
#endif
error:
} else {
#if PHP_VERSION_ID < 70400
return;
return;
#else
return &EG(error_zval);
return &EG(error_zval);
#endif
}
}
/**
@ -531,6 +540,12 @@ bool Message_InitFromPhp(upb_msg *msg, const upb_msgdef *m, zval *init,
}
}
static void Message_Initialize(Message *intern, const Descriptor *desc) {
intern->desc = desc;
intern->msg = upb_msg_new(desc->msgdef, Arena_Get(&intern->arena));
ObjCache_Add(intern->msg, &intern->std);
}
/**
* Message::__construct()
*
@ -540,13 +555,10 @@ bool Message_InitFromPhp(upb_msg *msg, const upb_msgdef *m, zval *init,
PHP_METHOD(Message, __construct) {
Message* intern = (Message*)Z_OBJ_P(getThis());
const Descriptor* desc = Descriptor_GetFromClassEntry(Z_OBJCE_P(getThis()));
const upb_msgdef *msgdef = desc->msgdef;
upb_arena *arena = Arena_Get(&intern->arena);
zval *init_arr = NULL;
intern->desc = desc;
intern->msg = upb_msg_new(msgdef, arena);
ObjCache_Add(intern->msg, &intern->std);
Message_Initialize(intern, desc);
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|a!", &init_arr) == FAILURE) {
return;
@ -1009,6 +1021,260 @@ static zend_function_entry Message_methods[] = {
ZEND_FE_END
};
// Well-known types ////////////////////////////////////////////////////////////
static const char TYPE_URL_PREFIX[] = "type.googleapis.com/";
static upb_msgval Message_getval(Message *intern, const char *field_name) {
const upb_fielddef *f = upb_msgdef_ntofz(intern->desc->msgdef, field_name);
PBPHP_ASSERT(f);
return upb_msg_get(intern->msg, f);
}
static void Message_setval(Message *intern, const char *field_name,
upb_msgval val) {
const upb_fielddef *f = upb_msgdef_ntofz(intern->desc->msgdef, field_name);
PBPHP_ASSERT(f);
return upb_msg_set(intern->msg, f, val, Arena_Get(&intern->arena));
}
static upb_msgval StringVal(upb_strview view) {
upb_msgval ret;
ret.str_val = view;
return ret;
}
static bool TryStripUrlPrefix(upb_strview *str) {
size_t size = strlen(TYPE_URL_PREFIX);
if (str->size < size || memcmp(TYPE_URL_PREFIX, str->data, size) != 0) {
return false;
}
str->data += size;
str->size -= size;
return true;
}
static bool StrViewEq(upb_strview view, const char *str) {
size_t size = strlen(str);
return view.size == size && memcmp(view.data, str, size) == 0;
}
PHP_METHOD(google_protobuf_Any, unpack) {
Message* intern = (Message*)Z_OBJ_P(getThis());
upb_strview type_url = Message_getval(intern, "type_url").str_val;
upb_strview value = Message_getval(intern, "value").str_val;
upb_symtab *symtab = DescriptorPool_GetSymbolTable();
const upb_msgdef *m;
Descriptor *desc;
zval ret;
// Ensure that type_url has TYPE_URL_PREFIX as a prefix.
if (!TryStripUrlPrefix(&type_url)) {
zend_throw_exception(
NULL, "Type url needs to be type.googleapis.com/fully-qualified",
0 TSRMLS_CC);
return;
}
m = upb_symtab_lookupmsg2(symtab, type_url.data, type_url.size);
if (m == NULL) {
zend_throw_exception(
NULL, "Specified message in any hasn't been added to descriptor pool",
0 TSRMLS_CC);
return;
}
desc = Descriptor_GetFromMessageDef(m);
PBPHP_ASSERT(desc->class_entry->create_object == Message_create);
zend_object *obj = Message_create(desc->class_entry);
Message *msg = (Message*)obj;
Message_Initialize(msg, desc);
ZVAL_OBJ(&ret, obj);
// Get value.
if (!upb_decode(value.data, value.size, msg->msg,
upb_msgdef_layout(desc->msgdef), Arena_Get(&msg->arena))) {
zend_throw_exception_ex(NULL, 0, "Error occurred during parsing");
return;
}
// Fuse since the parsed message could alias "value".
upb_arena_fuse(Arena_Get(&intern->arena), Arena_Get(&msg->arena));
RETURN_ZVAL(&ret, 1, 0);
}
PHP_METHOD(google_protobuf_Any, pack) {
Message* intern = (Message*)Z_OBJ_P(getThis());
upb_arena *arena = Arena_Get(&intern->arena);
zval *val;
Message *msg;
upb_strview value;
upb_strview type_url;
const char *full_name;
char *buf;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &val) ==
FAILURE) {
return;
}
if (!instanceof_function(Z_OBJCE_P(val), message_ce)) {
zend_error(E_USER_ERROR, "Given value is not an instance of Message.");
return;
}
msg = (Message*)Z_OBJ_P(val);
// Serialize and set value.
value.data = upb_encode(msg->msg, upb_msgdef_layout(msg->desc->msgdef), arena,
&value.size);
Message_setval(intern, "value", StringVal(value));
// Set type url: type_url_prefix + fully_qualified_name
full_name = upb_msgdef_fullname(msg->desc->msgdef);
type_url.size = strlen(TYPE_URL_PREFIX) + strlen(full_name);
buf = upb_arena_malloc(arena, type_url.size + 1);
memcpy(buf, TYPE_URL_PREFIX, strlen(TYPE_URL_PREFIX));
memcpy(buf + strlen(TYPE_URL_PREFIX), full_name, strlen(full_name));
type_url.data = buf;
Message_setval(intern, "type_url", StringVal(type_url));
}
PHP_METHOD(google_protobuf_Any, is) {
Message* intern = (Message*)Z_OBJ_P(getThis());
upb_strview type_url = Message_getval(intern, "type_url").str_val;
zend_class_entry *klass = NULL;
const upb_msgdef *m;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "C", &klass) ==
FAILURE) {
return;
}
m = NameMap_GetMessage(klass);
if (m == NULL) {
RETURN_BOOL(false);
}
RETURN_BOOL(TryStripUrlPrefix(&type_url) &&
StrViewEq(type_url, upb_msgdef_fullname(m)));
}
PHP_METHOD(google_protobuf_Timestamp, fromDateTime) {
Message* intern = (Message*)Z_OBJ_P(getThis());
zval* datetime;
const char *classname = "\\DatetimeInterface";
zend_string *classname_str = zend_string_init(classname, strlen(classname), 0);
zend_class_entry *date_interface_ce = zend_lookup_class(classname_str);
if (date_interface_ce == NULL) {
zend_error(E_ERROR, "Make sure date extension is enabled.");
return;
}
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &datetime,
date_interface_ce) == FAILURE) {
zend_error(E_USER_ERROR, "Expect DatetimeInterface.");
return;
}
upb_msgval timestamp_seconds;
{
zval retval;
zval function_name;
ZVAL_STRING(&function_name, "date_timestamp_get");
if (call_user_function(EG(function_table), NULL, &function_name, &retval, 1,
datetime) == FAILURE ||
!Convert_PhpToUpb(&retval, &timestamp_seconds, UPB_TYPE_INT64, NULL,
NULL)) {
zend_error(E_ERROR, "Cannot get timestamp from DateTime.");
return;
}
zval_dtor(&retval);
zval_dtor(&function_name);
}
upb_msgval timestamp_nanos;
{
zval retval;
zval function_name;
zval format_string;
ZVAL_STRING(&function_name, "date_format");
ZVAL_STRING(&format_string, "u");
zval params[2] = {
*datetime,
format_string,
};
if (call_user_function(EG(function_table), NULL, &function_name, &retval, 2,
params) == FAILURE ||
!Convert_PhpToUpb(&retval, &timestamp_nanos, UPB_TYPE_INT32, NULL,
NULL)) {
zend_error(E_ERROR, "Cannot format DateTime.");
return;
}
timestamp_nanos.int32_val *= 1000;
zval_dtor(&retval);
zval_dtor(&function_name);
zval_dtor(&format_string);
}
Message_setval(intern, "seconds", timestamp_seconds);
Message_setval(intern, "nanos", timestamp_nanos);
RETURN_NULL();
}
PHP_METHOD(google_protobuf_Timestamp, toDateTime) {
Message* intern = (Message*)Z_OBJ_P(getThis());
upb_msgval seconds = Message_getval(intern, "seconds");
upb_msgval nanos = Message_getval(intern, "nanos");
// Get formatted time string.
char formatted_time[32];
snprintf(formatted_time, sizeof(formatted_time), "%" PRId64 ".%06" PRId32,
seconds.int64_val, nanos.int32_val / 1000);
// Create Datetime object.
zval datetime;
zval function_name;
zval format_string;
zval formatted_time_php;
ZVAL_STRING(&function_name, "date_create_from_format");
ZVAL_STRING(&format_string, "U.u");
ZVAL_STRING(&formatted_time_php, formatted_time);
zval params[2] = {
format_string,
formatted_time_php,
};
if (call_user_function(EG(function_table), NULL, &function_name, &datetime, 2,
params) == FAILURE) {
zend_error(E_ERROR, "Cannot create DateTime.");
return;
}
zval_dtor(&function_name);
zval_dtor(&format_string);
zval_dtor(&formatted_time_php);
ZVAL_OBJ(return_value, Z_OBJ(datetime));
}
#include "wkt.inc"
/**
* Message_ModuleInit()
*
@ -1033,4 +1299,6 @@ void Message_ModuleInit() {
h->unset_property = Message_unset_property;
h->get_properties = Message_get_properties;
h->get_property_ptr_ptr = Message_get_property_ptr_ptr;
WellKnownTypes_ModuleInit(); /* From wkt.inc. */
}

@ -35,7 +35,6 @@
#include "arena.h"
#include "array.h"
#include "bundled_php.h"
#include "convert.h"
#include "def.h"
#include "map.h"
@ -162,10 +161,6 @@ static PHP_RINIT_FUNCTION(protobuf) {
upb_symtab *symtab = PROTOBUF_G(saved_symtab);
DescriptorPool_CreateWithSymbolTable(&PROTOBUF_G(generated_pool), symtab);
// Set up autoloader for bundled sources.
zend_eval_string("spl_autoload_register('protobuf_internal_loadbundled');",
NULL, "autoload_register.php");
zend_hash_init(&PROTOBUF_G(object_cache), 64, NULL, NULL, 0);
zend_hash_init(&PROTOBUF_G(name_msg_cache), 64, NULL, NULL, 0);
zend_hash_init(&PROTOBUF_G(name_enum_cache), 64, NULL, NULL, 0);
@ -193,34 +188,6 @@ static PHP_RSHUTDOWN_FUNCTION(protobuf) {
return SUCCESS;
}
// -----------------------------------------------------------------------------
// Bundled PHP sources
// -----------------------------------------------------------------------------
// We bundle PHP sources for well-known types into the C extension. There is no
// need to implement these in C.
static PHP_FUNCTION(protobuf_internal_loadbundled) {
char *name = NULL;
zend_long size;
BundledPhp_File *file;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name, &size) != SUCCESS) {
return;
}
for (file = bundled_files; file->filename; file++) {
if (strcmp(file->filename, name) == 0) {
zend_eval_string((char*)file->contents, NULL, (char*)file->filename);
return;
}
}
}
ZEND_BEGIN_ARG_INFO_EX(arginfo_load_bundled_source, 0, 0, 1)
ZEND_ARG_INFO(0, class_name)
ZEND_END_ARG_INFO()
// -----------------------------------------------------------------------------
// Object Cache.
// -----------------------------------------------------------------------------
@ -303,7 +270,6 @@ const upb_enumdef *NameMap_GetEnum(zend_class_entry *ce) {
// -----------------------------------------------------------------------------
zend_function_entry protobuf_functions[] = {
PHP_FE(protobuf_internal_loadbundled, arginfo_load_bundled_source)
ZEND_FE_END
};

File diff suppressed because it is too large Load Diff

@ -3,6 +3,8 @@
# Run this script to regenerate descriptor protos after the protocol compiler
# changes.
set -e
if test ! -e src/google/protobuf/stubs/common.h; then
cat >&2 << __EOF__
Could not find source code. Make sure you are running this script from the
@ -13,4 +15,15 @@ fi
pushd src
./protoc --php_out=internal:../php/src google/protobuf/descriptor.proto
./protoc --php_out=internal_generate_c_wkt:../php/src \
google/protobuf/any.proto \
google/protobuf/api.proto \
google/protobuf/duration.proto \
google/protobuf/empty.proto \
google/protobuf/field_mask.proto \
google/protobuf/source_context.proto \
google/protobuf/struct.proto \
google/protobuf/type.proto \
google/protobuf/timestamp.proto \
google/protobuf/wrappers.proto
popd

@ -15,14 +15,8 @@ class Any
return;
}
$pool->internalAddGeneratedFile(hex2bin(
"0acd010a19676f6f676c652f70726f746f6275662f616e792e70726f746f" .
"120f676f6f676c652e70726f746f62756622260a03416e7912100a087479" .
"70655f75726c180120012809120d0a0576616c756518022001280c426f0a" .
"13636f6d2e676f6f676c652e70726f746f6275664208416e7950726f746f" .
"50015a256769746875622e636f6d2f676f6c616e672f70726f746f627566" .
"2f7074797065732f616e79a20203475042aa021e476f6f676c652e50726f" .
"746f6275662e57656c6c4b6e6f776e5479706573620670726f746f33"
));
"0ad4010a19676f6f676c652f70726f746f6275662f616e792e70726f746f120f676f6f676c652e70726f746f62756622260a03416e7912100a08747970655f75726c180120012809120d0a0576616c756518022001280c42760a13636f6d2e676f6f676c652e70726f746f6275664208416e7950726f746f50015a2c676f6f676c652e676f6c616e672e6f72672f70726f746f6275662f74797065732f6b6e6f776e2f616e797062a20203475042aa021e476f6f676c652e50726f746f6275662e57656c6c4b6e6f776e5479706573620670726f746f33"
), true);
static::$is_initialized = true;
}

@ -17,31 +17,8 @@ class Api
\GPBMetadata\Google\Protobuf\SourceContext::initOnce();
\GPBMetadata\Google\Protobuf\Type::initOnce();
$pool->internalAddGeneratedFile(hex2bin(
"0ac8050a19676f6f676c652f70726f746f6275662f6170692e70726f746f" .
"120f676f6f676c652e70726f746f6275661a1a676f6f676c652f70726f74" .
"6f6275662f747970652e70726f746f2281020a03417069120c0a046e616d" .
"6518012001280912280a076d6574686f647318022003280b32172e676f6f" .
"676c652e70726f746f6275662e4d6574686f6412280a076f7074696f6e73" .
"18032003280b32172e676f6f676c652e70726f746f6275662e4f7074696f" .
"6e120f0a0776657273696f6e18042001280912360a0e736f757263655f63" .
"6f6e7465787418052001280b321e2e676f6f676c652e70726f746f627566" .
"2e536f75726365436f6e7465787412260a066d6978696e7318062003280b" .
"32162e676f6f676c652e70726f746f6275662e4d6978696e12270a067379" .
"6e74617818072001280e32172e676f6f676c652e70726f746f6275662e53" .
"796e74617822d5010a064d6574686f64120c0a046e616d65180120012809" .
"12180a10726571756573745f747970655f75726c18022001280912190a11" .
"726571756573745f73747265616d696e6718032001280812190a11726573" .
"706f6e73655f747970655f75726c180420012809121a0a12726573706f6e" .
"73655f73747265616d696e6718052001280812280a076f7074696f6e7318" .
"062003280b32172e676f6f676c652e70726f746f6275662e4f7074696f6e" .
"12270a0673796e74617818072001280e32172e676f6f676c652e70726f74" .
"6f6275662e53796e74617822230a054d6978696e120c0a046e616d651801" .
"20012809120c0a04726f6f7418022001280942750a13636f6d2e676f6f67" .
"6c652e70726f746f627566420841706950726f746f50015a2b676f6f676c" .
"652e676f6c616e672e6f72672f67656e70726f746f2f70726f746f627566" .
"2f6170693b617069a20203475042aa021e476f6f676c652e50726f746f62" .
"75662e57656c6c4b6e6f776e5479706573620670726f746f33"
));
"0ac9050a19676f6f676c652f70726f746f6275662f6170692e70726f746f120f676f6f676c652e70726f746f6275661a1a676f6f676c652f70726f746f6275662f747970652e70726f746f2281020a03417069120c0a046e616d6518012001280912280a076d6574686f647318022003280b32172e676f6f676c652e70726f746f6275662e4d6574686f6412280a076f7074696f6e7318032003280b32172e676f6f676c652e70726f746f6275662e4f7074696f6e120f0a0776657273696f6e18042001280912360a0e736f757263655f636f6e7465787418052001280b321e2e676f6f676c652e70726f746f6275662e536f75726365436f6e7465787412260a066d6978696e7318062003280b32162e676f6f676c652e70726f746f6275662e4d6978696e12270a0673796e74617818072001280e32172e676f6f676c652e70726f746f6275662e53796e74617822d5010a064d6574686f64120c0a046e616d6518012001280912180a10726571756573745f747970655f75726c18022001280912190a11726571756573745f73747265616d696e6718032001280812190a11726573706f6e73655f747970655f75726c180420012809121a0a12726573706f6e73655f73747265616d696e6718052001280812280a076f7074696f6e7318062003280b32172e676f6f676c652e70726f746f6275662e4f7074696f6e12270a0673796e74617818072001280e32172e676f6f676c652e70726f746f6275662e53796e74617822230a054d6978696e120c0a046e616d65180120012809120c0a04726f6f7418022001280942760a13636f6d2e676f6f676c652e70726f746f627566420841706950726f746f50015a2c676f6f676c652e676f6c616e672e6f72672f70726f746f6275662f74797065732f6b6e6f776e2f6170697062a20203475042aa021e476f6f676c652e50726f746f6275662e57656c6c4b6e6f776e5479706573620670726f746f33"
), true);
static::$is_initialized = true;
}

@ -15,15 +15,8 @@ class Duration
return;
}
$pool->internalAddGeneratedFile(hex2bin(
"0ae3010a1e676f6f676c652f70726f746f6275662f6475726174696f6e2e" .
"70726f746f120f676f6f676c652e70726f746f627566222a0a0844757261" .
"74696f6e120f0a077365636f6e6473180120012803120d0a056e616e6f73" .
"180220012805427c0a13636f6d2e676f6f676c652e70726f746f62756642" .
"0d4475726174696f6e50726f746f50015a2a6769746875622e636f6d2f67" .
"6f6c616e672f70726f746f6275662f7074797065732f6475726174696f6e" .
"f80101a20203475042aa021e476f6f676c652e50726f746f6275662e5765" .
"6c6c4b6e6f776e5479706573620670726f746f33"
));
"0aeb010a1e676f6f676c652f70726f746f6275662f6475726174696f6e2e70726f746f120f676f6f676c652e70726f746f627566222a0a084475726174696f6e120f0a077365636f6e6473180120012803120d0a056e616e6f731802200128054283010a13636f6d2e676f6f676c652e70726f746f627566420d4475726174696f6e50726f746f50015a31676f6f676c652e676f6c616e672e6f72672f70726f746f6275662f74797065732f6b6e6f776e2f6475726174696f6e7062f80101a20203475042aa021e476f6f676c652e50726f746f6275662e57656c6c4b6e6f776e5479706573620670726f746f33"
), true);
static::$is_initialized = true;
}

@ -15,15 +15,8 @@ class FieldMask
return;
}
$pool->internalAddGeneratedFile(hex2bin(
"0ae3010a20676f6f676c652f70726f746f6275662f6669656c645f6d6173" .
"6b2e70726f746f120f676f6f676c652e70726f746f627566221a0a094669" .
"656c644d61736b120d0a0570617468731801200328094289010a13636f6d" .
"2e676f6f676c652e70726f746f627566420e4669656c644d61736b50726f" .
"746f50015a39676f6f676c652e676f6c616e672e6f72672f67656e70726f" .
"746f2f70726f746f6275662f6669656c645f6d61736b3b6669656c645f6d" .
"61736ba20203475042aa021e476f6f676c652e50726f746f6275662e5765" .
"6c6c4b6e6f776e5479706573620670726f746f33"
));
"0adf010a20676f6f676c652f70726f746f6275662f6669656c645f6d61736b2e70726f746f120f676f6f676c652e70726f746f627566221a0a094669656c644d61736b120d0a0570617468731801200328094285010a13636f6d2e676f6f676c652e70726f746f627566420e4669656c644d61736b50726f746f50015a32676f6f676c652e676f6c616e672e6f72672f70726f746f6275662f74797065732f6b6e6f776e2f6669656c646d61736b7062f80101a20203475042aa021e476f6f676c652e50726f746f6275662e57656c6c4b6e6f776e5479706573620670726f746f33"
), true);
static::$is_initialized = true;
}

@ -15,14 +15,8 @@ class GPBEmpty
return;
}
$pool->internalAddGeneratedFile(hex2bin(
"0ab7010a1b676f6f676c652f70726f746f6275662f656d7074792e70726f" .
"746f120f676f6f676c652e70726f746f62756622070a05456d7074794276" .
"0a13636f6d2e676f6f676c652e70726f746f627566420a456d7074795072" .
"6f746f50015a276769746875622e636f6d2f676f6c616e672f70726f746f" .
"6275662f7074797065732f656d707479f80101a20203475042aa021e476f" .
"6f676c652e50726f746f6275662e57656c6c4b6e6f776e54797065736206" .
"70726f746f33"
));
"0abe010a1b676f6f676c652f70726f746f6275662f656d7074792e70726f746f120f676f6f676c652e70726f746f62756622070a05456d707479427d0a13636f6d2e676f6f676c652e70726f746f627566420a456d70747950726f746f50015a2e676f6f676c652e676f6c616e672e6f72672f70726f746f6275662f74797065732f6b6e6f776e2f656d7074797062f80101a20203475042aa021e476f6f676c652e50726f746f6275662e57656c6c4b6e6f776e5479706573620670726f746f33"
), true);
static::$is_initialized = true;
}

@ -15,16 +15,8 @@ class SourceContext
return;
}
$pool->internalAddGeneratedFile(hex2bin(
"0afb010a24676f6f676c652f70726f746f6275662f736f757263655f636f" .
"6e746578742e70726f746f120f676f6f676c652e70726f746f6275662222" .
"0a0d536f75726365436f6e7465787412110a0966696c655f6e616d651801" .
"200128094295010a13636f6d2e676f6f676c652e70726f746f6275664212" .
"536f75726365436f6e7465787450726f746f50015a41676f6f676c652e67" .
"6f6c616e672e6f72672f67656e70726f746f2f70726f746f6275662f736f" .
"757263655f636f6e746578743b736f757263655f636f6e74657874a20203" .
"475042aa021e476f6f676c652e50726f746f6275662e57656c6c4b6e6f77" .
"6e5479706573620670726f746f33"
));
"0af0010a24676f6f676c652f70726f746f6275662f736f757263655f636f6e746578742e70726f746f120f676f6f676c652e70726f746f62756622220a0d536f75726365436f6e7465787412110a0966696c655f6e616d65180120012809428a010a13636f6d2e676f6f676c652e70726f746f6275664212536f75726365436f6e7465787450726f746f50015a36676f6f676c652e676f6c616e672e6f72672f70726f746f6275662f74797065732f6b6e6f776e2f736f75726365636f6e746578747062a20203475042aa021e476f6f676c652e50726f746f6275662e57656c6c4b6e6f776e5479706573620670726f746f33"
), true);
static::$is_initialized = true;
}

@ -15,7 +15,7 @@ class Struct
return;
}
$pool->internalAddGeneratedFile(hex2bin(
"0a81050a1c676f6f676c652f70726f746f6275662f7374727563742e70726f746f120f676f6f676c652e70726f746f6275662284010a0653747275637412330a066669656c647318012003280b32232e676f6f676c652e70726f746f6275662e5374727563742e4669656c6473456e7472791a450a0b4669656c6473456e747279120b0a036b657918012001280912250a0576616c756518022001280b32162e676f6f676c652e70726f746f6275662e56616c75653a02380122ea010a0556616c756512300a0a6e756c6c5f76616c756518012001280e321a2e676f6f676c652e70726f746f6275662e4e756c6c56616c7565480012160a0c6e756d6265725f76616c7565180220012801480012160a0c737472696e675f76616c7565180320012809480012140a0a626f6f6c5f76616c75651804200128084800122f0a0c7374727563745f76616c756518052001280b32172e676f6f676c652e70726f746f6275662e537472756374480012300a0a6c6973745f76616c756518062001280b321a2e676f6f676c652e70726f746f6275662e4c69737456616c7565480042060a046b696e6422330a094c69737456616c756512260a0676616c75657318012003280b32162e676f6f676c652e70726f746f6275662e56616c75652a1b0a094e756c6c56616c7565120e0a0a4e554c4c5f56414c554510004281010a13636f6d2e676f6f676c652e70726f746f627566420b53747275637450726f746f50015a316769746875622e636f6d2f676f6c616e672f70726f746f6275662f7074797065732f7374727563743b7374727563747062f80101a20203475042aa021e476f6f676c652e50726f746f6275662e57656c6c4b6e6f776e5479706573620670726f746f33"
"0afe040a1c676f6f676c652f70726f746f6275662f7374727563742e70726f746f120f676f6f676c652e70726f746f6275662284010a0653747275637412330a066669656c647318012003280b32232e676f6f676c652e70726f746f6275662e5374727563742e4669656c6473456e7472791a450a0b4669656c6473456e747279120b0a036b657918012001280912250a0576616c756518022001280b32162e676f6f676c652e70726f746f6275662e56616c75653a02380122ea010a0556616c756512300a0a6e756c6c5f76616c756518012001280e321a2e676f6f676c652e70726f746f6275662e4e756c6c56616c7565480012160a0c6e756d6265725f76616c7565180220012801480012160a0c737472696e675f76616c7565180320012809480012140a0a626f6f6c5f76616c75651804200128084800122f0a0c7374727563745f76616c756518052001280b32172e676f6f676c652e70726f746f6275662e537472756374480012300a0a6c6973745f76616c756518062001280b321a2e676f6f676c652e70726f746f6275662e4c69737456616c7565480042060a046b696e6422330a094c69737456616c756512260a0676616c75657318012003280b32162e676f6f676c652e70726f746f6275662e56616c75652a1b0a094e756c6c56616c7565120e0a0a4e554c4c5f56414c55451000427f0a13636f6d2e676f6f676c652e70726f746f627566420b53747275637450726f746f50015a2f676f6f676c652e676f6c616e672e6f72672f70726f746f6275662f74797065732f6b6e6f776e2f7374727563747062f80101a20203475042aa021e476f6f676c652e50726f746f6275662e57656c6c4b6e6f776e5479706573620670726f746f33"
), true);
static::$is_initialized = true;

@ -15,15 +15,8 @@ class Timestamp
return;
}
$pool->internalAddGeneratedFile(hex2bin(
"0ae7010a1f676f6f676c652f70726f746f6275662f74696d657374616d70" .
"2e70726f746f120f676f6f676c652e70726f746f627566222b0a0954696d" .
"657374616d70120f0a077365636f6e6473180120012803120d0a056e616e" .
"6f73180220012805427e0a13636f6d2e676f6f676c652e70726f746f6275" .
"66420e54696d657374616d7050726f746f50015a2b6769746875622e636f" .
"6d2f676f6c616e672f70726f746f6275662f7074797065732f74696d6573" .
"74616d70f80101a20203475042aa021e476f6f676c652e50726f746f6275" .
"662e57656c6c4b6e6f776e5479706573620670726f746f33"
));
"0aef010a1f676f6f676c652f70726f746f6275662f74696d657374616d702e70726f746f120f676f6f676c652e70726f746f627566222b0a0954696d657374616d70120f0a077365636f6e6473180120012803120d0a056e616e6f731802200128054285010a13636f6d2e676f6f676c652e70726f746f627566420e54696d657374616d7050726f746f50015a32676f6f676c652e676f6c616e672e6f72672f70726f746f6275662f74797065732f6b6e6f776e2f74696d657374616d707062f80101a20203475042aa021e476f6f676c652e50726f746f6275662e57656c6c4b6e6f776e5479706573620670726f746f33"
), true);
static::$is_initialized = true;
}

@ -17,60 +17,8 @@ class Type
\GPBMetadata\Google\Protobuf\Any::initOnce();
\GPBMetadata\Google\Protobuf\SourceContext::initOnce();
$pool->internalAddGeneratedFile(hex2bin(
"0a9f0c0a1a676f6f676c652f70726f746f6275662f747970652e70726f74" .
"6f120f676f6f676c652e70726f746f6275661a24676f6f676c652f70726f" .
"746f6275662f736f757263655f636f6e746578742e70726f746f22d7010a" .
"0454797065120c0a046e616d6518012001280912260a066669656c647318" .
"022003280b32162e676f6f676c652e70726f746f6275662e4669656c6412" .
"0e0a066f6e656f667318032003280912280a076f7074696f6e7318042003" .
"280b32172e676f6f676c652e70726f746f6275662e4f7074696f6e12360a" .
"0e736f757263655f636f6e7465787418052001280b321e2e676f6f676c65" .
"2e70726f746f6275662e536f75726365436f6e7465787412270a0673796e" .
"74617818062001280e32172e676f6f676c652e70726f746f6275662e5379" .
"6e74617822d5050a054669656c6412290a046b696e6418012001280e321b" .
"2e676f6f676c652e70726f746f6275662e4669656c642e4b696e6412370a" .
"0b63617264696e616c69747918022001280e32222e676f6f676c652e7072" .
"6f746f6275662e4669656c642e43617264696e616c697479120e0a066e75" .
"6d626572180320012805120c0a046e616d6518042001280912100a087479" .
"70655f75726c18062001280912130a0b6f6e656f665f696e646578180720" .
"012805120e0a067061636b656418082001280812280a076f7074696f6e73" .
"18092003280b32172e676f6f676c652e70726f746f6275662e4f7074696f" .
"6e12110a096a736f6e5f6e616d65180a2001280912150a0d64656661756c" .
"745f76616c7565180b2001280922c8020a044b696e6412100a0c54595045" .
"5f554e4b4e4f574e1000120f0a0b545950455f444f55424c451001120e0a" .
"0a545950455f464c4f41541002120e0a0a545950455f494e543634100312" .
"0f0a0b545950455f55494e5436341004120e0a0a545950455f494e543332" .
"100512100a0c545950455f46495845443634100612100a0c545950455f46" .
"4958454433321007120d0a09545950455f424f4f4c1008120f0a0b545950" .
"455f535452494e471009120e0a0a545950455f47524f5550100a12100a0c" .
"545950455f4d455353414745100b120e0a0a545950455f4259544553100c" .
"120f0a0b545950455f55494e543332100d120d0a09545950455f454e554d" .
"100e12110a0d545950455f5346495845443332100f12110a0d545950455f" .
"53464958454436341010120f0a0b545950455f53494e5433321011120f0a" .
"0b545950455f53494e543634101222740a0b43617264696e616c69747912" .
"170a1343415244494e414c4954595f554e4b4e4f574e100012180a144341" .
"5244494e414c4954595f4f5054494f4e414c100112180a1443415244494e" .
"414c4954595f5245515549524544100212180a1443415244494e414c4954" .
"595f5245504541544544100322ce010a04456e756d120c0a046e616d6518" .
"0120012809122d0a09656e756d76616c756518022003280b321a2e676f6f" .
"676c652e70726f746f6275662e456e756d56616c756512280a076f707469" .
"6f6e7318032003280b32172e676f6f676c652e70726f746f6275662e4f70" .
"74696f6e12360a0e736f757263655f636f6e7465787418042001280b321e" .
"2e676f6f676c652e70726f746f6275662e536f75726365436f6e74657874" .
"12270a0673796e74617818052001280e32172e676f6f676c652e70726f74" .
"6f6275662e53796e74617822530a09456e756d56616c7565120c0a046e61" .
"6d65180120012809120e0a066e756d62657218022001280512280a076f70" .
"74696f6e7318032003280b32172e676f6f676c652e70726f746f6275662e" .
"4f7074696f6e223b0a064f7074696f6e120c0a046e616d65180120012809" .
"12230a0576616c756518022001280b32142e676f6f676c652e70726f746f" .
"6275662e416e792a2e0a0653796e74617812110a0d53594e5441585f5052" .
"4f544f32100012110a0d53594e5441585f50524f544f331001427d0a1363" .
"6f6d2e676f6f676c652e70726f746f62756642095479706550726f746f50" .
"015a2f676f6f676c652e676f6c616e672e6f72672f67656e70726f746f2f" .
"70726f746f6275662f70747970653b7074797065f80101a20203475042aa" .
"021e476f6f676c652e50726f746f6275662e57656c6c4b6e6f776e547970" .
"6573620670726f746f33"
));
"0a9d0c0a1a676f6f676c652f70726f746f6275662f747970652e70726f746f120f676f6f676c652e70726f746f6275661a24676f6f676c652f70726f746f6275662f736f757263655f636f6e746578742e70726f746f22d7010a0454797065120c0a046e616d6518012001280912260a066669656c647318022003280b32162e676f6f676c652e70726f746f6275662e4669656c64120e0a066f6e656f667318032003280912280a076f7074696f6e7318042003280b32172e676f6f676c652e70726f746f6275662e4f7074696f6e12360a0e736f757263655f636f6e7465787418052001280b321e2e676f6f676c652e70726f746f6275662e536f75726365436f6e7465787412270a0673796e74617818062001280e32172e676f6f676c652e70726f746f6275662e53796e74617822d5050a054669656c6412290a046b696e6418012001280e321b2e676f6f676c652e70726f746f6275662e4669656c642e4b696e6412370a0b63617264696e616c69747918022001280e32222e676f6f676c652e70726f746f6275662e4669656c642e43617264696e616c697479120e0a066e756d626572180320012805120c0a046e616d6518042001280912100a08747970655f75726c18062001280912130a0b6f6e656f665f696e646578180720012805120e0a067061636b656418082001280812280a076f7074696f6e7318092003280b32172e676f6f676c652e70726f746f6275662e4f7074696f6e12110a096a736f6e5f6e616d65180a2001280912150a0d64656661756c745f76616c7565180b2001280922c8020a044b696e6412100a0c545950455f554e4b4e4f574e1000120f0a0b545950455f444f55424c451001120e0a0a545950455f464c4f41541002120e0a0a545950455f494e5436341003120f0a0b545950455f55494e5436341004120e0a0a545950455f494e543332100512100a0c545950455f46495845443634100612100a0c545950455f464958454433321007120d0a09545950455f424f4f4c1008120f0a0b545950455f535452494e471009120e0a0a545950455f47524f5550100a12100a0c545950455f4d455353414745100b120e0a0a545950455f4259544553100c120f0a0b545950455f55494e543332100d120d0a09545950455f454e554d100e12110a0d545950455f5346495845443332100f12110a0d545950455f53464958454436341010120f0a0b545950455f53494e5433321011120f0a0b545950455f53494e543634101222740a0b43617264696e616c69747912170a1343415244494e414c4954595f554e4b4e4f574e100012180a1443415244494e414c4954595f4f5054494f4e414c100112180a1443415244494e414c4954595f5245515549524544100212180a1443415244494e414c4954595f5245504541544544100322ce010a04456e756d120c0a046e616d65180120012809122d0a09656e756d76616c756518022003280b321a2e676f6f676c652e70726f746f6275662e456e756d56616c756512280a076f7074696f6e7318032003280b32172e676f6f676c652e70726f746f6275662e4f7074696f6e12360a0e736f757263655f636f6e7465787418042001280b321e2e676f6f676c652e70726f746f6275662e536f75726365436f6e7465787412270a0673796e74617818052001280e32172e676f6f676c652e70726f746f6275662e53796e74617822530a09456e756d56616c7565120c0a046e616d65180120012809120e0a066e756d62657218022001280512280a076f7074696f6e7318032003280b32172e676f6f676c652e70726f746f6275662e4f7074696f6e223b0a064f7074696f6e120c0a046e616d6518012001280912230a0576616c756518022001280b32142e676f6f676c652e70726f746f6275662e416e792a2e0a0653796e74617812110a0d53594e5441585f50524f544f32100012110a0d53594e5441585f50524f544f331001427b0a13636f6d2e676f6f676c652e70726f746f62756642095479706550726f746f50015a2d676f6f676c652e676f6c616e672e6f72672f70726f746f6275662f74797065732f6b6e6f776e2f747970657062f80101a20203475042aa021e476f6f676c652e50726f746f6275662e57656c6c4b6e6f776e5479706573620670726f746f33"
), true);
static::$is_initialized = true;
}

@ -15,22 +15,8 @@ class Wrappers
return;
}
$pool->internalAddGeneratedFile(hex2bin(
"0abf030a1e676f6f676c652f70726f746f6275662f77726170706572732e" .
"70726f746f120f676f6f676c652e70726f746f627566221c0a0b446f7562" .
"6c6556616c7565120d0a0576616c7565180120012801221b0a0a466c6f61" .
"7456616c7565120d0a0576616c7565180120012802221b0a0a496e743634" .
"56616c7565120d0a0576616c7565180120012803221c0a0b55496e743634" .
"56616c7565120d0a0576616c7565180120012804221b0a0a496e74333256" .
"616c7565120d0a0576616c7565180120012805221c0a0b55496e74333256" .
"616c7565120d0a0576616c756518012001280d221a0a09426f6f6c56616c" .
"7565120d0a0576616c7565180120012808221c0a0b537472696e6756616c" .
"7565120d0a0576616c7565180120012809221b0a0a427974657356616c75" .
"65120d0a0576616c756518012001280c427c0a13636f6d2e676f6f676c65" .
"2e70726f746f627566420d577261707065727350726f746f50015a2a6769" .
"746875622e636f6d2f676f6c616e672f70726f746f6275662f7074797065" .
"732f7772617070657273f80101a20203475042aa021e476f6f676c652e50" .
"726f746f6275662e57656c6c4b6e6f776e5479706573620670726f746f33"
));
"0ac7030a1e676f6f676c652f70726f746f6275662f77726170706572732e70726f746f120f676f6f676c652e70726f746f627566221c0a0b446f75626c6556616c7565120d0a0576616c7565180120012801221b0a0a466c6f617456616c7565120d0a0576616c7565180120012802221b0a0a496e74363456616c7565120d0a0576616c7565180120012803221c0a0b55496e74363456616c7565120d0a0576616c7565180120012804221b0a0a496e74333256616c7565120d0a0576616c7565180120012805221c0a0b55496e74333256616c7565120d0a0576616c756518012001280d221a0a09426f6f6c56616c7565120d0a0576616c7565180120012808221c0a0b537472696e6756616c7565120d0a0576616c7565180120012809221b0a0a427974657356616c7565120d0a0576616c756518012001280c4283010a13636f6d2e676f6f676c652e70726f746f627566420d577261707065727350726f746f50015a31676f6f676c652e676f6c616e672e6f72672f70726f746f6275662f74797065732f6b6e6f776e2f77726170706572737062f80101a20203475042aa021e476f6f676c652e50726f746f6275662e57656c6c4b6e6f776e5479706573620670726f746f33"
), true);
static::$is_initialized = true;
}

@ -5,7 +5,6 @@
namespace Google\Protobuf;
use Google\Protobuf\Internal\GPBType;
use Google\Protobuf\Internal\Message;
use Google\Protobuf\Internal\RepeatedField;
use Google\Protobuf\Internal\GPBUtil;
@ -39,10 +38,13 @@ use Google\Protobuf\Internal\GPBUtil;
* ...
* Example 4: Pack and unpack a message in Go
* foo := &pb.Foo{...}
* any, err := ptypes.MarshalAny(foo)
* any, err := anypb.New(foo)
* if err != nil {
* ...
* }
* ...
* foo := &pb.Foo{}
* if err := ptypes.UnmarshalAny(any, foo); err != nil {
* if err := any.UnmarshalTo(foo); err != nil {
* ...
* }
* The pack methods provided by protobuf library will by default use
@ -76,11 +78,12 @@ use Google\Protobuf\Internal\GPBUtil;
*
* Generated from protobuf message <code>google.protobuf.Any</code>
*/
class Any extends \Google\Protobuf\Internal\Message
class Any extends \Google\Protobuf\Internal\AnyBase
{
/**
* A URL/resource name that uniquely identifies the type of the serialized
* protocol buffer message. The last segment of the URL's path must represent
* protocol buffer message. This string must contain at least
* one "/" character. The last segment of the URL's path must represent
* the fully qualified name of the type (as in
* `path/google.protobuf.Duration`). The name should be in a canonical form
* (e.g., leading "." is not accepted).
@ -104,15 +107,13 @@ class Any extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>string type_url = 1;</code>
*/
private $type_url = '';
protected $type_url = '';
/**
* Must be a valid serialized protocol buffer of the above specified type.
*
* Generated from protobuf field <code>bytes value = 2;</code>
*/
private $value = '';
const TYPE_URL_PREFIX = 'type.googleapis.com/';
protected $value = '';
/**
* Constructor.
@ -122,7 +123,8 @@ class Any extends \Google\Protobuf\Internal\Message
*
* @type string $type_url
* A URL/resource name that uniquely identifies the type of the serialized
* protocol buffer message. The last segment of the URL's path must represent
* protocol buffer message. This string must contain at least
* one "/" character. The last segment of the URL's path must represent
* the fully qualified name of the type (as in
* `path/google.protobuf.Duration`). The name should be in a canonical form
* (e.g., leading "." is not accepted).
@ -154,7 +156,8 @@ class Any extends \Google\Protobuf\Internal\Message
/**
* A URL/resource name that uniquely identifies the type of the serialized
* protocol buffer message. The last segment of the URL's path must represent
* protocol buffer message. This string must contain at least
* one "/" character. The last segment of the URL's path must represent
* the fully qualified name of the type (as in
* `path/google.protobuf.Duration`). The name should be in a canonical form
* (e.g., leading "." is not accepted).
@ -186,7 +189,8 @@ class Any extends \Google\Protobuf\Internal\Message
/**
* A URL/resource name that uniquely identifies the type of the serialized
* protocol buffer message. The last segment of the URL's path must represent
* protocol buffer message. This string must contain at least
* one "/" character. The last segment of the URL's path must represent
* the fully qualified name of the type (as in
* `path/google.protobuf.Duration`). The name should be in a canonical form
* (e.g., leading "." is not accepted).
@ -246,78 +250,5 @@ class Any extends \Google\Protobuf\Internal\Message
return $this;
}
/**
* This method will try to resolve the type_url in Any message to get the
* targeted message type. If failed, an error will be thrown. Otherwise,
* the method will create a message of the targeted type and fill it with
* the decoded value in Any.
* @return Message unpacked message
* @throws \Exception Type url needs to be type.googleapis.com/fully-qualified.
* @throws \Exception Class hasn't been added to descriptor pool.
* @throws \Exception cannot decode data in value field.
*/
public function unpack()
{
// Get fully qualified name from type url.
$url_prifix_len = strlen(GPBUtil::TYPE_URL_PREFIX);
if (substr($this->type_url, 0, $url_prifix_len) !=
GPBUtil::TYPE_URL_PREFIX) {
throw new \Exception(
"Type url needs to be type.googleapis.com/fully-qulified");
}
$fully_qualifed_name =
substr($this->type_url, $url_prifix_len);
// Create message according to fully qualified name.
$pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
$desc = $pool->getDescriptorByProtoName($fully_qualifed_name);
if (is_null($desc)) {
throw new \Exception("Class ".$fully_qualifed_name
." hasn't been added to descriptor pool");
}
$klass = $desc->getClass();
$msg = new $klass();
// Merge data into message.
$msg->mergeFromString($this->value);
return $msg;
}
/**
* The type_url will be created according to the given message’s type and
* the value is encoded data from the given message..
* @param message: A proto message.
*/
public function pack($msg)
{
if (!$msg instanceof Message) {
trigger_error("Given parameter is not a message instance.",
E_USER_ERROR);
return;
}
// Set value using serialized message.
$this->value = $msg->serializeToString();
// Set type url.
$pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
$desc = $pool->getDescriptorByClassName(get_class($msg));
$fully_qualifed_name = $desc->getFullName();
$this->type_url = GPBUtil::TYPE_URL_PREFIX . $fully_qualifed_name;
}
/**
* This method returns whether the type_url in any_message is corresponded
* to the given class.
* @param klass: The fully qualified PHP class name of a proto message type.
*/
public function is($klass)
{
$pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
$desc = $pool->getDescriptorByClassName($klass);
$fully_qualifed_name = $desc->getFullName();
$type_url = GPBUtil::TYPE_URL_PREFIX . $fully_qualifed_name;
return $this->type_url === $type_url;
}
}

@ -28,7 +28,7 @@ class Api extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>string name = 1;</code>
*/
private $name = '';
protected $name = '';
/**
* The methods of this interface, in unspecified order.
*
@ -62,14 +62,14 @@ class Api extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>string version = 4;</code>
*/
private $version = '';
protected $version = '';
/**
* Source context for the protocol buffer service represented by this
* message.
*
* Generated from protobuf field <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
private $source_context = null;
protected $source_context = null;
/**
* Included interfaces. See [Mixin][].
*
@ -81,7 +81,7 @@ class Api extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>.google.protobuf.Syntax syntax = 7;</code>
*/
private $syntax = 0;
protected $syntax = 0;
/**
* Constructor.
@ -275,7 +275,17 @@ class Api extends \Google\Protobuf\Internal\Message
*/
public function getSourceContext()
{
return $this->source_context;
return isset($this->source_context) ? $this->source_context : null;
}
public function hasSourceContext()
{
return isset($this->source_context);
}
public function clearSourceContext()
{
unset($this->source_context);
}
/**

@ -21,7 +21,7 @@ class BoolValue extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>bool value = 1;</code>
*/
private $value = false;
protected $value = false;
/**
* Constructor.

@ -21,7 +21,7 @@ class BytesValue extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>bytes value = 1;</code>
*/
private $value = '';
protected $value = '';
/**
* Constructor.

@ -21,7 +21,7 @@ class DoubleValue extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>double value = 1;</code>
*/
private $value = 0.0;
protected $value = 0.0;
/**
* Constructor.

@ -25,7 +25,7 @@ use Google\Protobuf\Internal\GPBUtil;
* if (duration.seconds < 0 && duration.nanos > 0) {
* duration.seconds += 1;
* duration.nanos -= 1000000000;
* } else if (durations.seconds > 0 && duration.nanos < 0) {
* } else if (duration.seconds > 0 && duration.nanos < 0) {
* duration.seconds -= 1;
* duration.nanos += 1000000000;
* }
@ -66,7 +66,7 @@ class Duration extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>int64 seconds = 1;</code>
*/
private $seconds = 0;
protected $seconds = 0;
/**
* Signed fractions of a second at nanosecond resolution of the span
* of time. Durations less than one second are represented with a 0
@ -77,7 +77,7 @@ class Duration extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>int32 nanos = 2;</code>
*/
private $nanos = 0;
protected $nanos = 0;
/**
* Constructor.

@ -20,7 +20,7 @@ class Enum extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>string name = 1;</code>
*/
private $name = '';
protected $name = '';
/**
* Enum value definitions.
*
@ -38,13 +38,13 @@ class Enum extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>.google.protobuf.SourceContext source_context = 4;</code>
*/
private $source_context = null;
protected $source_context = null;
/**
* The source syntax.
*
* Generated from protobuf field <code>.google.protobuf.Syntax syntax = 5;</code>
*/
private $syntax = 0;
protected $syntax = 0;
/**
* Constructor.
@ -155,7 +155,17 @@ class Enum extends \Google\Protobuf\Internal\Message
*/
public function getSourceContext()
{
return $this->source_context;
return isset($this->source_context) ? $this->source_context : null;
}
public function hasSourceContext()
{
return isset($this->source_context);
}
public function clearSourceContext()
{
unset($this->source_context);
}
/**

@ -20,13 +20,13 @@ class EnumValue extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>string name = 1;</code>
*/
private $name = '';
protected $name = '';
/**
* Enum value number.
*
* Generated from protobuf field <code>int32 number = 2;</code>
*/
private $number = 0;
protected $number = 0;
/**
* Protocol buffer options.
*

@ -20,45 +20,45 @@ class Field extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>.google.protobuf.Field.Kind kind = 1;</code>
*/
private $kind = 0;
protected $kind = 0;
/**
* The field cardinality.
*
* Generated from protobuf field <code>.google.protobuf.Field.Cardinality cardinality = 2;</code>
*/
private $cardinality = 0;
protected $cardinality = 0;
/**
* The field number.
*
* Generated from protobuf field <code>int32 number = 3;</code>
*/
private $number = 0;
protected $number = 0;
/**
* The field name.
*
* Generated from protobuf field <code>string name = 4;</code>
*/
private $name = '';
protected $name = '';
/**
* The field type URL, without the scheme, for message or enumeration
* types. Example: `"type.googleapis.com/google.protobuf.Timestamp"`.
*
* Generated from protobuf field <code>string type_url = 6;</code>
*/
private $type_url = '';
protected $type_url = '';
/**
* The index of the field type in `Type.oneofs`, for message or enumeration
* types. The first type has index 1; zero means the type is not in the list.
*
* Generated from protobuf field <code>int32 oneof_index = 7;</code>
*/
private $oneof_index = 0;
protected $oneof_index = 0;
/**
* Whether to use alternative packed wire representation.
*
* Generated from protobuf field <code>bool packed = 8;</code>
*/
private $packed = false;
protected $packed = false;
/**
* The protocol buffer options.
*
@ -70,13 +70,13 @@ class Field extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>string json_name = 10;</code>
*/
private $json_name = '';
protected $json_name = '';
/**
* The string value of the default value of this field. Proto2 syntax only.
*
* Generated from protobuf field <code>string default_value = 11;</code>
*/
private $default_value = '';
protected $default_value = '';
/**
* Constructor.
@ -133,7 +133,7 @@ class Field extends \Google\Protobuf\Internal\Message
*/
public function setKind($var)
{
GPBUtil::checkEnum($var, \Google\Protobuf\Field_Kind::class);
GPBUtil::checkEnum($var, \Google\Protobuf\Field\Kind::class);
$this->kind = $var;
return $this;
@ -159,7 +159,7 @@ class Field extends \Google\Protobuf\Internal\Message
*/
public function setCardinality($var)
{
GPBUtil::checkEnum($var, \Google\Protobuf\Field_Cardinality::class);
GPBUtil::checkEnum($var, \Google\Protobuf\Field\Cardinality::class);
$this->cardinality = $var;
return $this;

@ -54,6 +54,7 @@ class Cardinality
return self::$valueToName[$value];
}
public static function value($name)
{
$const = __CLASS__ . '::' . strtoupper($name);

@ -159,6 +159,7 @@ class Kind
return self::$valueToName[$value];
}
public static function value($name)
{
$const = __CLASS__ . '::' . strtoupper($name);

@ -62,45 +62,39 @@ use Google\Protobuf\Internal\GPBUtil;
* and leave the others untouched. If a resource is passed in to
* describe the updated values, the API ignores the values of all
* fields not covered by the mask.
* If a repeated field is specified for an update operation, the existing
* repeated values in the target resource will be overwritten by the new values.
* Note that a repeated field is only allowed in the last position of a `paths`
* string.
* If a repeated field is specified for an update operation, new values will
* be appended to the existing repeated field in the target resource. Note that
* a repeated field is only allowed in the last position of a `paths` string.
* If a sub-message is specified in the last position of the field mask for an
* update operation, then the existing sub-message in the target resource is
* overwritten. Given the target message:
* update operation, then new value will be merged into the existing sub-message
* in the target resource.
* For example, given the target message:
* f {
* b {
* d : 1
* x : 2
* d: 1
* x: 2
* }
* c : 1
* c: [1]
* }
* And an update message:
* f {
* b {
* d : 10
* d: 10
* }
* c: [2]
* }
* then if the field mask is:
* paths: "f.b"
* paths: ["f.b", "f.c"]
* then the result will be:
* f {
* b {
* d : 10
* }
* c : 1
* }
* However, if the update mask was:
* paths: "f.b.d"
* then the result would be:
* f {
* b {
* d : 10
* x : 2
* d: 10
* x: 2
* }
* c : 1
* c: [1, 2]
* }
* An implementation may provide options to override this default behavior for
* repeated and message fields.
* In order to reset a field's value to the default, the field must
* be in the mask and set to the default value in the provided resource.
* Hence, in order to reset all fields of a resource, provide a default
@ -165,7 +159,7 @@ use Google\Protobuf\Internal\GPBUtil;
* ## Field Mask Verification
* The implementation of any API method which has a FieldMask type field in the
* request should verify the included field paths, and return an
* `INVALID_ARGUMENT` error if any path is duplicated or unmappable.
* `INVALID_ARGUMENT` error if any path is unmappable.
*
* Generated from protobuf message <code>google.protobuf.FieldMask</code>
*/

@ -21,7 +21,7 @@ class FloatValue extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>float value = 1;</code>
*/
private $value = 0.0;
protected $value = 0.0;
/**
* Constructor.

@ -21,7 +21,7 @@ class Int32Value extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>int32 value = 1;</code>
*/
private $value = 0;
protected $value = 0;
/**
* Constructor.

@ -21,7 +21,7 @@ class Int64Value extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>int64 value = 1;</code>
*/
private $value = 0;
protected $value = 0;
/**
* Constructor.

@ -0,0 +1,86 @@
<?php
namespace Google\Protobuf\Internal;
/**
* Base class for Google\Protobuf\Any, this contains hand-written convenience
* methods like pack() and unpack().
*/
class AnyBase extends \Google\Protobuf\Internal\Message
{
const TYPE_URL_PREFIX = 'type.googleapis.com/';
/**
* This method will try to resolve the type_url in Any message to get the
* targeted message type. If failed, an error will be thrown. Otherwise,
* the method will create a message of the targeted type and fill it with
* the decoded value in Any.
* @return Message unpacked message
* @throws \Exception Type url needs to be type.googleapis.com/fully-qualified.
* @throws \Exception Class hasn't been added to descriptor pool.
* @throws \Exception cannot decode data in value field.
*/
public function unpack()
{
// Get fully qualified name from type url.
$url_prifix_len = strlen(GPBUtil::TYPE_URL_PREFIX);
if (substr($this->type_url, 0, $url_prifix_len) !=
GPBUtil::TYPE_URL_PREFIX) {
throw new \Exception(
"Type url needs to be type.googleapis.com/fully-qulified");
}
$fully_qualifed_name =
substr($this->type_url, $url_prifix_len);
// Create message according to fully qualified name.
$pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
$desc = $pool->getDescriptorByProtoName($fully_qualifed_name);
if (is_null($desc)) {
throw new \Exception("Class ".$fully_qualifed_name
." hasn't been added to descriptor pool");
}
$klass = $desc->getClass();
$msg = new $klass();
// Merge data into message.
$msg->mergeFromString($this->value);
return $msg;
}
/**
* The type_url will be created according to the given message’s type and
* the value is encoded data from the given message..
* @param message: A proto message.
*/
public function pack($msg)
{
if (!$msg instanceof Message) {
trigger_error("Given parameter is not a message instance.",
E_USER_ERROR);
return;
}
// Set value using serialized message.
$this->value = $msg->serializeToString();
// Set type url.
$pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
$desc = $pool->getDescriptorByClassName(get_class($msg));
$fully_qualifed_name = $desc->getFullName();
$this->type_url = GPBUtil::TYPE_URL_PREFIX . $fully_qualifed_name;
}
/**
* This method returns whether the type_url in any_message is corresponded
* to the given class.
* @param klass: The fully qualified PHP class name of a proto message type.
*/
public function is($klass)
{
$pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
$desc = $pool->getDescriptorByClassName($klass);
$fully_qualifed_name = $desc->getFullName();
$type_url = GPBUtil::TYPE_URL_PREFIX . $fully_qualifed_name;
return $this->type_url === $type_url;
}
}

@ -0,0 +1,32 @@
<?php
namespace Google\Protobuf\Internal;
/**
* Base class for Google\Protobuf\Timestamp, this contains hand-written
* convenience methods.
*/
class TimestampBase extends \Google\Protobuf\Internal\Message
{
/*
* Converts PHP DateTime to Timestamp.
*
* @param \DateTime $datetime
*/
public function fromDateTime(\DateTime $datetime)
{
$this->seconds = $datetime->getTimestamp();
$this->nanos = 1000 * $datetime->format('u');
}
/**
* Converts Timestamp to PHP DateTime.
*
* @return \DateTime $datetime
*/
public function toDateTime()
{
$time = sprintf('%s.%06d', $this->seconds, $this->nanos / 1000);
return \DateTime::createFromFormat('U.u', $time);
}
}

@ -20,31 +20,31 @@ class Method extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>string name = 1;</code>
*/
private $name = '';
protected $name = '';
/**
* A URL of the input message type.
*
* Generated from protobuf field <code>string request_type_url = 2;</code>
*/
private $request_type_url = '';
protected $request_type_url = '';
/**
* If true, the request is streamed.
*
* Generated from protobuf field <code>bool request_streaming = 3;</code>
*/
private $request_streaming = false;
protected $request_streaming = false;
/**
* The URL of the output message type.
*
* Generated from protobuf field <code>string response_type_url = 4;</code>
*/
private $response_type_url = '';
protected $response_type_url = '';
/**
* If true, the response is streamed.
*
* Generated from protobuf field <code>bool response_streaming = 5;</code>
*/
private $response_streaming = false;
protected $response_streaming = false;
/**
* Any metadata attached to the method.
*
@ -56,7 +56,7 @@ class Method extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>.google.protobuf.Syntax syntax = 7;</code>
*/
private $syntax = 0;
protected $syntax = 0;
/**
* Constructor.

@ -81,14 +81,14 @@ class Mixin extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>string name = 1;</code>
*/
private $name = '';
protected $name = '';
/**
* If non-empty specifies a path under which inherited HTTP paths
* are rooted.
*
* Generated from protobuf field <code>string root = 2;</code>
*/
private $root = '';
protected $root = '';
/**
* Constructor.

@ -24,7 +24,7 @@ class Option extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>string name = 1;</code>
*/
private $name = '';
protected $name = '';
/**
* 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
@ -33,7 +33,7 @@ class Option extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>.google.protobuf.Any value = 2;</code>
*/
private $value = null;
protected $value = null;
/**
* Constructor.
@ -101,7 +101,17 @@ class Option extends \Google\Protobuf\Internal\Message
*/
public function getValue()
{
return $this->value;
return isset($this->value) ? $this->value : null;
}
public function hasValue()
{
return isset($this->value);
}
public function clearValue()
{
unset($this->value);
}
/**

@ -22,7 +22,7 @@ class SourceContext extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>string file_name = 1;</code>
*/
private $file_name = '';
protected $file_name = '';
/**
* Constructor.

@ -21,7 +21,7 @@ class StringValue extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>string value = 1;</code>
*/
private $value = '';
protected $value = '';
/**
* Constructor.

@ -40,6 +40,7 @@ class Syntax
return self::$valueToName[$value];
}
public static function value($name)
{
$const = __CLASS__ . '::' . strtoupper($name);

@ -9,17 +9,17 @@ use Google\Protobuf\Internal\RepeatedField;
use Google\Protobuf\Internal\GPBUtil;
/**
* A Timestamp represents a point in time independent of any time zone
* or calendar, represented as seconds and fractions of seconds at
* nanosecond resolution in UTC Epoch time. It is encoded using the
* Proleptic Gregorian Calendar which extends the Gregorian calendar
* backwards to year one. It is encoded assuming all minutes are 60
* seconds long, i.e. leap seconds are "smeared" so that no leap second
* table is needed for interpretation. Range is from
* 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z.
* By restricting to that range, we ensure that we can convert to
* and from RFC 3339 date strings.
* See [https://www.ietf.org/rfc/rfc3339.txt](https://www.ietf.org/rfc/rfc3339.txt).
* A Timestamp represents a point in time independent of any time zone or local
* calendar, encoded as a count of seconds and fractions of seconds at
* nanosecond resolution. The count is relative to an epoch at UTC midnight on
* January 1, 1970, in the proleptic Gregorian calendar which extends the
* Gregorian calendar backwards to year one.
* All minutes are 60 seconds long. Leap seconds are "smeared" so that no leap
* second table is needed for interpretation, using a [24-hour linear
* smear](https://developers.google.com/time/smear).
* The range is from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. By
* restricting to that range, we ensure that we can convert to and from [RFC
* 3339](https://www.ietf.org/rfc/rfc3339.txt) date strings.
* # Examples
* Example 1: Compute Timestamp from POSIX `time()`.
* Timestamp timestamp;
@ -44,7 +44,12 @@ use Google\Protobuf\Internal\GPBUtil;
* long millis = System.currentTimeMillis();
* Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000)
* .setNanos((int) ((millis % 1000) * 1000000)).build();
* Example 5: Compute Timestamp from current time in Python.
* Example 5: Compute Timestamp from Java `Instant.now()`.
* Instant now = Instant.now();
* Timestamp timestamp =
* Timestamp.newBuilder().setSeconds(now.getEpochSecond())
* .setNanos(now.getNano()).build();
* Example 6: Compute Timestamp from current time in Python.
* timestamp = Timestamp()
* timestamp.GetCurrentTime()
* # JSON Mapping
@ -61,17 +66,19 @@ use Google\Protobuf\Internal\GPBUtil;
* For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past
* 01:30 UTC on January 15, 2017.
* In JavaScript, one can convert a Date object to this format using the
* standard [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString]
* standard
* [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString)
* method. In Python, a standard `datetime.datetime` object can be converted
* to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime)
* with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one
* can use the Joda Time's [`ISODateTimeFormat.dateTime()`](
* http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime--
* to this format using
* [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with
* the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use
* the Joda Time's [`ISODateTimeFormat.dateTime()`](
* http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D
* ) to obtain a formatter capable of generating timestamps in this format.
*
* Generated from protobuf message <code>google.protobuf.Timestamp</code>
*/
class Timestamp extends \Google\Protobuf\Internal\Message
class Timestamp extends \Google\Protobuf\Internal\TimestampBase
{
/**
* Represents seconds of UTC time since Unix epoch
@ -80,7 +87,7 @@ class Timestamp extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>int64 seconds = 1;</code>
*/
private $seconds = 0;
protected $seconds = 0;
/**
* Non-negative fractions of a second at nanosecond resolution. Negative
* second values with fractions must still have non-negative nanos values
@ -89,7 +96,7 @@ class Timestamp extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>int32 nanos = 2;</code>
*/
private $nanos = 0;
protected $nanos = 0;
/**
* Constructor.
@ -175,26 +182,5 @@ class Timestamp extends \Google\Protobuf\Internal\Message
return $this;
}
/*
* Converts PHP DateTime to Timestamp.
*
* @param \DateTime $datetime
*/
public function fromDateTime(\DateTime $datetime)
{
$this->seconds = $datetime->getTimestamp();
$this->nanos = 1000 * $datetime->format('u');
}
/**
* Converts Timestamp to PHP DateTime.
*
* @return \DateTime $datetime
*/
public function toDateTime()
{
$time = sprintf('%s.%06d', $this->seconds, $this->nanos / 1000);
return \DateTime::createFromFormat('U.u', $time);
}
}

@ -20,7 +20,7 @@ class Type extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>string name = 1;</code>
*/
private $name = '';
protected $name = '';
/**
* The list of fields.
*
@ -44,13 +44,13 @@ class Type extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
private $source_context = null;
protected $source_context = null;
/**
* The source syntax.
*
* Generated from protobuf field <code>.google.protobuf.Syntax syntax = 6;</code>
*/
private $syntax = 0;
protected $syntax = 0;
/**
* Constructor.
@ -189,7 +189,17 @@ class Type extends \Google\Protobuf\Internal\Message
*/
public function getSourceContext()
{
return $this->source_context;
return isset($this->source_context) ? $this->source_context : null;
}
public function hasSourceContext()
{
return isset($this->source_context);
}
public function clearSourceContext()
{
unset($this->source_context);
}
/**

@ -21,7 +21,7 @@ class UInt32Value extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>uint32 value = 1;</code>
*/
private $value = 0;
protected $value = 0;
/**
* Constructor.

@ -21,7 +21,7 @@ class UInt64Value extends \Google\Protobuf\Internal\Message
*
* Generated from protobuf field <code>uint64 value = 1;</code>
*/
private $value = 0;
protected $value = 0;
/**
* Constructor.

@ -7,7 +7,6 @@ cd $(dirname $0)
pushd ../ext/google/protobuf
phpize --clean
rm -f configure.in configure.ac
php make-preload.php
phpize
if [ "$1" = "--release" ]; then
./configure --with-php-config=$(which php-config)

File diff suppressed because it is too large Load Diff

@ -43,6 +43,8 @@ namespace protobuf {
namespace compiler {
namespace php {
struct Options;
class PROTOC_EXPORT Generator : public CodeGenerator {
public:
virtual bool Generate(
@ -63,9 +65,7 @@ class PROTOC_EXPORT Generator : public CodeGenerator {
private:
bool Generate(
const FileDescriptor* file,
bool is_descriptor,
bool aggregate_metadata,
const std::set<std::string>& aggregate_metadata_prefixes,
const Options& options,
GeneratorContext* generator_context,
std::string* error) const;
};

Loading…
Cancel
Save