Merged pull request xdebug#603

Author: derickr

src/lib/var.c

@@ -180,7 +180,7 @@ char* xdebug_error_type(int type)
 zval *xdebug_get_zval_with_opline(zend_execute_data *zdata, const zend_op *opline, int node_type, const znode_op *node, int *is_var)
 {
 #if PHP_VERSION_ID >= 80000
-	return zend_get_zval_ptr(opline, node_type, node, zdata, BP_VAR_IS);
+	return zend_get_zval_ptr(opline, node_type, node, zdata);
 #else
 	zend_free_op should_free;
 

tests/coverage/bug00422.phpt

@@ -15,5 +15,5 @@ try {
 echo "END";
 ?>
 --EXPECTF--
-syntax error, unexpected 'new' (T_NEW)
+syntax error, unexpected%Snew%S
 END

tests/debugger/bug00990-002.phpt

@@ -20,7 +20,7 @@ $commands = array(
 
 dbgpRunFile( $filename, $commands );
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="iso-8859-1"?>
 <init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" fileuri="file://bug00990-002.inc" language="PHP" xdebug:language_version="" protocol_version="1.0" appid=""><engine version=""><![CDATA[Xdebug]]></engine><author><![CDATA[Derick Rethans]]></author><url><![CDATA[https://xdebug.org]]></url><copyright><![CDATA[Copyright (c) 2002-2099 by Derick Rethans]]></copyright></init>
 
@@ -38,7 +38,7 @@ dbgpRunFile( $filename, $commands );
 
 -> step_into -i 4
 <?xml version="1.0" encoding="iso-8859-1"?>
-<notify xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" name="error"><xdebug:message filename="file://bug00990-002.inc" lineno="3" type="Fatal error"><![CDATA[Uncaught Error: Class 'MyClass' not found]]></xdebug:message></notify>
+<notify xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" name="error"><xdebug:message filename="file://bug00990-002.inc" lineno="3" type="Fatal error"><![CDATA[Uncaught Error: Class %cMyClass%c not found]]></xdebug:message></notify>
 
 <?xml version="1.0" encoding="iso-8859-1"?>
 <response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="step_into" transaction_id="4" status="stopping" reason="ok"></response>

tests/debugger/bug00990-003.phpt

@@ -20,7 +20,7 @@ $commands = array(
 
 dbgpRunFile( $filename, $commands );
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="iso-8859-1"?>
 <init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" fileuri="file://bug00990-003.inc" language="PHP" xdebug:language_version="" protocol_version="1.0" appid=""><engine version=""><![CDATA[Xdebug]]></engine><author><![CDATA[Derick Rethans]]></author><url><![CDATA[https://xdebug.org]]></url><copyright><![CDATA[Copyright (c) 2002-2099 by Derick Rethans]]></copyright></init>
 
@@ -38,7 +38,7 @@ dbgpRunFile( $filename, $commands );
 
 -> step_into -i 4
 <?xml version="1.0" encoding="iso-8859-1"?>
-<notify xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" name="error"><xdebug:message filename="file://bug00990-003.inc" lineno="3" type="Fatal error"><![CDATA[Uncaught Error: Class 'MyClass' not found]]></xdebug:message></notify>
+<notify xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" name="error"><xdebug:message filename="file://bug00990-003.inc" lineno="3" type="Fatal error"><![CDATA[Uncaught Error: Class %cMyClass%c not found]]></xdebug:message></notify>
 
 <?xml version="1.0" encoding="iso-8859-1"?>
 <response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="step_into" transaction_id="4" status="stopping" reason="ok"></response>

tests/develop/bug01288.phpt

@@ -29,4 +29,4 @@ React_Exception: waa in %sbug01288.php on line 12
 
 Call Stack:
 %w%f %w%d   1. {main}() %sbug01288.php:0
-%w%f %w%d   2. {closure:%sbug01288.php:12-12}(8, 'Undefined index: SERVER_PROTOCOL', '%sbug01288.php', %s) %sbug01288.php:15
+%w%f %w%d   2. {closure:%sbug01288.php:12-12}(8, 'Undefined %SSERVER_PROTOCOL%S', '%sbug01288.php', %s) %sbug01288.php:15