diff --git a/CMakePresets.json b/CMakePresets.json index 4ee6c6e4c..630711dab 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -13,10 +13,10 @@ "ENABLE_SANITIZERS": "ON", "SANITIZE_UNDEFINED": "ON", "SANITIZE_ADDRESS": "ON", - "PHP_DRIVER_BACKEND": "scylla-cpp", + "PHP_SCYLLADB_BACKEND": "scylla-cpp", "PHP_VERSION_FOR_PHP_CONFIG": "8.3", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -32,10 +32,10 @@ "ENABLE_SANITIZERS": "ON", "SANITIZE_UNDEFINED": "ON", "SANITIZE_ADDRESS": "ON", - "PHP_DRIVER_BACKEND": "scylla-cpp", + "PHP_SCYLLADB_BACKEND": "scylla-cpp", "PHP_VERSION_FOR_PHP_CONFIG": "8.3", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -51,10 +51,10 @@ "ENABLE_SANITIZERS": "ON", "SANITIZE_UNDEFINED": "ON", "SANITIZE_ADDRESS": "ON", - "PHP_DRIVER_BACKEND": "cassandra", + "PHP_SCYLLADB_BACKEND": "cassandra", "PHP_VERSION_FOR_PHP_CONFIG": "8.3", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -70,10 +70,10 @@ "ENABLE_SANITIZERS": "ON", "SANITIZE_UNDEFINED": "ON", "SANITIZE_ADDRESS": "ON", - "PHP_DRIVER_BACKEND": "cassandra", + "PHP_SCYLLADB_BACKEND": "cassandra", "PHP_VERSION_FOR_PHP_CONFIG": "8.3", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -89,10 +89,10 @@ "ENABLE_SANITIZERS": "ON", "SANITIZE_UNDEFINED": "ON", "SANITIZE_ADDRESS": "ON", - "PHP_DRIVER_BACKEND": "scylla-rust", + "PHP_SCYLLADB_BACKEND": "scylla-rust", "PHP_VERSION_FOR_PHP_CONFIG": "8.3", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -108,10 +108,10 @@ "ENABLE_SANITIZERS": "ON", "SANITIZE_UNDEFINED": "ON", "SANITIZE_ADDRESS": "ON", - "PHP_DRIVER_BACKEND": "scylla-rust", + "PHP_SCYLLADB_BACKEND": "scylla-rust", "PHP_VERSION_FOR_PHP_CONFIG": "8.3", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -127,10 +127,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "scylla-cpp", + "PHP_SCYLLADB_BACKEND": "scylla-cpp", "PHP_VERSION_FOR_PHP_CONFIG": "8.3", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -146,10 +146,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "scylla-cpp", + "PHP_SCYLLADB_BACKEND": "scylla-cpp", "PHP_VERSION_FOR_PHP_CONFIG": "8.3", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -165,10 +165,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "cassandra", + "PHP_SCYLLADB_BACKEND": "cassandra", "PHP_VERSION_FOR_PHP_CONFIG": "8.3", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -184,10 +184,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "cassandra", + "PHP_SCYLLADB_BACKEND": "cassandra", "PHP_VERSION_FOR_PHP_CONFIG": "8.3", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -203,10 +203,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "scylla-rust", + "PHP_SCYLLADB_BACKEND": "scylla-rust", "PHP_VERSION_FOR_PHP_CONFIG": "8.3", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -222,10 +222,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "scylla-rust", + "PHP_SCYLLADB_BACKEND": "scylla-rust", "PHP_VERSION_FOR_PHP_CONFIG": "8.3", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -241,10 +241,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "scylla-cpp", + "PHP_SCYLLADB_BACKEND": "scylla-cpp", "PHP_VERSION_FOR_PHP_CONFIG": "8.3", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -260,10 +260,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "scylla-cpp", + "PHP_SCYLLADB_BACKEND": "scylla-cpp", "PHP_VERSION_FOR_PHP_CONFIG": "8.3", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -279,10 +279,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "cassandra", + "PHP_SCYLLADB_BACKEND": "cassandra", "PHP_VERSION_FOR_PHP_CONFIG": "8.3", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -298,10 +298,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "cassandra", + "PHP_SCYLLADB_BACKEND": "cassandra", "PHP_VERSION_FOR_PHP_CONFIG": "8.3", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -317,10 +317,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "scylla-rust", + "PHP_SCYLLADB_BACKEND": "scylla-rust", "PHP_VERSION_FOR_PHP_CONFIG": "8.3", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -336,10 +336,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "scylla-rust", + "PHP_SCYLLADB_BACKEND": "scylla-rust", "PHP_VERSION_FOR_PHP_CONFIG": "8.3", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -355,10 +355,10 @@ "ENABLE_SANITIZERS": "ON", "SANITIZE_UNDEFINED": "ON", "SANITIZE_ADDRESS": "ON", - "PHP_DRIVER_BACKEND": "scylla-cpp", + "PHP_SCYLLADB_BACKEND": "scylla-cpp", "PHP_VERSION_FOR_PHP_CONFIG": "8.4", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -374,10 +374,10 @@ "ENABLE_SANITIZERS": "ON", "SANITIZE_UNDEFINED": "ON", "SANITIZE_ADDRESS": "ON", - "PHP_DRIVER_BACKEND": "scylla-cpp", + "PHP_SCYLLADB_BACKEND": "scylla-cpp", "PHP_VERSION_FOR_PHP_CONFIG": "8.4", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -393,10 +393,10 @@ "ENABLE_SANITIZERS": "ON", "SANITIZE_UNDEFINED": "ON", "SANITIZE_ADDRESS": "ON", - "PHP_DRIVER_BACKEND": "cassandra", + "PHP_SCYLLADB_BACKEND": "cassandra", "PHP_VERSION_FOR_PHP_CONFIG": "8.4", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -412,10 +412,10 @@ "ENABLE_SANITIZERS": "ON", "SANITIZE_UNDEFINED": "ON", "SANITIZE_ADDRESS": "ON", - "PHP_DRIVER_BACKEND": "cassandra", + "PHP_SCYLLADB_BACKEND": "cassandra", "PHP_VERSION_FOR_PHP_CONFIG": "8.4", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -431,10 +431,10 @@ "ENABLE_SANITIZERS": "ON", "SANITIZE_UNDEFINED": "ON", "SANITIZE_ADDRESS": "ON", - "PHP_DRIVER_BACKEND": "scylla-rust", + "PHP_SCYLLADB_BACKEND": "scylla-rust", "PHP_VERSION_FOR_PHP_CONFIG": "8.4", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -450,10 +450,10 @@ "ENABLE_SANITIZERS": "ON", "SANITIZE_UNDEFINED": "ON", "SANITIZE_ADDRESS": "ON", - "PHP_DRIVER_BACKEND": "scylla-rust", + "PHP_SCYLLADB_BACKEND": "scylla-rust", "PHP_VERSION_FOR_PHP_CONFIG": "8.4", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -469,10 +469,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "scylla-cpp", + "PHP_SCYLLADB_BACKEND": "scylla-cpp", "PHP_VERSION_FOR_PHP_CONFIG": "8.4", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -488,10 +488,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "scylla-cpp", + "PHP_SCYLLADB_BACKEND": "scylla-cpp", "PHP_VERSION_FOR_PHP_CONFIG": "8.4", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -507,10 +507,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "cassandra", + "PHP_SCYLLADB_BACKEND": "cassandra", "PHP_VERSION_FOR_PHP_CONFIG": "8.4", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -526,10 +526,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "cassandra", + "PHP_SCYLLADB_BACKEND": "cassandra", "PHP_VERSION_FOR_PHP_CONFIG": "8.4", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -545,10 +545,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "scylla-rust", + "PHP_SCYLLADB_BACKEND": "scylla-rust", "PHP_VERSION_FOR_PHP_CONFIG": "8.4", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -564,10 +564,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "scylla-rust", + "PHP_SCYLLADB_BACKEND": "scylla-rust", "PHP_VERSION_FOR_PHP_CONFIG": "8.4", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -583,10 +583,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "scylla-cpp", + "PHP_SCYLLADB_BACKEND": "scylla-cpp", "PHP_VERSION_FOR_PHP_CONFIG": "8.4", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -602,10 +602,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "scylla-cpp", + "PHP_SCYLLADB_BACKEND": "scylla-cpp", "PHP_VERSION_FOR_PHP_CONFIG": "8.4", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -621,10 +621,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "cassandra", + "PHP_SCYLLADB_BACKEND": "cassandra", "PHP_VERSION_FOR_PHP_CONFIG": "8.4", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -640,10 +640,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "cassandra", + "PHP_SCYLLADB_BACKEND": "cassandra", "PHP_VERSION_FOR_PHP_CONFIG": "8.4", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -659,10 +659,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "scylla-rust", + "PHP_SCYLLADB_BACKEND": "scylla-rust", "PHP_VERSION_FOR_PHP_CONFIG": "8.4", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -678,10 +678,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "scylla-rust", + "PHP_SCYLLADB_BACKEND": "scylla-rust", "PHP_VERSION_FOR_PHP_CONFIG": "8.4", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -697,10 +697,10 @@ "ENABLE_SANITIZERS": "ON", "SANITIZE_UNDEFINED": "ON", "SANITIZE_ADDRESS": "ON", - "PHP_DRIVER_BACKEND": "scylla-cpp", + "PHP_SCYLLADB_BACKEND": "scylla-cpp", "PHP_VERSION_FOR_PHP_CONFIG": "8.5", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -716,10 +716,10 @@ "ENABLE_SANITIZERS": "ON", "SANITIZE_UNDEFINED": "ON", "SANITIZE_ADDRESS": "ON", - "PHP_DRIVER_BACKEND": "scylla-cpp", + "PHP_SCYLLADB_BACKEND": "scylla-cpp", "PHP_VERSION_FOR_PHP_CONFIG": "8.5", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -735,10 +735,10 @@ "ENABLE_SANITIZERS": "ON", "SANITIZE_UNDEFINED": "ON", "SANITIZE_ADDRESS": "ON", - "PHP_DRIVER_BACKEND": "cassandra", + "PHP_SCYLLADB_BACKEND": "cassandra", "PHP_VERSION_FOR_PHP_CONFIG": "8.5", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -754,10 +754,10 @@ "ENABLE_SANITIZERS": "ON", "SANITIZE_UNDEFINED": "ON", "SANITIZE_ADDRESS": "ON", - "PHP_DRIVER_BACKEND": "cassandra", + "PHP_SCYLLADB_BACKEND": "cassandra", "PHP_VERSION_FOR_PHP_CONFIG": "8.5", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -773,10 +773,10 @@ "ENABLE_SANITIZERS": "ON", "SANITIZE_UNDEFINED": "ON", "SANITIZE_ADDRESS": "ON", - "PHP_DRIVER_BACKEND": "scylla-rust", + "PHP_SCYLLADB_BACKEND": "scylla-rust", "PHP_VERSION_FOR_PHP_CONFIG": "8.5", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -792,10 +792,10 @@ "ENABLE_SANITIZERS": "ON", "SANITIZE_UNDEFINED": "ON", "SANITIZE_ADDRESS": "ON", - "PHP_DRIVER_BACKEND": "scylla-rust", + "PHP_SCYLLADB_BACKEND": "scylla-rust", "PHP_VERSION_FOR_PHP_CONFIG": "8.5", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -811,10 +811,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "scylla-cpp", + "PHP_SCYLLADB_BACKEND": "scylla-cpp", "PHP_VERSION_FOR_PHP_CONFIG": "8.5", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -830,10 +830,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "scylla-cpp", + "PHP_SCYLLADB_BACKEND": "scylla-cpp", "PHP_VERSION_FOR_PHP_CONFIG": "8.5", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -849,10 +849,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "cassandra", + "PHP_SCYLLADB_BACKEND": "cassandra", "PHP_VERSION_FOR_PHP_CONFIG": "8.5", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -868,10 +868,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "cassandra", + "PHP_SCYLLADB_BACKEND": "cassandra", "PHP_VERSION_FOR_PHP_CONFIG": "8.5", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -887,10 +887,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "scylla-rust", + "PHP_SCYLLADB_BACKEND": "scylla-rust", "PHP_VERSION_FOR_PHP_CONFIG": "8.5", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -906,10 +906,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "scylla-rust", + "PHP_SCYLLADB_BACKEND": "scylla-rust", "PHP_VERSION_FOR_PHP_CONFIG": "8.5", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -925,10 +925,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "scylla-cpp", + "PHP_SCYLLADB_BACKEND": "scylla-cpp", "PHP_VERSION_FOR_PHP_CONFIG": "8.5", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -944,10 +944,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "scylla-cpp", + "PHP_SCYLLADB_BACKEND": "scylla-cpp", "PHP_VERSION_FOR_PHP_CONFIG": "8.5", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -963,10 +963,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "cassandra", + "PHP_SCYLLADB_BACKEND": "cassandra", "PHP_VERSION_FOR_PHP_CONFIG": "8.5", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -982,10 +982,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "cassandra", + "PHP_SCYLLADB_BACKEND": "cassandra", "PHP_VERSION_FOR_PHP_CONFIG": "8.5", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } }, @@ -1001,10 +1001,10 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "scylla-rust", + "PHP_SCYLLADB_BACKEND": "scylla-rust", "PHP_VERSION_FOR_PHP_CONFIG": "8.5", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "ON" } }, @@ -1020,10 +1020,352 @@ "ENABLE_SANITIZERS": "OFF", "SANITIZE_UNDEFINED": "OFF", "SANITIZE_ADDRESS": "OFF", - "PHP_DRIVER_BACKEND": "scylla-rust", + "PHP_SCYLLADB_BACKEND": "scylla-rust", "PHP_VERSION_FOR_PHP_CONFIG": "8.5", "LINK_LIBUV_STATIC": "ON", - "PHP_DRIVER_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", + "PHP_THREAD_SAFE": "OFF" + } + }, + { + "name": "DebugPHP8.6ZTS", + "displayName": "DebugPHP8.6ZTS", + "description": "", + "generator": "Ninja", + "binaryDir": "./out/DebugPHP8.6ZTS", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_INSTALL_PREFIX": "./out/DebugPHP8.6ZTS/install", + "ENABLE_SANITIZERS": "ON", + "SANITIZE_UNDEFINED": "ON", + "SANITIZE_ADDRESS": "ON", + "PHP_SCYLLADB_BACKEND": "scylla-cpp", + "PHP_VERSION_FOR_PHP_CONFIG": "8.6", + "LINK_LIBUV_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", + "PHP_THREAD_SAFE": "ON" + } + }, + { + "name": "DebugPHP8.6NTS", + "displayName": "DebugPHP8.6NTS", + "description": "", + "generator": "Ninja", + "binaryDir": "./out/DebugPHP8.6NTS", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_INSTALL_PREFIX": "./out/DebugPHP8.6NTS/install", + "ENABLE_SANITIZERS": "ON", + "SANITIZE_UNDEFINED": "ON", + "SANITIZE_ADDRESS": "ON", + "PHP_SCYLLADB_BACKEND": "scylla-cpp", + "PHP_VERSION_FOR_PHP_CONFIG": "8.6", + "LINK_LIBUV_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", + "PHP_THREAD_SAFE": "OFF" + } + }, + { + "name": "DebugPHP8.6ZTSCassandra", + "displayName": "DebugPHP8.6ZTSCassandra", + "description": "", + "generator": "Ninja", + "binaryDir": "./out/DebugPHP8.6ZTSCassandra", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_INSTALL_PREFIX": "./out/DebugPHP8.6ZTSCassandra/install", + "ENABLE_SANITIZERS": "ON", + "SANITIZE_UNDEFINED": "ON", + "SANITIZE_ADDRESS": "ON", + "PHP_SCYLLADB_BACKEND": "cassandra", + "PHP_VERSION_FOR_PHP_CONFIG": "8.6", + "LINK_LIBUV_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", + "PHP_THREAD_SAFE": "ON" + } + }, + { + "name": "DebugPHP8.6NTSCassandra", + "displayName": "DebugPHP8.6NTSCassandra", + "description": "", + "generator": "Ninja", + "binaryDir": "./out/DebugPHP8.6NTSCassandra", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_INSTALL_PREFIX": "./out/DebugPHP8.6NTSCassandra/install", + "ENABLE_SANITIZERS": "ON", + "SANITIZE_UNDEFINED": "ON", + "SANITIZE_ADDRESS": "ON", + "PHP_SCYLLADB_BACKEND": "cassandra", + "PHP_VERSION_FOR_PHP_CONFIG": "8.6", + "LINK_LIBUV_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", + "PHP_THREAD_SAFE": "OFF" + } + }, + { + "name": "DebugPHP8.6ZTSScyllaRust", + "displayName": "DebugPHP8.6ZTSScyllaRust", + "description": "", + "generator": "Ninja", + "binaryDir": "./out/DebugPHP8.6ZTSScyllaRust", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_INSTALL_PREFIX": "./out/DebugPHP8.6ZTSScyllaRust/install", + "ENABLE_SANITIZERS": "ON", + "SANITIZE_UNDEFINED": "ON", + "SANITIZE_ADDRESS": "ON", + "PHP_SCYLLADB_BACKEND": "scylla-rust", + "PHP_VERSION_FOR_PHP_CONFIG": "8.6", + "LINK_LIBUV_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", + "PHP_THREAD_SAFE": "ON" + } + }, + { + "name": "DebugPHP8.6NTSScyllaRust", + "displayName": "DebugPHP8.6NTSScyllaRust", + "description": "", + "generator": "Ninja", + "binaryDir": "./out/DebugPHP8.6NTSScyllaRust", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_INSTALL_PREFIX": "./out/DebugPHP8.6NTSScyllaRust/install", + "ENABLE_SANITIZERS": "ON", + "SANITIZE_UNDEFINED": "ON", + "SANITIZE_ADDRESS": "ON", + "PHP_SCYLLADB_BACKEND": "scylla-rust", + "PHP_VERSION_FOR_PHP_CONFIG": "8.6", + "LINK_LIBUV_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", + "PHP_THREAD_SAFE": "OFF" + } + }, + { + "name": "ReleasePHP8.6ZTS", + "displayName": "ReleasePHP8.6ZTS", + "description": "", + "generator": "Ninja", + "binaryDir": "./out/ReleasePHP8.6ZTS", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release", + "CMAKE_INSTALL_PREFIX": "./out/ReleasePHP8.6ZTS/install", + "ENABLE_SANITIZERS": "OFF", + "SANITIZE_UNDEFINED": "OFF", + "SANITIZE_ADDRESS": "OFF", + "PHP_SCYLLADB_BACKEND": "scylla-cpp", + "PHP_VERSION_FOR_PHP_CONFIG": "8.6", + "LINK_LIBUV_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", + "PHP_THREAD_SAFE": "ON" + } + }, + { + "name": "ReleasePHP8.6NTS", + "displayName": "ReleasePHP8.6NTS", + "description": "", + "generator": "Ninja", + "binaryDir": "./out/ReleasePHP8.6NTS", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release", + "CMAKE_INSTALL_PREFIX": "./out/ReleasePHP8.6NTS/install", + "ENABLE_SANITIZERS": "OFF", + "SANITIZE_UNDEFINED": "OFF", + "SANITIZE_ADDRESS": "OFF", + "PHP_SCYLLADB_BACKEND": "scylla-cpp", + "PHP_VERSION_FOR_PHP_CONFIG": "8.6", + "LINK_LIBUV_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", + "PHP_THREAD_SAFE": "OFF" + } + }, + { + "name": "ReleasePHP8.6ZTSCassandra", + "displayName": "ReleasePHP8.6ZTSCassandra", + "description": "", + "generator": "Ninja", + "binaryDir": "./out/ReleasePHP8.6ZTSCassandra", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release", + "CMAKE_INSTALL_PREFIX": "./out/ReleasePHP8.6ZTSCassandra/install", + "ENABLE_SANITIZERS": "OFF", + "SANITIZE_UNDEFINED": "OFF", + "SANITIZE_ADDRESS": "OFF", + "PHP_SCYLLADB_BACKEND": "cassandra", + "PHP_VERSION_FOR_PHP_CONFIG": "8.6", + "LINK_LIBUV_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", + "PHP_THREAD_SAFE": "ON" + } + }, + { + "name": "ReleasePHP8.6NTSCassandra", + "displayName": "ReleasePHP8.6NTSCassandra", + "description": "", + "generator": "Ninja", + "binaryDir": "./out/ReleasePHP8.6NTSCassandra", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release", + "CMAKE_INSTALL_PREFIX": "./out/ReleasePHP8.6NTSCassandra/install", + "ENABLE_SANITIZERS": "OFF", + "SANITIZE_UNDEFINED": "OFF", + "SANITIZE_ADDRESS": "OFF", + "PHP_SCYLLADB_BACKEND": "cassandra", + "PHP_VERSION_FOR_PHP_CONFIG": "8.6", + "LINK_LIBUV_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", + "PHP_THREAD_SAFE": "OFF" + } + }, + { + "name": "ReleasePHP8.6ZTSScyllaRust", + "displayName": "ReleasePHP8.6ZTSScyllaRust", + "description": "", + "generator": "Ninja", + "binaryDir": "./out/ReleasePHP8.6ZTSScyllaRust", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release", + "CMAKE_INSTALL_PREFIX": "./out/ReleasePHP8.6ZTSScyllaRust/install", + "ENABLE_SANITIZERS": "OFF", + "SANITIZE_UNDEFINED": "OFF", + "SANITIZE_ADDRESS": "OFF", + "PHP_SCYLLADB_BACKEND": "scylla-rust", + "PHP_VERSION_FOR_PHP_CONFIG": "8.6", + "LINK_LIBUV_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", + "PHP_THREAD_SAFE": "ON" + } + }, + { + "name": "ReleasePHP8.6NTSScyllaRust", + "displayName": "ReleasePHP8.6NTSScyllaRust", + "description": "", + "generator": "Ninja", + "binaryDir": "./out/ReleasePHP8.6NTSScyllaRust", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release", + "CMAKE_INSTALL_PREFIX": "./out/ReleasePHP8.6NTSScyllaRust/install", + "ENABLE_SANITIZERS": "OFF", + "SANITIZE_UNDEFINED": "OFF", + "SANITIZE_ADDRESS": "OFF", + "PHP_SCYLLADB_BACKEND": "scylla-rust", + "PHP_VERSION_FOR_PHP_CONFIG": "8.6", + "LINK_LIBUV_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", + "PHP_THREAD_SAFE": "OFF" + } + }, + { + "name": "RelWithDebInfoPHP8.6ZTS", + "displayName": "RelWithDebInfoPHP8.6ZTS", + "description": "", + "generator": "Ninja", + "binaryDir": "./out/RelWithDebInfoPHP8.6ZTS", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "RelWithDebInfo", + "CMAKE_INSTALL_PREFIX": "./out/RelWithDebInfoPHP8.6ZTS/install", + "ENABLE_SANITIZERS": "OFF", + "SANITIZE_UNDEFINED": "OFF", + "SANITIZE_ADDRESS": "OFF", + "PHP_SCYLLADB_BACKEND": "scylla-cpp", + "PHP_VERSION_FOR_PHP_CONFIG": "8.6", + "LINK_LIBUV_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", + "PHP_THREAD_SAFE": "ON" + } + }, + { + "name": "RelWithDebInfoPHP8.6NTS", + "displayName": "RelWithDebInfoPHP8.6NTS", + "description": "", + "generator": "Ninja", + "binaryDir": "./out/RelWithDebInfoPHP8.6NTS", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "RelWithDebInfo", + "CMAKE_INSTALL_PREFIX": "./out/RelWithDebInfoPHP8.6NTS/install", + "ENABLE_SANITIZERS": "OFF", + "SANITIZE_UNDEFINED": "OFF", + "SANITIZE_ADDRESS": "OFF", + "PHP_SCYLLADB_BACKEND": "scylla-cpp", + "PHP_VERSION_FOR_PHP_CONFIG": "8.6", + "LINK_LIBUV_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", + "PHP_THREAD_SAFE": "OFF" + } + }, + { + "name": "RelWithDebInfoPHP8.6ZTSCassandra", + "displayName": "RelWithDebInfoPHP8.6ZTSCassandra", + "description": "", + "generator": "Ninja", + "binaryDir": "./out/RelWithDebInfoPHP8.6ZTSCassandra", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "RelWithDebInfo", + "CMAKE_INSTALL_PREFIX": "./out/RelWithDebInfoPHP8.6ZTSCassandra/install", + "ENABLE_SANITIZERS": "OFF", + "SANITIZE_UNDEFINED": "OFF", + "SANITIZE_ADDRESS": "OFF", + "PHP_SCYLLADB_BACKEND": "cassandra", + "PHP_VERSION_FOR_PHP_CONFIG": "8.6", + "LINK_LIBUV_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", + "PHP_THREAD_SAFE": "ON" + } + }, + { + "name": "RelWithDebInfoPHP8.6NTSCassandra", + "displayName": "RelWithDebInfoPHP8.6NTSCassandra", + "description": "", + "generator": "Ninja", + "binaryDir": "./out/RelWithDebInfoPHP8.6NTSCassandra", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "RelWithDebInfo", + "CMAKE_INSTALL_PREFIX": "./out/RelWithDebInfoPHP8.6NTSCassandra/install", + "ENABLE_SANITIZERS": "OFF", + "SANITIZE_UNDEFINED": "OFF", + "SANITIZE_ADDRESS": "OFF", + "PHP_SCYLLADB_BACKEND": "cassandra", + "PHP_VERSION_FOR_PHP_CONFIG": "8.6", + "LINK_LIBUV_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", + "PHP_THREAD_SAFE": "OFF" + } + }, + { + "name": "RelWithDebInfoPHP8.6ZTSScyllaRust", + "displayName": "RelWithDebInfoPHP8.6ZTSScyllaRust", + "description": "", + "generator": "Ninja", + "binaryDir": "./out/RelWithDebInfoPHP8.6ZTSScyllaRust", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "RelWithDebInfo", + "CMAKE_INSTALL_PREFIX": "./out/RelWithDebInfoPHP8.6ZTSScyllaRust/install", + "ENABLE_SANITIZERS": "OFF", + "SANITIZE_UNDEFINED": "OFF", + "SANITIZE_ADDRESS": "OFF", + "PHP_SCYLLADB_BACKEND": "scylla-rust", + "PHP_VERSION_FOR_PHP_CONFIG": "8.6", + "LINK_LIBUV_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", + "PHP_THREAD_SAFE": "ON" + } + }, + { + "name": "RelWithDebInfoPHP8.6NTSScyllaRust", + "displayName": "RelWithDebInfoPHP8.6NTSScyllaRust", + "description": "", + "generator": "Ninja", + "binaryDir": "./out/RelWithDebInfoPHP8.6NTSScyllaRust", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "RelWithDebInfo", + "CMAKE_INSTALL_PREFIX": "./out/RelWithDebInfoPHP8.6NTSScyllaRust/install", + "ENABLE_SANITIZERS": "OFF", + "SANITIZE_UNDEFINED": "OFF", + "SANITIZE_ADDRESS": "OFF", + "PHP_SCYLLADB_BACKEND": "scylla-rust", + "PHP_VERSION_FOR_PHP_CONFIG": "8.6", + "LINK_LIBUV_STATIC": "ON", + "PHP_SCYLLADB_STATIC": "ON", "PHP_THREAD_SAFE": "OFF" } } diff --git a/generate-presets.php b/generate-presets.php index f5c02eb24..66a6563e1 100644 --- a/generate-presets.php +++ b/generate-presets.php @@ -14,6 +14,7 @@ enum PHPVersion: string case PHP83 = '8.3'; case PHP84 = '8.4'; case PHP85 = '8.5'; + case PHP86 = '8.6'; } enum PHPTS: string diff --git a/include/php_scylladb_object.h b/include/php_scylladb_object.h index e68d93a03..db2268027 100644 --- a/include/php_scylladb_object.h +++ b/include/php_scylladb_object.h @@ -11,7 +11,7 @@ * Recover a pointer to the user struct from the embedded zend_object*. * * PHP_SCYLLADB_OBJ_ALLOCATE(T, ce, handlers): - * Allocate a user struct (size = sizeof(T), offset = XtOffsetOf(T, zendObject)), + * Allocate a user struct (size = sizeof(T), offset = offsetof(T, zendObject)), * zero-init the user-fields prefix, call zend_object_std_init / * object_properties_init on the embedded zend_object, and wire its * handlers. Returns the user struct. @@ -20,7 +20,7 @@ #include #define PHP_SCYLLADB_OBJ_FETCH(T, obj) \ - ((T *)((char *)(obj) - XtOffsetOf(T, zendObject))) + ((T *)((char *)(obj) - offsetof(T, zendObject))) [[nodiscard]] static zend_always_inline void *php_scylladb_obj_allocate( size_t size, size_t obj_offset, zend_class_entry *ce, void *handlers) @@ -56,4 +56,4 @@ } #define PHP_SCYLLADB_OBJ_ALLOCATE(T, ce, handlers) \ - ((T *)php_scylladb_obj_allocate(sizeof(T), XtOffsetOf(T, zendObject), (ce), (handlers))) + ((T *)php_scylladb_obj_allocate(sizeof(T), offsetof(T, zendObject), (ce), (handlers))) diff --git a/scripts/compile-php.sh b/scripts/compile-php.sh index c56427db9..7c88558fb 100755 --- a/scripts/compile-php.sh +++ b/scripts/compile-php.sh @@ -154,9 +154,15 @@ CONFIG_ARGS=( --enable-sockets --enable-mbstring --disable-short-tags - --with-pic ) +# PHP 8.6 renamed --with-pic to --enable-pic; the old spelling now hard-errors. +if [[ "$(printf '%s\n8.6\n' "$PHP_VERSION" | sort -V | head -1)" == "8.6" ]]; then + CONFIG_ARGS+=(--enable-pic) +else + CONFIG_ARGS+=(--with-pic) +fi + if [[ "$(uname -s)" == "Darwin" ]] && command -v brew >/dev/null 2>&1; then BREW_PREFIX="$(brew --prefix)" [[ -d "$BREW_PREFIX/opt/libiconv" ]] && CONFIG_ARGS+=(--with-iconv="$BREW_PREFIX/opt/libiconv") diff --git a/src/Blob.c b/src/Blob.c index c8de79ae0..dc6af3ab0 100644 --- a/src/Blob.c +++ b/src/Blob.c @@ -202,5 +202,5 @@ zend_object* php_scylladb_blob_new(zend_class_entry *ce) { void php_scylladb_blob_post_register([[maybe_unused]] zend_class_entry *ce) { - php_scylladb_blob_handlers.std.offset = XtOffsetOf(php_scylladb_blob, zendObject); + php_scylladb_blob_handlers.std.offset = offsetof(php_scylladb_blob, zendObject); } diff --git a/src/Collection.c b/src/Collection.c index e8c053a2e..c01376b3b 100644 --- a/src/Collection.c +++ b/src/Collection.c @@ -410,7 +410,7 @@ php_scylladb_collection_new(zend_class_entry *ce) self->dirty = 1; ZVAL_UNDEF(&self->type); - php_scylladb_collection_handlers.std.offset = XtOffsetOf(php_scylladb_collection, zendObject); + php_scylladb_collection_handlers.std.offset = offsetof(php_scylladb_collection, zendObject); php_scylladb_collection_handlers.std.free_obj = php_scylladb_collection_free; return &self->zendObject; } @@ -418,5 +418,5 @@ php_scylladb_collection_new(zend_class_entry *ce) void php_scylladb_collection_post_register([[maybe_unused]] zend_class_entry *ce) { - php_scylladb_collection_handlers.std.offset = XtOffsetOf(php_scylladb_collection, zendObject); + php_scylladb_collection_handlers.std.offset = offsetof(php_scylladb_collection, zendObject); } diff --git a/src/Database/DefaultAggregate.c b/src/Database/DefaultAggregate.c index 7cb861ca0..8dc42337f 100644 --- a/src/Database/DefaultAggregate.c +++ b/src/Database/DefaultAggregate.c @@ -263,7 +263,7 @@ php_scylladb_default_aggregate_new(zend_class_entry *ce ) ZVAL_UNDEF(&self->schema); self->meta = nullptr; - php_scylladb_default_aggregate_handlers.offset = XtOffsetOf(php_scylladb_aggregate, zendObject); + php_scylladb_default_aggregate_handlers.offset = offsetof(php_scylladb_aggregate, zendObject); php_scylladb_default_aggregate_handlers.free_obj = php_scylladb_default_aggregate_free; return &self->zendObject; } diff --git a/src/Database/DefaultColumn.c b/src/Database/DefaultColumn.c index 73f11be21..e842d6417 100644 --- a/src/Database/DefaultColumn.c +++ b/src/Database/DefaultColumn.c @@ -260,7 +260,7 @@ php_scylladb_default_column_new(zend_class_entry *ce ) ZVAL_UNDEF(&self->name); ZVAL_UNDEF(&self->type); - php_scylladb_default_column_handlers.offset = XtOffsetOf(php_scylladb_column, zendObject); + php_scylladb_default_column_handlers.offset = offsetof(php_scylladb_column, zendObject); php_scylladb_default_column_handlers.free_obj = php_scylladb_default_column_free; return &self->zendObject; } diff --git a/src/Database/DefaultFunction.c b/src/Database/DefaultFunction.c index e9f4ca2fd..92c29795c 100644 --- a/src/Database/DefaultFunction.c +++ b/src/Database/DefaultFunction.c @@ -250,7 +250,7 @@ php_scylladb_default_function_new(zend_class_entry *ce ) ZVAL_UNDEF(&self->schema); self->meta = nullptr; - php_scylladb_default_function_handlers.offset = XtOffsetOf(php_scylladb_function, zendObject); + php_scylladb_default_function_handlers.offset = offsetof(php_scylladb_function, zendObject); php_scylladb_default_function_handlers.free_obj = php_scylladb_default_function_free; return &self->zendObject; } diff --git a/src/Database/DefaultIndex.c b/src/Database/DefaultIndex.c index a7cb57a00..0c07ef828 100644 --- a/src/Database/DefaultIndex.c +++ b/src/Database/DefaultIndex.c @@ -267,7 +267,7 @@ php_scylladb_default_index_new(zend_class_entry *ce ) ZVAL_UNDEF(&self->schema); self->meta = nullptr; - php_scylladb_default_index_handlers.offset = XtOffsetOf(php_scylladb_index, zendObject); + php_scylladb_default_index_handlers.offset = offsetof(php_scylladb_index, zendObject); php_scylladb_default_index_handlers.free_obj = php_scylladb_default_index_free; return &self->zendObject; } diff --git a/src/Database/DefaultKeyspace.c b/src/Database/DefaultKeyspace.c index 323fd9490..d45b60cdc 100644 --- a/src/Database/DefaultKeyspace.c +++ b/src/Database/DefaultKeyspace.c @@ -468,7 +468,7 @@ zend_object* php_scylladb_default_keyspace_new(zend_class_entry *ce) { self->meta = nullptr; ZVAL_UNDEF(&self->schema); - php_scylladb_default_keyspace_handlers.offset = XtOffsetOf(php_scylladb_keyspace, zendObject); + php_scylladb_default_keyspace_handlers.offset = offsetof(php_scylladb_keyspace, zendObject); php_scylladb_default_keyspace_handlers.free_obj = php_scylladb_default_keyspace_free; return &self->zendObject; } diff --git a/src/Database/DefaultMaterializedView.c b/src/Database/DefaultMaterializedView.c index f3df01011..fefdb9d57 100644 --- a/src/Database/DefaultMaterializedView.c +++ b/src/Database/DefaultMaterializedView.c @@ -595,7 +595,7 @@ php_scylladb_default_materialized_view_new(zend_class_entry *ce ) self->meta = nullptr; ZVAL_UNDEF(&self->schema); - php_scylladb_default_materialized_view_handlers.offset = XtOffsetOf(php_scylladb_materialized_view, zendObject); + php_scylladb_default_materialized_view_handlers.offset = offsetof(php_scylladb_materialized_view, zendObject); php_scylladb_default_materialized_view_handlers.free_obj = php_scylladb_default_materialized_view_free; return &self->zendObject; } diff --git a/src/Database/DefaultSchema.c b/src/Database/DefaultSchema.c index 4b23e43dd..1b0947e39 100644 --- a/src/Database/DefaultSchema.c +++ b/src/Database/DefaultSchema.c @@ -133,7 +133,7 @@ php_scylladb_default_schema_new(zend_class_entry *ce ) self->schema_meta = nullptr; - php_scylladb_default_schema_handlers.offset = XtOffsetOf(php_scylladb_schema, zendObject); + php_scylladb_default_schema_handlers.offset = offsetof(php_scylladb_schema, zendObject); php_scylladb_default_schema_handlers.free_obj = php_scylladb_default_schema_free; return &self->zendObject; } diff --git a/src/Database/DefaultTable.c b/src/Database/DefaultTable.c index 9e8c3e88b..7be213ced 100644 --- a/src/Database/DefaultTable.c +++ b/src/Database/DefaultTable.c @@ -691,7 +691,7 @@ php_scylladb_default_table_new(zend_class_entry *ce ) self->meta = nullptr; ZVAL_UNDEF(&self->schema); - php_scylladb_default_table_handlers.offset = XtOffsetOf(php_scylladb_table, zendObject); + php_scylladb_default_table_handlers.offset = offsetof(php_scylladb_table, zendObject); php_scylladb_default_table_handlers.free_obj = php_scylladb_default_table_free; return &self->zendObject; } diff --git a/src/Database/Rows.c b/src/Database/Rows.c index 7f2f4e5c7..6908fad9d 100644 --- a/src/Database/Rows.c +++ b/src/Database/Rows.c @@ -457,7 +457,7 @@ zend_object *php_scylladb_rows_new(zend_class_entry *ce) ZVAL_UNDEF(&self->next_rows); ZVAL_UNDEF(&self->future_next_page); - php_scylladb_rows_handlers.offset = XtOffsetOf(php_scylladb_rows, zendObject); + php_scylladb_rows_handlers.offset = offsetof(php_scylladb_rows, zendObject); php_scylladb_rows_handlers.free_obj = php_scylladb_rows_free; return &self->zendObject; } diff --git a/src/DateTime/Date.c b/src/DateTime/Date.c index 326f7bd89..1d5b14f4b 100644 --- a/src/DateTime/Date.c +++ b/src/DateTime/Date.c @@ -235,5 +235,5 @@ zend_object *php_scylladb_date_new(zend_class_entry *ce) { void php_scylladb_date_post_register([[maybe_unused]] zend_class_entry *ce) { - php_scylladb_date_handlers.std.offset = XtOffsetOf(php_scylladb_date, zendObject); + php_scylladb_date_handlers.std.offset = offsetof(php_scylladb_date, zendObject); } diff --git a/src/DateTime/Duration.c b/src/DateTime/Duration.c index a51545d0d..1fdac16ef 100644 --- a/src/DateTime/Duration.c +++ b/src/DateTime/Duration.c @@ -302,5 +302,5 @@ php_scylladb_duration_new(zend_class_entry *ce ) void php_scylladb_duration_post_register([[maybe_unused]] zend_class_entry *ce) { - php_scylladb_duration_handlers.std.offset = XtOffsetOf(php_scylladb_duration, zendObject); + php_scylladb_duration_handlers.std.offset = offsetof(php_scylladb_duration, zendObject); } diff --git a/src/DateTime/Time.c b/src/DateTime/Time.c index ba9195a98..b82c154a8 100644 --- a/src/DateTime/Time.c +++ b/src/DateTime/Time.c @@ -229,5 +229,5 @@ zend_object *php_scylladb_time_new(zend_class_entry *ce) { void php_scylladb_time_post_register([[maybe_unused]] zend_class_entry *ce) { - php_scylladb_time_handlers.std.offset = XtOffsetOf(php_scylladb_time, zendObject); + php_scylladb_time_handlers.std.offset = offsetof(php_scylladb_time, zendObject); } diff --git a/src/DateTime/Timestamp.c b/src/DateTime/Timestamp.c index 51a57ec7e..6e64be68e 100644 --- a/src/DateTime/Timestamp.c +++ b/src/DateTime/Timestamp.c @@ -292,5 +292,5 @@ zend_object *php_scylladb_timestamp_new(zend_class_entry *ce) { void php_scylladb_timestamp_post_register([[maybe_unused]] zend_class_entry *ce) { - php_scylladb_timestamp_handlers.std.offset = XtOffsetOf(php_scylladb_timestamp, zendObject); + php_scylladb_timestamp_handlers.std.offset = offsetof(php_scylladb_timestamp, zendObject); } diff --git a/src/DateTime/Timeuuid.c b/src/DateTime/Timeuuid.c index a71b1411a..9caf68822 100644 --- a/src/DateTime/Timeuuid.c +++ b/src/DateTime/Timeuuid.c @@ -199,7 +199,7 @@ zend_object* php_scylladb_timeuuid_new(zend_class_entry *ce) { php_scylladb_uuid *self = PHP_SCYLLADB_OBJ_ALLOCATE(php_scylladb_uuid, ce, &php_scylladb_timeuuid_handlers); - php_scylladb_timeuuid_handlers.std.offset = XtOffsetOf(php_scylladb_uuid, zendObject); + php_scylladb_timeuuid_handlers.std.offset = offsetof(php_scylladb_uuid, zendObject); php_scylladb_timeuuid_handlers.std.free_obj = php_scylladb_timeuuid_free; return &self->zendObject; } @@ -207,5 +207,5 @@ zend_object* php_scylladb_timeuuid_new(zend_class_entry *ce) { void php_scylladb_timeuuid_post_register([[maybe_unused]] zend_class_entry *ce) { - php_scylladb_timeuuid_handlers.std.offset = XtOffsetOf(php_scylladb_uuid, zendObject); + php_scylladb_timeuuid_handlers.std.offset = offsetof(php_scylladb_uuid, zendObject); } diff --git a/src/Inet.c b/src/Inet.c index aec529987..4a82b7af4 100644 --- a/src/Inet.c +++ b/src/Inet.c @@ -170,5 +170,5 @@ php_scylladb_inet_new(zend_class_entry *ce) void php_scylladb_inet_post_register([[maybe_unused]] zend_class_entry *ce) { - php_scylladb_inet_handlers.std.offset = XtOffsetOf(php_scylladb_inet, zendObject); + php_scylladb_inet_handlers.std.offset = offsetof(php_scylladb_inet, zendObject); } diff --git a/src/Map.c b/src/Map.c index 2b22ff7c3..e2052e6d1 100644 --- a/src/Map.c +++ b/src/Map.c @@ -565,7 +565,7 @@ php_scylladb_map_new(zend_class_entry *ce) self->dirty = 1; ZVAL_UNDEF(&self->type); - php_scylladb_map_handlers.std.offset = XtOffsetOf(php_scylladb_map, zendObject); + php_scylladb_map_handlers.std.offset = offsetof(php_scylladb_map, zendObject); php_scylladb_map_handlers.std.free_obj = php_scylladb_map_free; return &self->zendObject; } @@ -573,5 +573,5 @@ php_scylladb_map_new(zend_class_entry *ce) void php_scylladb_map_post_register([[maybe_unused]] zend_class_entry *ce) { - php_scylladb_map_handlers.std.offset = XtOffsetOf(php_scylladb_map, zendObject); + php_scylladb_map_handlers.std.offset = offsetof(php_scylladb_map, zendObject); } diff --git a/src/Numbers/Bigint.c b/src/Numbers/Bigint.c index 1752ec9cd..a9effdc13 100644 --- a/src/Numbers/Bigint.c +++ b/src/Numbers/Bigint.c @@ -517,5 +517,5 @@ zend_object* php_scylladb_bigint_new(zend_class_entry *ce) void php_scylladb_bigint_post_register([[maybe_unused]] zend_class_entry *ce) { - php_scylladb_bigint_handlers.std.offset = XtOffsetOf(php_scylladb_numeric, zendObject); + php_scylladb_bigint_handlers.std.offset = offsetof(php_scylladb_numeric, zendObject); } diff --git a/src/Numbers/Decimal.c b/src/Numbers/Decimal.c index 0f8bf2e8d..3f9b70af3 100644 --- a/src/Numbers/Decimal.c +++ b/src/Numbers/Decimal.c @@ -653,5 +653,5 @@ zend_object* php_scylladb_decimal_new(zend_class_entry *ce) void php_scylladb_decimal_post_register([[maybe_unused]] zend_class_entry *ce) { - php_scylladb_decimal_handlers.std.offset = XtOffsetOf(php_scylladb_numeric, zendObject); + php_scylladb_decimal_handlers.std.offset = offsetof(php_scylladb_numeric, zendObject); } diff --git a/src/Numbers/Float.c b/src/Numbers/Float.c index 810a4331b..7e125336d 100644 --- a/src/Numbers/Float.c +++ b/src/Numbers/Float.c @@ -487,5 +487,5 @@ php_scylladb_float_new(zend_class_entry *ce ) void php_scylladb_float_post_register([[maybe_unused]] zend_class_entry *ce) { - php_scylladb_float_handlers.std.offset = XtOffsetOf(php_scylladb_numeric, zendObject); + php_scylladb_float_handlers.std.offset = offsetof(php_scylladb_numeric, zendObject); } diff --git a/src/Numbers/Smallint.c b/src/Numbers/Smallint.c index 76e4a995f..e7482ea33 100644 --- a/src/Numbers/Smallint.c +++ b/src/Numbers/Smallint.c @@ -555,5 +555,5 @@ zend_object* php_scylladb_smallint_new(zend_class_entry *ce ) void php_scylladb_smallint_post_register([[maybe_unused]] zend_class_entry *ce) { - php_scylladb_smallint_handlers.std.offset = XtOffsetOf(php_scylladb_numeric, zendObject); + php_scylladb_smallint_handlers.std.offset = offsetof(php_scylladb_numeric, zendObject); } diff --git a/src/Numbers/Tinyint.c b/src/Numbers/Tinyint.c index 18d050bd9..7f3fbf835 100644 --- a/src/Numbers/Tinyint.c +++ b/src/Numbers/Tinyint.c @@ -553,5 +553,5 @@ zend_object* php_scylladb_tinyint_new(zend_class_entry *ce ) void php_scylladb_tinyint_post_register([[maybe_unused]] zend_class_entry *ce) { - php_scylladb_tinyint_handlers.std.offset = XtOffsetOf(php_scylladb_numeric, zendObject); + php_scylladb_tinyint_handlers.std.offset = offsetof(php_scylladb_numeric, zendObject); } diff --git a/src/Numbers/Varint.c b/src/Numbers/Varint.c index a960ff514..f2d058670 100644 --- a/src/Numbers/Varint.c +++ b/src/Numbers/Varint.c @@ -500,5 +500,5 @@ zend_object* php_scylladb_varint_new(zend_class_entry *ce ) void php_scylladb_varint_post_register([[maybe_unused]] zend_class_entry *ce) { - php_scylladb_varint_handlers.std.offset = XtOffsetOf(php_scylladb_numeric, zendObject); + php_scylladb_varint_handlers.std.offset = offsetof(php_scylladb_numeric, zendObject); } diff --git a/src/Set.c b/src/Set.c index 32553f839..82d5fa4ac 100644 --- a/src/Set.c +++ b/src/Set.c @@ -407,12 +407,12 @@ php_scylladb_set_new(zend_class_entry* ce) self->dirty = 1; ZVAL_UNDEF(&self->type); - php_scylladb_set_handlers.std.offset = XtOffsetOf(php_scylladb_set, zendObject); + php_scylladb_set_handlers.std.offset = offsetof(php_scylladb_set, zendObject); php_scylladb_set_handlers.std.free_obj = php_scylladb_set_free; return &self->zendObject; } void php_scylladb_set_post_register([[maybe_unused]] zend_class_entry *ce) { - php_scylladb_set_handlers.std.offset = XtOffsetOf(php_scylladb_set, zendObject); + php_scylladb_set_handlers.std.offset = offsetof(php_scylladb_set, zendObject); } diff --git a/src/TimestampGenerator/Monotonic.c b/src/TimestampGenerator/Monotonic.c index 4d49f3a3e..88c6945a8 100644 --- a/src/TimestampGenerator/Monotonic.c +++ b/src/TimestampGenerator/Monotonic.c @@ -45,5 +45,5 @@ php_scylladb_timestamp_generator_monotonic_new(zend_class_entry *ce) void php_scylladb_timestamp_generator_monotonic_post_register([[maybe_unused]] zend_class_entry *ce) { - php_scylladb_timestamp_generator_monotonic_handlers.offset = XtOffsetOf(php_scylladb_timestamp_gen, zendObject); + php_scylladb_timestamp_generator_monotonic_handlers.offset = offsetof(php_scylladb_timestamp_gen, zendObject); } diff --git a/src/TimestampGenerator/ServerSide.c b/src/TimestampGenerator/ServerSide.c index b4fb48071..6f7c5291f 100644 --- a/src/TimestampGenerator/ServerSide.c +++ b/src/TimestampGenerator/ServerSide.c @@ -45,5 +45,5 @@ php_scylladb_timestamp_generator_server_side_new(zend_class_entry *ce) void php_scylladb_timestamp_generator_server_side_post_register([[maybe_unused]] zend_class_entry *ce) { - php_scylladb_timestamp_generator_server_side_handlers.offset = XtOffsetOf(php_scylladb_timestamp_gen, zendObject); + php_scylladb_timestamp_generator_server_side_handlers.offset = offsetof(php_scylladb_timestamp_gen, zendObject); } diff --git a/src/Tuple.c b/src/Tuple.c index 00a3cf423..de0a0f76a 100644 --- a/src/Tuple.c +++ b/src/Tuple.c @@ -389,7 +389,7 @@ php_scylladb_tuple_new(zend_class_entry *ce) self->dirty = 1; ZVAL_UNDEF(&self->type); - php_scylladb_tuple_handlers.std.offset = XtOffsetOf(php_scylladb_tuple, zendObject); + php_scylladb_tuple_handlers.std.offset = offsetof(php_scylladb_tuple, zendObject); php_scylladb_tuple_handlers.std.free_obj = php_scylladb_tuple_free; return &self->zendObject; } @@ -397,5 +397,5 @@ php_scylladb_tuple_new(zend_class_entry *ce) void php_scylladb_tuple_post_register([[maybe_unused]] zend_class_entry *ce) { - php_scylladb_tuple_handlers.std.offset = XtOffsetOf(php_scylladb_tuple, zendObject); + php_scylladb_tuple_handlers.std.offset = offsetof(php_scylladb_tuple, zendObject); } diff --git a/src/Type/Collection.c b/src/Type/Collection.c index 6c89f59b1..c80a2cdad 100644 --- a/src/Type/Collection.c +++ b/src/Type/Collection.c @@ -167,7 +167,7 @@ zend_object* php_scylladb_type_collection_new( self->data_type = cass_data_type_new(self->type); ZVAL_UNDEF(&self->data.collection.value_type); - php_scylladb_type_collection_handlers.offset = XtOffsetOf(php_scylladb_type, zendObject); + php_scylladb_type_collection_handlers.offset = offsetof(php_scylladb_type, zendObject); php_scylladb_type_collection_handlers.free_obj = php_scylladb_type_collection_free; return &self->zendObject; } diff --git a/src/Type/Custom.c b/src/Type/Custom.c index 77aec18fc..5ee055c49 100644 --- a/src/Type/Custom.c +++ b/src/Type/Custom.c @@ -116,7 +116,7 @@ zend_object *php_scylladb_type_custom_new(zend_class_entry *ce) { self->data_type = cass_data_type_new(self->type); self->data.custom.class_name = nullptr; - php_scylladb_type_custom_handlers.offset = XtOffsetOf(php_scylladb_type, zendObject); + php_scylladb_type_custom_handlers.offset = offsetof(php_scylladb_type, zendObject); php_scylladb_type_custom_handlers.free_obj = php_scylladb_type_custom_free; return &self->zendObject; } diff --git a/src/Type/Map.c b/src/Type/Map.c index 6db506f63..f8687892c 100644 --- a/src/Type/Map.c +++ b/src/Type/Map.c @@ -203,7 +203,7 @@ php_scylladb_type_map_new(zend_class_entry *ce ) ZVAL_UNDEF(&self->data.map.key_type); ZVAL_UNDEF(&self->data.map.value_type); - php_scylladb_type_map_handlers.offset = XtOffsetOf(php_scylladb_type, zendObject); + php_scylladb_type_map_handlers.offset = offsetof(php_scylladb_type, zendObject); php_scylladb_type_map_handlers.free_obj = php_scylladb_type_map_free; return &self->zendObject; } diff --git a/src/Type/Scalar.c b/src/Type/Scalar.c index f93ef005d..9cedea104 100644 --- a/src/Type/Scalar.c +++ b/src/Type/Scalar.c @@ -116,7 +116,7 @@ zend_object* php_scylladb_type_scalar_new(zend_class_entry *ce) { self->type = CASS_VALUE_TYPE_UNKNOWN; self->data_type = nullptr; - php_scylladb_type_scalar_handlers.offset = XtOffsetOf(php_scylladb_type, zendObject); + php_scylladb_type_scalar_handlers.offset = offsetof(php_scylladb_type, zendObject); php_scylladb_type_scalar_handlers.free_obj = php_scylladb_type_scalar_free; return &self->zendObject; } diff --git a/src/Type/Set.c b/src/Type/Set.c index e4c169f93..cf6868e9c 100644 --- a/src/Type/Set.c +++ b/src/Type/Set.c @@ -176,7 +176,7 @@ php_scylladb_type_set_new(zend_class_entry *ce ) self->data_type = cass_data_type_new(self->type); ZVAL_UNDEF(&self->data.set.value_type); - php_scylladb_type_set_handlers.offset = XtOffsetOf(php_scylladb_type, zendObject); + php_scylladb_type_set_handlers.offset = offsetof(php_scylladb_type, zendObject); php_scylladb_type_set_handlers.free_obj = php_scylladb_type_set_free; return &self->zendObject; } diff --git a/src/Type/Tuple.c b/src/Type/Tuple.c index 4ee752e5d..22254af26 100644 --- a/src/Type/Tuple.c +++ b/src/Type/Tuple.c @@ -218,7 +218,7 @@ php_scylladb_type_tuple_new(zend_class_entry* ce ) self->data_type = cass_data_type_new(self->type); zend_hash_init(&self->data.tuple.types, 0, nullptr, ZVAL_PTR_DTOR, 0); - php_scylladb_type_tuple_handlers.offset = XtOffsetOf(php_scylladb_type, zendObject); + php_scylladb_type_tuple_handlers.offset = offsetof(php_scylladb_type, zendObject); php_scylladb_type_tuple_handlers.free_obj = php_scylladb_type_tuple_free; return &self->zendObject; } diff --git a/src/Type/UserType.c b/src/Type/UserType.c index 668b1ed76..afe4a33ab 100644 --- a/src/Type/UserType.c +++ b/src/Type/UserType.c @@ -308,7 +308,7 @@ php_scylladb_type_user_type_new(zend_class_entry *ce ) self->data.udt.keyspace = self->data.udt.type_name = nullptr; zend_hash_init(&self->data.udt.types, 0, nullptr, ZVAL_PTR_DTOR, 0); - php_scylladb_type_user_type_handlers.offset = XtOffsetOf(php_scylladb_type, zendObject); + php_scylladb_type_user_type_handlers.offset = offsetof(php_scylladb_type, zendObject); php_scylladb_type_user_type_handlers.free_obj = php_scylladb_type_user_type_free; return &self->zendObject; } diff --git a/src/Type/ValueHash.c b/src/Type/ValueHash.c index abf1959bf..7f871df28 100644 --- a/src/Type/ValueHash.c +++ b/src/Type/ValueHash.c @@ -97,7 +97,10 @@ php_scylladb_value_compare(zval* zvalue1, zval* zvalue2) case IS_FALSE: return Z_TYPE_P(zvalue2) == IS_FALSE ? 0 : -1; case IS_STRING: - return zend_binary_zval_strcmp(zvalue1, zvalue2); + return zend_binary_strcmp(Z_STRVAL_P(zvalue1), + Z_STRLEN_P(zvalue1), + Z_STRVAL_P(zvalue2), + Z_STRLEN_P(zvalue2)); case IS_OBJECT: return Z_OBJ_P(zvalue1)->handlers->compare(zvalue1, zvalue2); default: diff --git a/src/UserTypeValue.c b/src/UserTypeValue.c index 31d314752..81a82b41f 100644 --- a/src/UserTypeValue.c +++ b/src/UserTypeValue.c @@ -404,7 +404,7 @@ php_scylladb_user_type_value_new(zend_class_entry *ce) self->dirty = 1; ZVAL_UNDEF(&self->type); - php_scylladb_user_type_value_handlers.std.offset = XtOffsetOf(php_scylladb_user_type_value, zendObject); + php_scylladb_user_type_value_handlers.std.offset = offsetof(php_scylladb_user_type_value, zendObject); php_scylladb_user_type_value_handlers.std.free_obj = php_scylladb_user_type_value_free; return &self->zendObject; } @@ -412,5 +412,5 @@ php_scylladb_user_type_value_new(zend_class_entry *ce) void php_scylladb_user_type_value_post_register([[maybe_unused]] zend_class_entry *ce) { - php_scylladb_user_type_value_handlers.std.offset = XtOffsetOf(php_scylladb_user_type_value, zendObject); + php_scylladb_user_type_value_handlers.std.offset = offsetof(php_scylladb_user_type_value, zendObject); } diff --git a/src/Uuid.c b/src/Uuid.c index db640d11f..a51915c5e 100644 --- a/src/Uuid.c +++ b/src/Uuid.c @@ -210,5 +210,5 @@ php_scylladb_uuid_new(zend_class_entry *ce) void php_scylladb_uuid_post_register([[maybe_unused]] zend_class_entry *ce) { - php_scylladb_uuid_handlers.std.offset = XtOffsetOf(php_scylladb_uuid, zendObject); + php_scylladb_uuid_handlers.std.offset = offsetof(php_scylladb_uuid, zendObject); } diff --git a/tools/gen_descriptor/gen_class_descriptor.php b/tools/gen_descriptor/gen_class_descriptor.php index f98ab743b..de449ced3 100644 --- a/tools/gen_descriptor/gen_class_descriptor.php +++ b/tools/gen_descriptor/gen_class_descriptor.php @@ -441,7 +441,7 @@ function emit_class_descriptor(array $cls): array $handlerWiring = " memcpy(&$handlersVar$stdAccess, zend_get_std_object_handlers(), sizeof(zend_object_handlers));\n"; if (!empty($cls['struct'])) { $struct = $cls['struct']; - $handlerWiring .= " $handlersVar$stdAccess.offset = XtOffsetOf($struct, zendObject);\n"; + $handlerWiring .= " $handlersVar$stdAccess.offset = offsetof($struct, zendObject);\n"; } $handlerWiring .= " if (&php_scylladb_{$snake}_free) $handlersVar$stdAccess.free_obj = php_scylladb_{$snake}_free;\n"; $handlerWiring .= " if (&php_scylladb_{$snake}_properties) $handlersVar$stdAccess.get_properties = php_scylladb_{$snake}_properties;\n";