From 93d8e89374947aa6c05c290b08efd211c6703087 Mon Sep 17 00:00:00 2001 From: Paul Yang Date: Mon, 17 Aug 2020 12:58:35 -0700 Subject: [PATCH 1/2] Fix version number in php macro (#7822) Fixes #7812 --- php/ext/google/protobuf/message.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php/ext/google/protobuf/message.c b/php/ext/google/protobuf/message.c index 63d2b084aa..3db86638b6 100644 --- a/php/ext/google/protobuf/message.c +++ b/php/ext/google/protobuf/message.c @@ -265,14 +265,14 @@ static PROTO_RETURN_VAL Message_write_property( } upb_msg_set(intern->msg, f, msgval, arena); -#if PHP_VERSION_ID < 704000 +#if PHP_VERSION_ID < 70400 return; #else return val; #endif error: -#if PHP_VERSION_ID < 704000 +#if PHP_VERSION_ID < 70400 return; #else return &EG(error_zval); From d1eca4e4b421cd2997495c4b4e65cea6be4e9b8a Mon Sep 17 00:00:00 2001 From: Paul Yang Date: Thu, 8 Oct 2020 11:17:30 -0700 Subject: [PATCH 2/2] Update version number to 3.13.0.1 for php (#7950) --- php/ext/google/protobuf/package.xml | 20 +++++++++++++++++--- php/ext/google/protobuf/protobuf.h | 4 ++-- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/php/ext/google/protobuf/package.xml b/php/ext/google/protobuf/package.xml index 037fa90d93..e0d25c87c5 100644 --- a/php/ext/google/protobuf/package.xml +++ b/php/ext/google/protobuf/package.xml @@ -10,11 +10,11 @@ protobuf-opensource@google.com yes - 2020-08-14 + 2020-10-08 - 3.13.0 - 3.13.0 + 3.13.0.1 + 3.13.0.1 stable @@ -675,5 +675,19 @@ G A release. 3-Clause BSD License GA release. + + + 3.13.0.1 + 3.13.0.1 + + + stable + stable + + 2020-10-08 + + 3-Clause BSD License + GA release. + diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index 3188fe7dcb..195e2a7971 100644 --- a/php/ext/google/protobuf/protobuf.h +++ b/php/ext/google/protobuf/protobuf.h @@ -56,7 +56,7 @@ const zval *get_generated_pool(); // instead of zval* and zend_string* instead of zval* for property names. // https://github.com/php/php-src/blob/php-8.0.0beta1/UPGRADING.INTERNALS#L37-L39 #if PHP_VERSION_ID < 80000 -#define PROTO_VAL zval +#define PROTO_VAL zval #define PROTO_STR zval #define PROTO_MSG_P(obj) (Message*)Z_OBJ_P(obj) #define PROTO_STRVAL_P(obj) Z_STRVAL_P(obj) @@ -69,7 +69,7 @@ const zval *get_generated_pool(); #define PROTO_STRLEN_P(obj) ZSTR_LEN(obj) #endif -#define PHP_PROTOBUF_VERSION "3.13.0" +#define PHP_PROTOBUF_VERSION "3.13.0.1" // ptr -> PHP object cache. This is a weak map that caches lazily-created // wrapper objects around upb types: