Skip to content

make version props typed #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

make version props typed #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/php_pq_object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,12 +231,13 @@ zval *php_pq_object_read_prop(zend_object *object, zend_string *member, int type
if (SUCCESS != php_pq_object_read_prop_ex(object, member, type, tmp)) {
return zend_std_read_property(object, member, type, cache_slot, tmp);
}

/*
zend_std_write_property(object, member, tmp, cache_slot);

if (cache_slot) {
*cache_slot = NULL;
}
*/
return tmp;
}
#else
Expand Down
36 changes: 33 additions & 3 deletions src/php_pqconn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2160,19 +2160,49 @@ PHP_MINIT_FUNCTION(pqconn)
ph.write = NULL;

#ifdef HAVE_PQLIBVERSION
zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("libraryVersion"), ZEND_ACC_PUBLIC|ZEND_ACC_READONLY);
#if PHP_VERSION_ID < 80000
zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("libraryVersion"), ZEND_ACC_PUBLIC);
#else
{
zval default_value;
zend_string *name = zend_string_init(ZEND_STRL("libraryVersion"), 1);
ZVAL_UNDEF(&default_value);
zend_declare_typed_property(php_pqconn_class_entry, name, &default_value, ZEND_ACC_PUBLIC|ZEND_ACC_READONLY, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_STRING));
zend_string_release(name);
}
#endif
ph.read = php_pqconn_object_read_lib_version;
zend_hash_str_add_mem(&php_pqconn_object_prophandlers, ZEND_STRL("libraryVersion"), (void *) &ph, sizeof(ph));
#endif

#ifdef HAVE_PQPROTOCOLVERSION
zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("protocolVersion"), ZEND_ACC_PUBLIC|ZEND_ACC_READONLY);
#if PHP_VERSION_ID < 80000
zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("protocolVersion"), ZEND_ACC_PUBLIC);
#else
{
zval default_value;
zend_string *name = zend_string_init(ZEND_STRL("protocolVersion"), 1);
ZVAL_UNDEF(&default_value);
zend_declare_typed_property(php_pqconn_class_entry, name, &default_value, ZEND_ACC_PUBLIC|ZEND_ACC_READONLY, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_LONG));
zend_string_release(name);
}
#endif
ph.read = php_pqconn_object_read_protocol_version;
zend_hash_str_add_mem(&php_pqconn_object_prophandlers, ZEND_STRL("protocolVersion"), (void *) &ph, sizeof(ph));
#endif

#ifdef HAVE_PQSERVERVERSION
zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("serverVersion"), ZEND_ACC_PUBLIC|ZEND_ACC_READONLY);
#if PHP_VERSION_ID < 80000
zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("serverVersion"), ZEND_ACC_PUBLIC);
#else
{
zval default_value;
zend_string *name = zend_string_init(ZEND_STRL("serverVersion"), 1);
ZVAL_UNDEF(&default_value);
zend_declare_typed_property(php_pqconn_class_entry, name, &default_value, ZEND_ACC_PUBLIC|ZEND_ACC_READONLY, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_STRING));
zend_string_release(name);
}
#endif
ph.read = php_pqconn_object_read_server_version;
zend_hash_str_add_mem(&php_pqconn_object_prophandlers, ZEND_STRL("serverVersion"), (void *) &ph, sizeof(ph));
#endif
Expand Down