diff options
| author |  Paul Yang <TeBoring@users.noreply.github.com> | 2017-05-10 15:59:59 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-05-10 15:59:59 -0700 |
| commit | 22319315df18526277873058f79cf69e77d8b4a2 (patch) | |
| tree | 0857794e9aa893a0699b911d9038304743fa0f9e /php/ext/google/protobuf/message.c | |
| parent | c2154e124dfe0dc80b563568e2be4c599120a718 (diff) | |
Fix c extension for php7.1. (#3077)
Diffstat (limited to 'php/ext/google/protobuf/message.c')
| -rw-r--r-- | php/ext/google/protobuf/message.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/php/ext/google/protobuf/message.c b/php/ext/google/protobuf/message.c index cabc3987..48b87b10 100644 --- a/php/ext/google/protobuf/message.c +++ b/php/ext/google/protobuf/message.c @@ -116,7 +116,11 @@ static void message_set_property(zval* object, zval* member, zval* value, return; } +#if PHP_MAJOR_VERSION < 7 || (PHP_MAJOR_VERSION == 7 && PHP_MINOR_VERSION == 0) if (Z_OBJCE_P(object) != EG(scope)) { +#else + if (Z_OBJCE_P(object) != zend_get_executed_scope()) { +#endif // User cannot set property directly (e.g., $m->a = 1) zend_error(E_USER_ERROR, "Cannot access private property."); return; @@ -146,7 +150,11 @@ static zval* message_get_property(zval* object, zval* member, int type, return PHP_PROTO_GLOBAL_UNINITIALIZED_ZVAL; } +#if PHP_MAJOR_VERSION < 7 || (PHP_MAJOR_VERSION == 7 && PHP_MINOR_VERSION == 0) if (Z_OBJCE_P(object) != EG(scope)) { +#else + if (Z_OBJCE_P(object) != zend_get_executed_scope()) { +#endif // User cannot get property directly (e.g., $a = $m->a) zend_error(E_USER_ERROR, "Cannot access private property."); return PHP_PROTO_GLOBAL_UNINITIALIZED_ZVAL; |