Commit 5f2ed8815ec for php.net
commit 5f2ed8815ec6615f94018dd82845bc8389076f6b
Author: Gina Peter Banyard <girgias@php.net>
Date: Sun May 24 14:53:20 2026 +0100
main: remove OPENBASEDIR_CHECKPATH() compatibility macro (#22140)
diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
index 2daa75f798b..c340ba64833 100644
--- a/UPGRADING.INTERNALS
+++ b/UPGRADING.INTERNALS
@@ -108,6 +108,8 @@ PHP 8.6 INTERNALS UPGRADE NOTES
instead of copying it in zend_call_function(). Currently only a single
consumed argument is supported.
. Added ZEND_CONTAINER_OF().
+ . The OPENBASEDIR_CHECKPATH() compatibility macro has been removed, instead
+ use php_check_open_basedir() directly.
========================
2. Build system changes
diff --git a/main/fopen_wrappers.h b/main/fopen_wrappers.h
index f92c7d6fd44..62bebca9b71 100644
--- a/main/fopen_wrappers.h
+++ b/main/fopen_wrappers.h
@@ -28,9 +28,6 @@ PHPAPI int php_check_open_basedir(const char *path);
PHPAPI int php_check_open_basedir_ex(const char *path, int warn);
PHPAPI int php_check_specific_open_basedir(const char *basedir, const char *path);
-/* OPENBASEDIR_CHECKPATH(filename) to ease merge between 6.x and 5.x */
-#define OPENBASEDIR_CHECKPATH(filename) php_check_open_basedir(filename)
-
PHPAPI zend_string *php_resolve_path(const char *filename, size_t filename_len, const char *path);
PHPAPI FILE *php_fopen_with_path(const char *filename, const char *mode, const char *path, zend_string **opened_path);