Merged pull request xdebug#1040

* pr/1040:
  Fixed issue #2372: PHP 8.5: Changes to glob interface
  Split xdebug_normalize_path_* into their own file
  Build Xdebug 3.5 on PHP 8.5 on Windows in CI

Author: derickr

.github/workflows/tests.yml

@@ -23,7 +23,7 @@ jobs:
               id: extension-matrix
               uses: php/php-windows-builder/extension-matrix@v1
               with:
-                php-version-list: '8.0, 8.1, 8.2, 8.3, 8.4'
+                php-version-list: '8.0, 8.1, 8.2, 8.3, 8.4, 8.5'
                 arch-list: 'x64'
 
     windows:

config.m4

@@ -108,7 +108,7 @@ if test "$PHP_XDEBUG" != "no"; then
   PHP_XDEBUG_CFLAGS="$STD_CFLAGS $MAINTAINER_CFLAGS"
 
   XDEBUG_BASE_SOURCES="src/base/base.c src/base/ctrl_socket.c src/base/filter.c"
-  XDEBUG_LIB_SOURCES="src/lib/usefulstuff.c src/lib/cmd_parser.c src/lib/compat.c src/lib/crc32.c src/lib/file.c src/lib/hash.c src/lib/headers.c src/lib/lib.c src/lib/llist.c src/lib/log.c src/lib/set.c src/lib/str.c src/lib/timing.c src/lib/trim.c src/lib/var.c src/lib/var_export_html.c src/lib/var_export_line.c src/lib/var_export_text.c src/lib/var_export_xml.c src/lib/xdebug_strndup.c src/lib/xml.c"
+  XDEBUG_LIB_SOURCES="src/lib/usefulstuff.c src/lib/cmd_parser.c src/lib/compat.c src/lib/crc32.c src/lib/file.c src/lib/hash.c src/lib/headers.c src/lib/lib.c src/lib/llist.c src/lib/log.c src/lib/normalize_path.c src/lib/set.c src/lib/str.c src/lib/timing.c src/lib/trim.c src/lib/var.c src/lib/var_export_html.c src/lib/var_export_line.c src/lib/var_export_text.c src/lib/var_export_xml.c src/lib/xdebug_strndup.c src/lib/xml.c"
   XDEBUG_LIB_MAPS_SOURCES="src/lib/maps/maps.c src/lib/maps/maps_private.c src/lib/maps/parser.c"
 
   XDEBUG_COVERAGE_SOURCES="src/coverage/branch_info.c src/coverage/code_coverage.c"

config.w32

@@ -6,7 +6,7 @@ ARG_WITH("xdebug-compression", "whether to compress profiler files (requires zli
 
 if (PHP_XDEBUG != 'no') {
 	var XDEBUG_BASE_SOURCES="base.c filter.c ctrl_socket.c"
-	var XDEBUG_LIB_SOURCES="usefulstuff.c cmd_parser.c compat.c crc32.c file.c hash.c headers.c lib.c llist.c log.c set.c str.c timing.c trim.c var.c var_export_html.c var_export_line.c var_export_text.c var_export_xml.c xdebug_strndup.c xml.c"
+	var XDEBUG_LIB_SOURCES="usefulstuff.c cmd_parser.c compat.c crc32.c file.c hash.c headers.c lib.c llist.c log.c normalize_path.c set.c str.c timing.c trim.c var.c var_export_html.c var_export_line.c var_export_text.c var_export_xml.c xdebug_strndup.c xml.c"
 	var XDEBUG_LIB_MAPS_SOURCES="maps.c maps_private.c parser.c"
 
 	var XDEBUG_COVERAGE_SOURCES="branch_info.c code_coverage.c"

package.xml

@@ -133,6 +133,8 @@ Tue, Oct 07, 2025 - Xdebug 3.5.0alpha2
      <file name="llist.c" role="src" />
      <file name="llist.h" role="src" />
      <file name="mm.h" role="src" />
+     <file name="normalize_path.c" role="src" />
+     <file name="normalize_path.h" role="src" />
      <file name="php-header.h" role="src" />
      <file name="set.c" role="src" />
      <file name="set.h" role="src" />

src/lib/maps/maps.c

@@ -16,6 +16,10 @@
 #include <stddef.h>
 #include <stdlib.h>
 
+#ifndef XDEBUG_NO_PHP_FEATURES
+# include "php_xdebug.h"
+#endif
+
 #if PHP_VERSION_ID >= 80500
 # include "php_glob.h"
 # define xdebug_glob php_glob
@@ -33,7 +37,9 @@
 # define xdebug_globfree globfree
 #endif
 
-#include "php_xdebug.h"
+#ifndef PHP_GLOB_NOMATCH
+# define PHP_GLOB_NOMATCH GLOB_NOMATCH
+#endif
 
 #include "maps_private.h"
 #include "parser.h"
@@ -85,7 +91,7 @@ static void scan_directory(const char *dir)
 		case 0: /* No error */
 			break;
 
-		case GLOB_NOMATCH:
+		case PHP_GLOB_NOMATCH:
 			xdebug_log_ex(XLOG_CHAN_PATHMAP, XLOG_DEBUG, "NOMATCH", "No map files found with pattern '%s'", scan_dir);
 			xdfree(scan_dir);
 

src/lib/maps/maps_private.c

@@ -19,8 +19,8 @@
 
 #include "maps_private.h"
 #include "../mm.h"
+#include "../normalize_path.h"
 #include "../strrnchr.h"
-#include "../usefulstuff.h"
 #include "../vector.h"
 #include "../xdebug_strndup.h"
 

src/lib/maps/parser.c

@@ -25,9 +25,9 @@
 
 #include "../hash.h"
 #include "../mm.h"
+#include "../normalize_path.h"
 #include "../str.h"
 #include "../trim.h"
-#include "../usefulstuff.h"
 #include "../xdebug_strndup.h"
 
 typedef struct path_maps_parser_state {

src/lib/normalize_path.c

@@ -0,0 +1,54 @@
+/*
+   +----------------------------------------------------------------------+
+   | Xdebug                                                               |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 2002-2025 Derick Rethans                               |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 1.01 of the Xdebug license,   |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | https://xdebug.org/license.php                                       |
+   | If you did not receive a copy of the Xdebug license and are unable   |
+   | to obtain it through the world-wide-web, please send a note to       |
+   | [email protected] so we can mail you a copy immediately.             |
+   +----------------------------------------------------------------------+
+ */
+
+#include <string.h>
+
+#include "mm.h"
+#include "str.h"
+
+#ifdef PHP_WIN32
+char *xdebug_normalize_path_char(const char *path)
+{
+	char *new_path = xdstrdup(path);
+	char *ptr = new_path;
+
+	do {
+		if ((*ptr) == '\\') {
+			*ptr = '/';
+		}
+		ptr++;
+	} while (*ptr != '\0');
+
+	return new_path;
+}
+
+void xdebug_normalize_path_xdebug_str_in_place(xdebug_str *path)
+{
+	int i;
+
+	for (i = 0; i < XDEBUG_STR_LEN(path); i++) {
+		if (XDEBUG_STR_VAL(path)[i] == '\\') {
+			XDEBUG_STR_VAL(path)[i] = '/';
+		}
+	}
+}
+#else
+char *xdebug_normalize_path_char(const char *path)
+{
+	return xdstrdup(path);
+}
+#endif
+

src/lib/normalize_path.h

@@ -0,0 +1,35 @@
+/*
+   +----------------------------------------------------------------------+
+   | Xdebug                                                               |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 2002-2025 Derick Rethans                               |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 1.01 of the Xdebug license,   |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | https://xdebug.org/license.php                                       |
+   | If you did not receive a copy of the Xdebug license and are unable   |
+   | to obtain it through the world-wide-web, please send a note to       |
+   | [email protected] so we can mail you a copy immediately.             |
+   +----------------------------------------------------------------------+
+ */
+
+#ifndef __HAVE_NORMALIZE_PATH_H__
+#define __HAVE_NORMALIZE_PATH_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+char *xdebug_normalize_path_char(const char *path);
+#ifdef PHP_WIN32
+void xdebug_normalize_path_xdebug_str_in_place(xdebug_str *path);
+#else
+# define xdebug_normalize_path_xdebug_str_in_place(path)
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

tests/ctest/Makefile

@@ -23,14 +23,17 @@ afl-test-parser: xdebuglib.a ${C_TESTS} ${SOURCE_FILES} ${HEADER_FILES} fuzzing-
 afl-test-mapper: xdebuglib.a ${C_TESTS} ${SOURCE_FILES} ${HEADER_FILES} fuzzing-shim-mapper.c
 	afl-g++ ${CPPFLAGS} fuzzing-shim-mapper.c ${SOURCE_FILES} xdebuglib.a -I ${INCLUDE_PATH} -o afl-test-mapper ${LDFLAGS}
 
-xdebuglib.a: hash.o llist.o str.o trim.o xdebug_strndup.o
-	ar -rc xdebuglib.a hash.o llist.o str.o trim.o xdebug_strndup.o
+xdebuglib.a: hash.o llist.o normalize_path.o str.o trim.o xdebug_strndup.o
+	ar -rc xdebuglib.a hash.o llist.o normalize_path.o str.o trim.o xdebug_strndup.o
+
+hash.o: ../../src/lib/hash.c
+	gcc -c ${CPPFLAGS} -o hash.o ../../src/lib/hash.c
 
 llist.o: ../../src/lib/llist.c
 	gcc -c ${CPPFLAGS} -o llist.o ../../src/lib/llist.c
 
-hash.o: ../../src/lib/hash.c
-	gcc -c ${CPPFLAGS} -o hash.o ../../src/lib/hash.c
+normalize_path.o: ../../src/lib/normalize_path.c
+	gcc -c ${CPPFLAGS} -o normalize_path.o ../../src/lib/normalize_path.c
 
 str.o: ../../src/lib/str.c
 	gcc -c ${CPPFLAGS} -o str.o ../../src/lib/str.c
@@ -42,4 +45,4 @@ xdebug_strndup.o: ../../src/lib/xdebug_strndup.c
 	gcc -c ${CPPFLAGS} -o xdebug_strndup.o ../../src/lib/xdebug_strndup.c
 
 clean:
-	rm xdebuglib.a hash.o llist.o str.o trim.o xdebug_strndup.o ctest afl-test-parser afl-test-mapper
+	rm xdebuglib.a hash.o llist.o normalize_path.o str.o trim.o xdebug_strndup.o ctest afl-test-parser afl-test-mapper