Merged pull request #475

.appveyor.yml

@@ -16,63 +16,99 @@ environment:
     - PHP_REL: 7.3
       ARCHITECTURE: x64
       ZTS_STATE: enable
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       PHP_BUILD_CRT: vc15
-    - PHP_REL: 7.2
-      ARCHITECTURE: x64
-      ZTS_STATE: enable
+      OPCACHE: yes
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      PHP_BUILD_CRT: vc15
-    - PHP_REL: 7.1
-      ARCHITECTURE: x64
-      ZTS_STATE: enable
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      PHP_BUILD_CRT: vc14
     - PHP_REL: 7.3
       ARCHITECTURE: x64
       ZTS_STATE: disable
+      PHP_BUILD_CRT: vc15
+      OPCACHE: yes
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    - PHP_REL: 7.3
+      ARCHITECTURE: x64
+      ZTS_STATE: enable
       PHP_BUILD_CRT: vc15
-    - PHP_REL: 7.2
+      OPCACHE: no
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    - PHP_REL: 7.3
       ARCHITECTURE: x64
       ZTS_STATE: disable
+      PHP_BUILD_CRT: vc15
+      OPCACHE: no
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    - PHP_REL: 7.3
+      ARCHITECTURE: x86
+      ZTS_STATE: enable
       PHP_BUILD_CRT: vc15
-    - PHP_REL: 7.1
-      ARCHITECTURE: x64
+      OPCACHE: yes
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    - PHP_REL: 7.3
+      ARCHITECTURE: x86
       ZTS_STATE: disable
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      PHP_BUILD_CRT: vc14
+      PHP_BUILD_CRT: vc15
+      OPCACHE: yes
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     - PHP_REL: 7.3
       ARCHITECTURE: x86
       ZTS_STATE: enable
+      PHP_BUILD_CRT: vc15
+      OPCACHE: no
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    - PHP_REL: 7.3
+      ARCHITECTURE: x86
+      ZTS_STATE: disable
       PHP_BUILD_CRT: vc15
+      OPCACHE: no
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     - PHP_REL: 7.2
-      ARCHITECTURE: x86
+      ARCHITECTURE: x64
       ZTS_STATE: enable
+      PHP_BUILD_CRT: vc15
+      OPCACHE: yes
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    - PHP_REL: 7.2
+      ARCHITECTURE: x64
+      ZTS_STATE: disable
       PHP_BUILD_CRT: vc15
-    - PHP_REL: 7.1
+      OPCACHE: no
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    - PHP_REL: 7.2
       ARCHITECTURE: x86
       ZTS_STATE: enable
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      PHP_BUILD_CRT: vc14
-    - PHP_REL: 7.3
-      ARCHITECTURE: x86
-      ZTS_STATE: disable
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       PHP_BUILD_CRT: vc15
+      OPCACHE: no
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     - PHP_REL: 7.2
       ARCHITECTURE: x86
       ZTS_STATE: disable
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       PHP_BUILD_CRT: vc15
+      OPCACHE: yes
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     - PHP_REL: 7.1
-      ARCHITECTURE: x86
+      ARCHITECTURE: x64
+      ZTS_STATE: enable
+      PHP_BUILD_CRT: vc14
+      OPCACHE: yes
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    - PHP_REL: 7.1
+      ARCHITECTURE: x64
       ZTS_STATE: disable
+      PHP_BUILD_CRT: vc14
+      OPCACHE: no
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    - PHP_REL: 7.1
+      ARCHITECTURE: x86
+      ZTS_STATE: enable
+      PHP_BUILD_CRT: vc14
+      OPCACHE: no
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    - PHP_REL: 7.1
+      ARCHITECTURE: x86
+      ZTS_STATE: disable
       PHP_BUILD_CRT: vc14
+      OPCACHE: yes
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
 
 install:
   - .appveyor\install.cmd

.appveyor/build_task.cmd

@@ -31,7 +31,7 @@ setlocal enableextensions enabledelayedexpansion
 
 	if %errorlevel% neq 0 exit /b 3
 
-	cmd /c configure.bat --disable-all --with-mp=auto --enable-cli --%ZTS_STATE%-zts --enable-json --with-xdebug=shared --enable-object-out-dir=%PHP_BUILD_OBJ_DIR% --with-config-file-scan-dir=%APPVEYOR_BUILD_FOLDER%\build\modules.d --with-prefix=%APPVEYOR_BUILD_FOLDER%\build --with-php-build=%DEPS_DIR%
+	cmd /c configure.bat --disable-all --enable-opcache --with-mp=auto --enable-cli --%ZTS_STATE%-zts --enable-json --with-xdebug=shared --enable-object-out-dir=%PHP_BUILD_OBJ_DIR% --with-config-file-scan-dir=%APPVEYOR_BUILD_FOLDER%\build\modules.d --with-prefix=%APPVEYOR_BUILD_FOLDER%\build --with-php-build=%DEPS_DIR%
 
 	if %errorlevel% neq 0 exit /b 3
 
@@ -45,15 +45,16 @@ setlocal enableextensions enabledelayedexpansion
 	mkdir c:\tests_tmp
 	set TEST_PHP_EXECUTABLE=%APPVEYOR_BUILD_FOLDER%\build\php.exe
 	set TEST_PHP_JUNIT=c:\tests_tmp\tests-junit.xml
-	if "%OPCACHE%" equ "1" set TEST_PHP_ARGS=!TEST_PHP_ARGS! -d zend_extension=%APPVEYOR_BUILD_FOLDER%\build\ext\php_opcache.so -d opcache.enable=1 -d opcache.enable_cli=1
-	set TEST_PHP_ARGS=-n -d -foo=1 -d zend_extension=%APPVEYOR_BUILD_FOLDER%\build\ext\php_xdebug.dll -dxdebug.remote_enable=1
+	set TEST_PHP_ARGS=-n -d -foo=1 -d zend_extension=%APPVEYOR_BUILD_FOLDER%\build\ext\php_opcache.dll -d zend_extension=%APPVEYOR_BUILD_FOLDER%\build\ext\php_xdebug.dll -dxdebug.remote_enable=1
 	set SKIP_DBGP_TESTS=1
 	set SKIP_IPV6_TESTS=1
 	set REPORT_EXIT_STATUS=1
+	set OPCACHE=%OPCACHE%
+	echo !OPCACHE!
 	echo !TEST_PHP_EXECUTABLE! !TEST_PHP_ARGS! -v
-	echo !TEST_PHP_EXECUTABLE! -n run-tests.php -q -x --show-diff --show-slow 1000 --set-timeout 120 -g FAIL,XFAIL,BORK,WARN,LEAK,SKIP --temp-source c:\tests_tmp --temp-target c:\tests_tmp %APPVEYOR_BUILD_FOLDER%\tests
+	echo !TEST_PHP_EXECUTABLE! -n %APPVEYOR_BUILD_FOLDER%\run-xdebug-tests.php -q -x --show-diff %APPVEYOR_BUILD_FOLDER%\tests
 	!TEST_PHP_EXECUTABLE! !TEST_PHP_ARGS! -v
-	!TEST_PHP_EXECUTABLE! -n run-tests.php -q -x --show-diff %APPVEYOR_BUILD_FOLDER%\tests
+	!TEST_PHP_EXECUTABLE! -n %APPVEYOR_BUILD_FOLDER%\run-xdebug-tests.php -q -x --show-diff %APPVEYOR_BUILD_FOLDER%\tests
 
 	set EXIT_CODE=%errorlevel%
 	powershell -Command "$wc = New-Object 'System.Net.WebClient'; $wc.UploadFile('https://ci.appveyor.com/api/testresults/junit/%APPVEYOR_JOB_ID%', 'c:\tests_tmp\tests-junit.xml')"

.travis.yml

@@ -7,6 +7,7 @@ php:
   - 7.1
   - 7.2
   - 7.3
+  - 7.4snapshot
   - nightly
 
 matrix:

Makefile.frag

@@ -30,3 +30,6 @@ show-install-instructions:
 
 findphp:
 	@echo $(PHP_EXECUTABLE)
+
+clean-tests:
+	rm -f tests/*.diff tests/*.exp tests/*.log tests/*.out tests/*.php tests/*.sh tests/*.mem

config.m4

@@ -12,10 +12,10 @@ if test "$PHP_XDEBUG" != "no"; then
   PHP_XDEBUG_FOUND_VERSION=`${PHP_CONFIG} --version`
   PHP_XDEBUG_FOUND_VERNUM=`echo "${PHP_XDEBUG_FOUND_VERSION}" | $AWK 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 100 + [$]2) * 100 + [$]3;}'`
   if test "$PHP_XDEBUG_FOUND_VERNUM" -lt "70000"; then
-    AC_MSG_ERROR([not supported. Need a PHP version >= 7.0.0 and < 7.4.0 (found $PHP_XDEBUG_FOUND_VERSION)])
+    AC_MSG_ERROR([not supported. Need a PHP version >= 7.0.0 and < 8.0.0 (found $PHP_XDEBUG_FOUND_VERSION)])
   else
-    if test "$PHP_XDEBUG_FOUND_VERNUM" -ge "70400"; then
-      AC_MSG_ERROR([not supported. Need a PHP version >= 7.0.0 and < 7.4.0 (found $PHP_XDEBUG_FOUND_VERSION)])
+    if test "$PHP_XDEBUG_FOUND_VERNUM" -ge "80000"; then
+      AC_MSG_ERROR([not supported. Need a PHP version >= 7.0.0 and < 8.0.0 (found $PHP_XDEBUG_FOUND_VERSION)])
     else
       AC_MSG_RESULT([supported ($PHP_XDEBUG_FOUND_VERSION)])
     fi

php_xdebug.h

@@ -149,7 +149,6 @@ ZEND_BEGIN_MODULE_GLOBALS(xdebug)
 	zend_bool     collect_return;
 	zend_bool     collect_vars;
 	zend_bool     collect_assignments;
-	zend_bool     extended_info;
 	zend_bool     show_ex_trace;
 	zend_bool     show_error_trace;
 	zend_bool     show_local_vars;

rebuild.sh

@@ -5,4 +5,6 @@ bit64=`php -n -r 'echo PHP_INT_SIZE == 8 ? "1" : "0";'`
 if [[ ${bit64} != "1" ]]; then
 	export CFLAGS="-m32"
 fi
+rm configure.in
+rm configure.ac
 phpize && ./configure --enable-xdebug-dev && make clean && make all && make install

run-xdebug-tests.php

@@ -323,7 +323,7 @@ function write_information()
 		'session' => array('session.auto_start=0'),
 		'tidy' => array('tidy.clean_output=0'),
 		'zlib' => array('zlib.output_compression=Off'),
-		'xdebug' => array('xdebug.default_enable=0'),
+		'xdebug' => array('xdebug.default_enable=0','xdebug.remote_enable=0'),
 		'mbstring' => array('mbstring.func_overload=0'),
 	);
 
@@ -1150,7 +1150,7 @@ function system_with_timeout($commandline, $env = null, $stdin = null, $captureS
 		unset($pipes[0]);
 	}
 
-	$timeout = $valgrind ? 300 : ($env['TEST_TIMEOUT'] ?? 60);
+	$timeout = $valgrind ? 300 : ($env['TEST_TIMEOUT'] ?? 10);
 
 	while (true) {
 		/* hide errors from interrupted syscalls */
@@ -1574,23 +1574,15 @@ function run_test($php, $file, $env)
 	// Default ini settings
 	$ini_settings = array();
 
-	// Additional required extensions
-	if (array_key_exists('EXTENSIONS', $section_text)) {
-		$ext_params = array();
-		settings2array($ini_overwrites, $ext_params);
-		settings2params($ext_params);
-		$ext_dir = `$php $pass_options $extra_options $ext_params -d display_errors=0 -r "echo ini_get('extension_dir');"`;
-		$extensions = preg_split("/[\n\r]+/", trim($section_text['EXTENSIONS']));
-		$loaded = explode(",", `$php $pass_options $extra_options $ext_params -d display_errors=0 -r "echo implode(',', get_loaded_extensions());"`);
-		$ext_prefix = substr(PHP_OS, 0, 3) === "WIN" ? "php_" : "";
-		foreach ($extensions as $req_ext) {
-			if (!in_array($req_ext, $loaded)) {
-				if ($req_ext == 'opcache') {
-					$ini_settings['zend_extension'][] = $ext_dir . DIRECTORY_SEPARATOR . $ext_prefix . $req_ext . '.' . PHP_SHLIB_SUFFIX;
-				} else {
-					$ini_settings['extension'][] = $ext_dir . DIRECTORY_SEPARATOR . $ext_prefix . $req_ext . '.' . PHP_SHLIB_SUFFIX;
-				}
-			}
+	if (getenv('OPCACHE') !== false) {
+		if (getenv('OPCACHE') == 'yes') {
+			$ini_settings['opcache.enable'] = 1;
+			$ini_settings['opcache.enable_cli'] = 1;
+			$ini_settings['opcache.optimization_level'] = -1;
+		} else {
+			$ini_settings['opcache.enable'] = 0;
+			$ini_settings['opcache.enable_cli'] = 0;
+			$ini_settings['opcache.optimization_level'] = 0;
 		}
 	}
 
@@ -2981,6 +2973,7 @@ function junit_init_suite($suite_name)
 		'test_fail' => 0,
 		'test_error' => 0,
 		'test_skip' => 0,
+		'test_warn' => 0,
 		'suites' => array(),
 		'files' => array(),
 		'execution_time' => 0,

tests/assignment-trace1-php72-opcache.phpt

@@ -2,7 +2,8 @@
 Test for tracing property assignments in user-readable function traces (>= PHP 7.2, opcache)
 --SKIPIF--
 <?php
-if ( ! ( version_compare(phpversion(), "7.2", '>=') && extension_loaded('zend opcache'))) { echo "skip >= PHP 7.2 && opcache loaded needed\n"; };
+require __DIR__ . '/utils.inc';
+check_reqs('PHP >= 7.2; opcache');
 ?>
 --INI--
 xdebug.default_enable=1

tests/assignment-trace1.phpt

@@ -1,8 +1,11 @@
 --TEST--
-Test for tracing property assignments in user-readable function traces (< PHP 7.2 || no opcache)
+Test for tracing property assignments in user-readable function traces (< PHP 7.2 || !opcache)
 --SKIPIF--
 <?php
-if ( ( version_compare(phpversion(), "7.2", '>=') && extension_loaded('zend opcache'))) { echo "skip < PHP 7.2 || !opcache loaded needed\n"; };
+require __DIR__ . '/utils.inc';
+if ( ! ( runtime_version('7.2', '<') || !opcache_active() ) ) {
+	echo "skip < PHP 7.2 || !opcache loaded needed\n";
+}
 ?>
 --INI--
 xdebug.default_enable=1

tests/assignment-trace2-php72-opcache.phpt

@@ -1,9 +1,10 @@
 --TEST--
-Test for tracing array assignments in user-readable function traces (= PHP 7.2, opcache)
+Test for tracing array assignments in user-readable function traces (>= PHP 7.2, < PHP 7.3, opcache)
 --SKIPIF--
-<?php if (!version_compare(phpversion(), "7.2", '>=')) echo "skip = PHP 7.2 needed\n"; ?>
-<?php if (!version_compare(phpversion(), "7.3", '<')) echo "skip = PHP 7.2 needed\n"; ?>
-<?php if (!extension_loaded('zend opcache')) echo "skip opcache required\n"; ?>
+<?php
+require __DIR__ . '/utils.inc';
+check_reqs('PHP >= 7.2,< 7.3; opcache');
+?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0

tests/assignment-trace2-php73-opcache.phpt

@@ -2,7 +2,8 @@
 Test for tracing array assignments in user-readable function traces (>= PHP 7.3.2, opcache)
 --SKIPIF--
 <?php
-if ( ! ( version_compare(phpversion(), "7.3.2", '>=') && extension_loaded('zend opcache'))) { echo "skip >= PHP 7.3.2 && opcache loaded needed\n"; };
+require __DIR__ . '/utils.inc';
+check_reqs('PHP >= 7.3.2; opcache');
 ?>
 --INI--
 xdebug.default_enable=1

tests/assignment-trace2.phpt

@@ -1,8 +1,11 @@
 --TEST--
-Test for tracing array assignments in user-readable function traces (< PHP 7.2 || no opcache)
+Test for tracing array assignments in user-readable function traces (< PHP 7.2 || !opcache)
 --SKIPIF--
 <?php
-if ( ( version_compare(phpversion(), "7.2", '>=') && extension_loaded('zend opcache'))) { echo "skip < PHP 7.2 || !opcache loaded needed\n"; };
+require __DIR__ . '/utils.inc';
+if ( ! ( runtime_version('7.2', '<') || !opcache_active() ) ) {
+	echo "skip < PHP 7.2 || !opcache loaded needed\n";
+}
 ?>
 --INI--
 xdebug.default_enable=1

tests/assignment-trace6-opcache.phpt

@@ -1,8 +1,10 @@
 --TEST--
 Test for tracing assignments in user-readable function traces (< PHP 7.2, opcache)
 --SKIPIF--
-<?php if (version_compare(phpversion(), "7.2", '>=')) echo "skip < PHP 7.2 && opcache loaded needed\n"; ?>
-<?php if (!extension_loaded('zend opcache')) echo "skip opcache required\n"; ?>
+<?php
+require __DIR__ . '/utils.inc';
+check_reqs('PHP < 7.2; opcache');
+?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0

tests/assignment-trace6-php72-opcache.phpt

@@ -2,7 +2,8 @@
 Test for tracing assignments in user-readable function traces (>= PHP 7.2, opcache)
 --SKIPIF--
 <?php
-if ( ! ( version_compare(phpversion(), "7.2", '>=') && extension_loaded('zend opcache'))) { echo "skip >= PHP 7.2 && opcache loaded needed\n"; };
+require __DIR__ . '/utils.inc';
+check_reqs('PHP >= 7.2; opcache');
 ?>
 --INI--
 xdebug.default_enable=1

tests/assignment-trace6.phpt

@@ -1,8 +1,11 @@
 --TEST--
-Test for tracing assignments in user-readable function traces (< PHP 7.2 || no opcache)
+Test for tracing assignments in user-readable function traces (< PHP 7.2 || !opcache)
 --SKIPIF--
 <?php
-if ( ( version_compare(phpversion(), "7.2", '>=') && extension_loaded('zend opcache'))) { echo "skip < PHP 7.2 || !opcache loaded needed\n"; };
+require __DIR__ . '/utils.inc';
+if ( ! ( runtime_version('7.2', '<') || !opcache_active() ) ) {
+	echo "skip < PHP 7.2 || !opcache loaded needed\n";
+}
 ?>
 --INI--
 xdebug.default_enable=1

tests/assignment-trace7-php72-opcache.phpt

@@ -2,7 +2,8 @@
 Test for tracing property assignments in user-readable function traces (>= PHP 7.2, opcache)
 --SKIPIF--
 <?php
-if ( ! ( version_compare(phpversion(), "7.2", '>=') && extension_loaded('zend opcache'))) { echo "skip >= PHP 7.2 && opcache loaded needed\n"; };
+require __DIR__ . '/utils.inc';
+check_reqs('PHP >= 7.2; opcache');
 ?>
 --INI--
 xdebug.default_enable=1

tests/assignment-trace7.phpt

@@ -1,8 +1,11 @@
 --TEST--
-Test for tracing property assignments in user-readable function traces (< PHP 7.2 || no opcache)
+Test for tracing property assignments in user-readable function traces (< PHP 7.2 || !opcache)
 --SKIPIF--
 <?php
-if ( ( version_compare(phpversion(), "7.2", '>=') && extension_loaded('zend opcache'))) { echo "skip < PHP 7.2 || !opcache loaded needed\n"; };
+require __DIR__ . '/utils.inc';
+if ( ! ( runtime_version('7.2', '<') || !opcache_active() ) ) {
+	echo "skip < PHP 7.2 || !opcache loaded needed\n";
+}
 ?>
 --INI--
 xdebug.default_enable=1

tests/backtrace-args-php70.phpt

@@ -1,9 +1,9 @@
 --TEST--
-Test for complex parameters to a function (= PHP 7.0)
+Test for complex parameters to a function (< PHP 7.1)
 --SKIPIF--
 <?php
-if (!version_compare(phpversion(), "7.0", '>=')) echo "skip = PHP 7.0 needed\n";
-if (!version_compare(phpversion(), "7.1", '<')) echo "skip = PHP 7.0 needed\n";
+require __DIR__ . '/utils.inc';
+check_reqs('PHP < 7.1');
 ?>
 --INI--
 xdebug.default_enable=1