Merge branch 'PHP-8.2'

* PHP-8.2:
  ext/curl/interface: fix zend_result return value
  Zend/zend_ini: fix zend_result return values

Author: Girgias

Zend/zend_ini.c

@@ -63,7 +63,7 @@ static zend_result zend_restore_ini_entry_cb(zend_ini_entry *ini_entry, int stag
 		}
 		if (stage == ZEND_INI_STAGE_RUNTIME && result == FAILURE) {
 			/* runtime failure is OK */
-			return 1;
+			return FAILURE;
 		}
 		if (ini_entry->value != ini_entry->orig_value) {
 			zend_string_release(ini_entry->value);
@@ -74,7 +74,7 @@ static zend_result zend_restore_ini_entry_cb(zend_ini_entry *ini_entry, int stag
 		ini_entry->orig_value = NULL;
 		ini_entry->orig_modifiable = 0;
 	}
-	return 0;
+	return SUCCESS;
 }
 /* }}} */
 

ext/curl/interface.c

@@ -1378,7 +1378,7 @@ static inline zend_result build_mime_structure_from_hash(php_curl *ch, zval *zpo
 				postval = Z_STR_P(prop);
 
 				if (php_check_open_basedir(ZSTR_VAL(postval))) {
-					return 1;
+					return FAILURE;
 				}
 
 				prop = zend_read_property(curl_CURLFile_class, Z_OBJ_P(current), "mime", sizeof("mime")-1, 0, &rv);