Merge pull request #579 from remicollet/issue-php82

Fix PHP 8.2/8.3 compatibility
laruence · Jun 25, 2024 · d8191fb · d8191fb
2 parents abd7bdf + cd933d8
commit d8191fb
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 4 deletions.
diff --git a/php_yaf.h b/php_yaf.h
@@ -74,7 +74,11 @@ extern zend_module_entry yaf_module_entry;
 #else
 #define YAF_WRITE_HANDLER       zval *
 #define YAF_WHANDLER_RET(zv)    return zv
+#if PHP_VERSION_ID >= 80000
 HashTable *yaf_fake_get_gc(zend_object *zobj, zval **table, int *n);
+#else
+HashTable *yaf_fake_get_gc(zval *zobj, zval **table, int *n);
+#endif
 #endif
 
 #if PHP_VERSION_ID < 80000
@@ -260,6 +264,11 @@ static zend_always_inline uint32_t yaf_compose_2_pathes(char *buf, zend_string *
 }
 #endif
 
+/* removed in 8.3 */
+#ifndef ZEND_HOT
+#define ZEND_HOT
+#endif
+
 /*
  * Local variables:
  * tab-width: 4

diff --git a/requests/yaf_request_simple.c b/requests/yaf_request_simple.c
@@ -140,6 +140,9 @@ YAF_STARTUP_FUNCTION(request_simple){
 	zend_class_entry ce;
 	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Request_Simple", "Yaf\\Request\\Simple", yaf_request_simple_methods);
 	yaf_request_simple_ce = zend_register_internal_class_ex(&ce, yaf_request_ce);
+#if PHP_VERSION_ID >= 80200
+	yaf_request_simple_ce->ce_flags |= ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES;
+#endif
 
 	return SUCCESS;
 }

diff --git a/tests/031.phpt b/tests/031.phpt
@@ -36,7 +36,7 @@ Array
 )
 array (
   '_default' => 
-  Yaf_Route_Map::__set_state(array(
+  %saf_Route_Map::__set_state(array(
      'ctl_prefer:protected' => true,
      'delimiter:protected' => '##',
   )),

diff --git a/tests/issue231.phpt b/tests/issue231.phpt
@@ -34,7 +34,7 @@ Yaf_Request_Http Object
         )
 
 )
-Yaf_Request_Http::__set_state(array(
+%saf_Request_Http::__set_state(array(
    'method' => 'POST',
    'module' => NULL,
    'controller' => NULL,

diff --git a/views/yaf_view_simple.c b/views/yaf_view_simple.c
@@ -388,8 +388,10 @@ static int yaf_view_simple_eval(yaf_view_t *view, zend_string *tpl, zval * vars,
 		ZVAL_STR(&phtml, strpprintf(0, "?>%s", ZSTR_VAL(tpl)));
 #if PHP_VERSION_ID < 80000
 		op_array = zend_compile_string(&phtml, eval_desc);
-#else
+#elif PHP_VERSION_ID < 80200
         op_array = zend_compile_string(Z_STR(phtml), eval_desc);
+#else
+        op_array = zend_compile_string(Z_STR(phtml), eval_desc, ZEND_COMPILE_POSITION_AFTER_OPEN_TAG);
 #endif
 		zval_dtor(&phtml);
 		efree(eval_desc);

diff --git a/yaf.c b/yaf.c
@@ -72,7 +72,11 @@ void yaf_iterator_dtor(zend_object_iterator *iter) /* {{{ */ {
 /* }}} */
 
 #if PHP_VERSION_ID >= 70400
+#if PHP_VERSION_ID >= 80000
 HashTable *yaf_fake_get_gc(zend_object *zobj, zval **table, int *n) /* {{{ */ {
+#else
+HashTable *yaf_fake_get_gc(zval *zobj, zval **table, int *n) /* {{{ */ {
+#endif
 	*n = 0;
 	*table = NULL;
 	return NULL;

diff --git a/yaf_application.c b/yaf_application.c
@@ -1053,8 +1053,10 @@ YAF_STARTUP_FUNCTION(application) {
 	yaf_application_ce->ce_flags |= ZEND_ACC_FINAL;
 	yaf_application_ce->serialize = zend_class_serialize_deny;
 	yaf_application_ce->unserialize = zend_class_unserialize_deny;
-#else
+#elif PHP_VERSION_ID < 80200
 	yaf_application_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NOT_SERIALIZABLE;
+#else
+	yaf_application_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NOT_SERIALIZABLE | ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES;
 #endif
 
 	memcpy(&yaf_application_obj_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));