Refactor/stage2 macro purge

.claude/settings.json

@@ -18,7 +18,8 @@
       "Skill(php-development)",
       "Skill(php-expert)",
       "Skill(cmake-review)",
-      "Bash(pie build *)"
+      "Bash(pie build *)",
+      "Bash(git *)"
     ]
   }
 }

.gitignore

@@ -1,4 +1,6 @@
 # Directories to ignore
+.claude/worktrees
+.claude/scheduled_tasks.lock
 /.idea/
 /.vagrant/
 /bin/
@@ -57,4 +59,4 @@ cassandra.log
 /**/.idea/
 php-old/
 target/
-docker/scylladb/certs/
+docker/scylladb/certs/

docs/plans/REFACTORING_PLAN.md

@@ -48,9 +48,15 @@ Stage 3 in the full plan. Bigger commitment; gates Stage 4.
 
 ### Round D — Universal stub coverage (target: v1.5.0 or v1.6.0)
 
-Stage 3.5 in the full plan. **86 classes total, 14 done, 72 to go.** Order:
-
-- [ ] Round A foundational (12 classes): `Cassandra` facade, `Value`, `Numeric`, `UuidInterface`, `Uuid`, `Inet`, `Blob`, `Duration`, `Bigint`, `Smallint`, `Tinyint`, `Float`, `Decimal`, `Varint`, `Custom`.
+Stage 3.5 in the full plan. **86 classes total, 27 done, 59 to go.** Order:
+
+- [x] Round A foundational: `Value` (interface), `Numeric` (interface), `UuidInterface` (interface), `Uuid`, `Blob`, `Inet`, `Duration`, `Bigint`, `Smallint`, `Tinyint`, `Float`, `Decimal`, `Varint`, `Timeuuid` (wired). All stubs strictly typed (concrete return types, `static` for fluent/factory, `int|float|string|T` constructors). Done on `refactor/stage2-macro-purge`.
+- [x] Round B Type system: `Type`, `Type\Scalar`, `Type\Collection`, `Type\Set`, `Type\Map`, `Type\Tuple`, `Type\UserType`, `Type\Custom`. Strictly typed. Done on `refactor/stage2-macro-purge`.
+- [x] Round C Collections: `Collection`, `Set`, `Map`, `Tuple`, `UserTypeValue`. Constructor types tightened (`Type|string`); `key()` typed as `int` or `string` per implementation. Done on `refactor/stage2-macro-purge`.
+- [x] Round F TimestampGenerator: `TimestampGenerator` (interface), `Monotonic`, `ServerSide`. Done on `refactor/stage2-macro-purge`.
+- [x] Round G Exceptions: all 25 exception classes consolidated into `exceptions.stub.php`. Done on `refactor/stage2-macro-purge`.
+- [ ] Round D Database surface: `Session`, `DefaultSession`, `SimpleStatement`, `PreparedStatement`, `BatchStatement`, `ExecutionOptions`, `Future*`, `Rows`.
+- [ ] Round E Schema metadata: `Schema`, `Keyspace`, `Table`, `Column`, `Index`, `MaterializedView`, `Function`, `Aggregate` classes.
 - [ ] Round B Type system (8 classes): `Type`, `Type\{Scalar,Collection,Set,Map,Tuple,UserType,Custom}`.
 - [ ] Round C Collections (5 classes): `Collection`, `Set`, `Map`, `Tuple`, `UserTypeValue`.
 - [ ] Round D Database (14 classes): `Session`, `DefaultSession`, `Statement`, `SimpleStatement`, `PreparedStatement`, `BatchStatement`, `ExecutionOptions`, `Future`, `FutureClose`, `FuturePreparedStatement`, `FutureRows`, `FutureSession`, `FutureValue`, `Rows`.
@@ -72,11 +78,11 @@ Stage 3.6 in the full plan. **107 `zend_parse_parameters` callsites across 37 fi
 
 Stage 2 in the full plan. Previously attempted as a flat sweep (PR #122 wave-1) and reverted because it caused collection/UDT round-trip regressions and a buffer overflow. Redo *module-by-module alongside Round D's stub work*.
 
-- [ ] Round 1 — pure renames (6 macros, 22 callsites): `PHP5TO7_SMART_STR_VAL/LEN`, `PHP_SCYLLADB_Z_IS_*`, `PHP5TO7_ADD_NEXT_INDEX_STRING`. Lowest risk; can ship standalone.
-- [ ] Round 2 — hashtable iteration (8 macros, ~188 callsites): `PHP5TO7_ZEND_HASH_FOREACH_*`, `GET_CURRENT_*`. Medium risk — the `STR_KEY_VAL` `char*` ↔ `zend_string*` adaptation is the historical landmine. Must include round-trip tests for Collection/Map/Set/UDT in CI before merging.
-- [ ] Round 3 — hashtable mutation (11 macros, ~161 callsites): `PHP5TO7_ZEND_HASH_FIND/EXISTS/UPDATE/ADD/DEL/INDEX_*`, `ADD_ASSOC_*`, `ZVAL_COPY`.
-- [ ] Round 4 — zval lifecycle (1 macro, 58 callsites): `PHP5TO7_ZVAL_MAYBE_DESTROY`. Drop the `do { … } while (0)` wrapper since callsites are inlined code, not macro expansions.
-- [ ] Round 5 — load-bearing (4 macros, ~168 callsites): `PHP5TO7_ZEND_OBJECT_GET/ECALLOC/INIT/INIT_EX`. Coupled to handler refactor; do per-module after the module's stub + Z_PARAM port.
+- [x] Round 1 — pure renames (6 macros): `PHP5TO7_SMART_STR_VAL/LEN`, `PHP_SCYLLADB_Z_IS_*`, `PHP5TO7_ADD_NEXT_INDEX_STRING`. Done on `refactor/stage2-macro-purge`.
+- [x] Round 2 — hashtable iteration: `PHP5TO7_ZEND_HASH_FOREACH_*`, `GET_CURRENT_*` (all variants). Done; STR_KEY_VAL adapted to `zend_string *`.
+- [x] Round 3 — hashtable mutation: `PHP5TO7_ZEND_HASH_FIND/EXISTS/UPDATE/ADD/DEL/INDEX_*`, `ADD_ASSOC_*`, `ZVAL_COPY`. Done.
+- [x] Round 4 — zval lifecycle: `PHP5TO7_ZVAL_MAYBE_DESTROY` → `zval_ptr_dtor`. Done (54 callsites).
+- [ ] Round 5 — load-bearing (4 macros, 163 callsites): `PHP5TO7_ZEND_OBJECT_GET/ECALLOC/INIT/INIT_EX`. Deferred per-module alongside handler refactor (Stage 4). 163 callsites remain in `php_driver.h` macros.
 - [ ] **Stage 2.3 — delete `util/`** (12 headers + 10 cpp files): inline thin wrappers into owning modules; replace `uthash.h` with `zend_hash`; replace `php_driver_ref` with native resource refcounting (depends on Round B).
 
 ### Round G — Module ports to C23 (target: v1.6.0–v2.0.0)

include/php_driver.h

@@ -58,9 +58,6 @@ typedef unsigned long ulong;
 
 #define PHP5TO7_ZEND_OBJECT_GET(type_name, object) php_driver_##type_name##_object_fetch(object)
 
-#define PHP5TO7_SMART_STR_VAL(ss) ((ss).s ? (ss).s->val : NULL)
-#define PHP5TO7_SMART_STR_LEN(ss) ((ss).s ? (ss).s->len : 0)
-
 #define PHP5TO7_ZEND_OBJECT_ECALLOC(type_name, ce)                                                                     \
     (php_driver_##type_name *)ecalloc(1, sizeof(php_driver_##type_name) + zend_object_properties_size(ce))
 
@@ -76,95 +73,6 @@ typedef unsigned long ulong;
         return &self->zendObject;                                                                                            \
     } while (0)
 
-#define PHP5TO7_ADD_ASSOC_ZVAL_EX(zv, key, len, val) add_assoc_zval_ex((zv), (key), (size_t)(len - 1), val)
-
-#define PHP5TO7_ADD_ASSOC_STRINGL_EX(zv, key, key_len, str, str_len)                                                   \
-    add_assoc_stringl_ex((zv), (key), (size_t)(key_len - 1), (char *)(str), (size_t)(str_len))
-
-#define PHP5TO7_ADD_NEXT_INDEX_STRING(zv, str) add_next_index_string((zv), (char *)(str));
-
-#define PHP5TO7_ZEND_HASH_FOREACH_VAL(ht, _val) ZEND_HASH_FOREACH_VAL(ht, _val)
-
-#define PHP5TO7_ZEND_HASH_FOREACH_NUM_KEY_VAL(ht, _h, _val) ZEND_HASH_FOREACH_NUM_KEY_VAL(ht, _h, _val)
-
-#if PHP_VERSION_ID >= 80200
-
-#define PHP5TO7_ZEND_HASH_FOREACH_STR_KEY_VAL(ht, _key, _val)                                                          \
-    ZEND_HASH_FOREACH(ht, 0);                                                                                          \
-    if (__key)                                                                                                         \
-    {                                                                                                                  \
-        (_key) = ZSTR_VAL(__key);                                                                                      \
-    }                                                                                                                  \
-    else                                                                                                               \
-    {                                                                                                                  \
-        (_key) = NULL;                                                                                                 \
-    }                                                                                                                  \
-    _val = _z;
-
-#else
-
-#define PHP5TO7_ZEND_HASH_FOREACH_STR_KEY_VAL(ht, _key, _val)                                                          \
-    ZEND_HASH_FOREACH(ht, 0);                                                                                          \
-    if (_p->key)                                                                                                       \
-    {                                                                                                                  \
-        (_key) = _p->key->val;                                                                                         \
-    }                                                                                                                  \
-    else                                                                                                               \
-    {                                                                                                                  \
-        (_key) = NULL;                                                                                                 \
-    }                                                                                                                  \
-    _val = _z;
-
-#endif
-
-#define PHP5TO7_ZEND_HASH_FOREACH_END(ht) ZEND_HASH_FOREACH_END()
-
-#define PHP5TO7_ZEND_HASH_GET_CURRENT_DATA(ht, res) ((res = zend_hash_get_current_data((ht))) != NULL)
-
-#define PHP5TO7_ZEND_HASH_GET_CURRENT_DATA_EX(ht, res, pos) ((res = zend_hash_get_current_data_ex((ht), (pos))) != NULL)
-
-#define PHP5TO7_ZEND_HASH_GET_CURRENT_DATA_EX(ht, res, pos) ((res = zend_hash_get_current_data_ex((ht), (pos))) != NULL)
-
-#define PHP5TO7_ZEND_HASH_GET_CURRENT_KEY(ht, str_index, num_index)                                                    \
-    zend_hash_get_current_key((ht), (str_index), (num_index))
-
-#define PHP5TO7_ZEND_HASH_GET_CURRENT_KEY_EX(ht, str_index, num_index, pos)                                            \
-    zend_hash_get_current_key_ex((ht), (str_index), (num_index), pos)
-
-#define PHP5TO7_ZEND_HASH_EXISTS(ht, key, len) zend_hash_str_exists((ht), (key), (size_t)(len - 1))
-
-#define PHP5TO7_ZEND_HASH_FIND(ht, key, len, res) ((res = zend_hash_str_find((ht), (key), (size_t)(len - 1))) != NULL)
-
-#define PHP5TO7_ZEND_HASH_INDEX_FIND(ht, index, res)                                                                   \
-    ((res = zend_hash_index_find((ht), (zend_ulong)(index))) != NULL)
-
-#define PHP5TO7_ZEND_HASH_NEXT_INDEX_INSERT(ht, val, val_size) ((void)zend_hash_next_index_insert((ht), (val)))
-
-#define PHP5TO7_ZEND_HASH_UPDATE(ht, key, len, val, val_size)                                                          \
-    ((void)zend_hash_str_update((ht), (key), (size_t)(len - 1), (val)))
-
-#define PHP5TO7_ZEND_HASH_INDEX_UPDATE(ht, index, val, val_size) ((void)zend_hash_index_update((ht), (index), (val)))
-
-#define PHP5TO7_ZEND_HASH_ADD(ht, key, len, val, val_size)                                                             \
-    ((void)zend_hash_str_add((ht), (key), (size_t)(len - 1), (val)))
-
-#define PHP5TO7_ZEND_HASH_DEL(ht, key, len) ((zend_hash_str_del((ht), (key), (size_t)(len - 1))) == SUCCESS)
-
-#define PHP5TO7_ZEND_HASH_ZVAL_COPY(dst, src) zend_hash_copy((dst), (src), (copy_ctor_func_t)zval_add_ref);
-
-#define PHP_SCYLLADB_Z_IS_BOOL_P(zv) (Z_TYPE_P(zv) == IS_TRUE || Z_TYPE_P(zv) == IS_FALSE)
-#define PHP_SCYLLADB_Z_IS_FALSE_P(zv) (Z_TYPE_P(zv) == IS_FALSE)
-#define PHP_SCYLLADB_Z_IS_TRUE_P(zv) (Z_TYPE_P(zv) == IS_TRUE)
-
-#define PHP5TO7_ZVAL_MAYBE_DESTROY(zv)                                                                                 \
-    do                                                                                                                 \
-    {                                                                                                                  \
-        if (!Z_ISUNDEF(zv))                                                                                            \
-        {                                                                                                              \
-            zval_ptr_dtor(&(zv));                                                                                      \
-            ZVAL_UNDEF(&(zv));                                                                                         \
-        }                                                                                                              \
-    } while (0)
 
     extern zend_module_entry php_driver_module_entry;
 #define phpext_cassandra_ptr &php_driver_module_entry

include/php_driver_types.h

@@ -674,31 +674,7 @@ extern PHP_SCYLLADB_API zend_class_entry *php_driver_tuple_ce;
 extern PHP_SCYLLADB_API zend_class_entry *php_driver_user_type_value_ce;
 
 /* Exceptions */
-void php_driver_define_Exception();
-void php_driver_define_InvalidArgumentException();
-void php_driver_define_DomainException();
-void php_driver_define_LogicException();
-void php_driver_define_RuntimeException();
-void php_driver_define_TimeoutException();
-void php_driver_define_ExecutionException();
-void php_driver_define_ReadTimeoutException();
-void php_driver_define_WriteTimeoutException();
-void php_driver_define_UnavailableException();
-void php_driver_define_TruncateException();
-void php_driver_define_ValidationException();
-void php_driver_define_InvalidQueryException();
-void php_driver_define_InvalidSyntaxException();
-void php_driver_define_UnauthorizedException();
-void php_driver_define_UnpreparedException();
-void php_driver_define_ConfigurationException();
-void php_driver_define_AlreadyExistsException();
-void php_driver_define_AuthenticationException();
-void php_driver_define_ProtocolException();
-void php_driver_define_ServerException();
-void php_driver_define_IsBootstrappingException();
-void php_driver_define_OverloadedException();
-void php_driver_define_DivideByZeroException();
-void php_driver_define_RangeException();
+void php_driver_define_Exceptions(void);
 
 /* Types */
 void php_driver_define_Value();
@@ -749,7 +725,6 @@ extern PHP_SCYLLADB_API zend_class_entry *php_driver_execution_exception_ce;
 extern PHP_SCYLLADB_API zend_class_entry *php_driver_truncate_exception_ce;
 extern PHP_SCYLLADB_API zend_class_entry *php_driver_write_timeout_exception_ce;
 extern PHP_SCYLLADB_API zend_class_entry *php_driver_read_timeout_exception_ce;
-extern PHP_SCYLLADB_API zend_class_entry *php_driver_truncate_exception_ce;
 extern PHP_SCYLLADB_API zend_class_entry *php_driver_unavailable_exception_ce;
 extern PHP_SCYLLADB_API zend_class_entry *php_driver_validation_exception_ce;
 extern PHP_SCYLLADB_API zend_class_entry *php_driver_invalid_syntax_exception_ce;