Skip to content

Commit 1cb15ab

Browse files
derickrderickr
committed
Merged pull request xdebug#718 
2 parents 270625d + 3976eb2 commit 1cb15ab

25 files changed

+387
-41
lines changed

‎src/base/base.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1128,8 +1128,9 @@ void xdebug_base_post_deactivate()
11281128
}
11291129

11301130
/* filters */
1131-
xdebug_llist_destroy(XG_BASE(filters_tracing), NULL);
11321131
xdebug_llist_destroy(XG_BASE(filters_code_coverage), NULL);
1132+
xdebug_llist_destroy(XG_BASE(filters_stack), NULL);
1133+
xdebug_llist_destroy(XG_BASE(filters_tracing), NULL);
11331134
XG_BASE(filters_tracing) = NULL;
11341135
XG_BASE(filters_code_coverage) = NULL;
11351136

‎src/debugger/com.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -570,6 +570,7 @@ static int xdebug_handle_start_session()
570570
{
571571
int activate_session = 0;
572572
zval *dummy;
573+
char *dummy_env;
573574

574575
/* Set session cookie if requested */
575576
if (
@@ -586,6 +587,16 @@ static int xdebug_handle_start_session()
586587
xdebug_update_ide_key(Z_STRVAL_P(dummy));
587588

588589
xdebug_setcookie("XDEBUG_SESSION", sizeof("XDEBUG_SESSION") - 1, Z_STRVAL_P(dummy), Z_STRLEN_P(dummy), time(NULL) + XDEBUG_COOKIE_EXPIRE_TIME, "/", 1, NULL, 0, 0, 1, 0);
590+
activate_session = 1;
591+
} else if (
592+
(dummy_env = getenv("XDEBUG_SESSION_START")) != NULL
593+
) {
594+
xdebug_update_ide_key(dummy_env);
595+
596+
if (!SG(headers_sent)) {
597+
xdebug_setcookie("XDEBUG_SESSION", sizeof("XDEBUG_SESSION") - 1, XG_DBG(ide_key), strlen(XG_DBG(ide_key)), time(NULL) + XDEBUG_COOKIE_EXPIRE_TIME, "/", 1, NULL, 0, 0, 1, 0);
598+
}
599+
589600
activate_session = 1;
590601
} else if (
591602
(dummy = zend_hash_str_find(Z_ARR(PG(http_globals)[TRACK_VARS_COOKIE]), "XDEBUG_SESSION", sizeof("XDEBUG_SESSION") - 1)) != NULL

‎src/lib/lib.c

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -289,9 +289,14 @@ int xdebug_lib_start_upon_error(void)
289289
}
290290

291291

292-
static zval *find_in_globals(const char *element)
292+
static const char *find_in_globals(const char *element)
293293
{
294294
zval *trigger_val = NULL;
295+
const char *env_value = getenv(element);
296+
297+
if (env_value) {
298+
return env_value;
299+
}
295300

296301
if (
297302
(
@@ -304,7 +309,7 @@ static zval *find_in_globals(const char *element)
304309
(trigger_val = zend_hash_str_find(Z_ARR(PG(http_globals)[TRACK_VARS_COOKIE]), element, strlen(element))) != NULL
305310
)
306311
) {
307-
return trigger_val;
312+
return Z_STRVAL_P(trigger_val);
308313
}
309314

310315
return NULL;
@@ -313,13 +318,13 @@ static zval *find_in_globals(const char *element)
313318
static int trigger_enabled(int for_mode, char **found_trigger_value)
314319
{
315320
char *shared_secret = XINI_LIB(trigger_value);
316-
zval *z_found_trigger_value = NULL;
321+
const char *trigger_value = NULL;
317322

318323
/* First we check for the generic 'XDEBUG_TRIGGER' option */
319-
z_found_trigger_value = find_in_globals("XDEBUG_TRIGGER");
324+
trigger_value = find_in_globals("XDEBUG_TRIGGER");
320325

321326
/* If not found, we fall back to the per-mode name for backwards compatibility reasons */
322-
if (!z_found_trigger_value) {
327+
if (!trigger_value) {
323328
const char *fallback_name = NULL;
324329

325330
if (XDEBUG_MODE_IS(XDEBUG_MODE_PROFILING) && (for_mode == XDEBUG_MODE_PROFILING)) {
@@ -331,11 +336,11 @@ static int trigger_enabled(int for_mode, char **found_trigger_value)
331336
}
332337

333338
if (fallback_name) {
334-
z_found_trigger_value = find_in_globals(fallback_name);
339+
trigger_value = find_in_globals(fallback_name);
335340
}
336341
}
337342

338-
if (!z_found_trigger_value) {
343+
if (!trigger_value) {
339344
if (found_trigger_value != NULL) {
340345
*found_trigger_value = NULL;
341346
}
@@ -346,16 +351,16 @@ static int trigger_enabled(int for_mode, char **found_trigger_value)
346351
* triggers */
347352
if (shared_secret == NULL || shared_secret[0] == '\0') {
348353
if (found_trigger_value != NULL) {
349-
*found_trigger_value = xdstrdup(Z_STRVAL_P(z_found_trigger_value));
354+
*found_trigger_value = xdstrdup(trigger_value);
350355
}
351356
return 1;
352357
}
353358

354359
/* Check if the configured trigger value matches the one found in the
355360
* trigger element */
356-
if (strcmp(shared_secret, Z_STRVAL_P(z_found_trigger_value)) == 0) {
361+
if (strcmp(shared_secret, trigger_value) == 0) {
357362
if (found_trigger_value != NULL) {
358-
*found_trigger_value = xdstrdup(Z_STRVAL_P(z_found_trigger_value));
363+
*found_trigger_value = xdstrdup(trigger_value);
359364
}
360365
return 1;
361366
}

‎tests/debugger/start_with_request_default_session.phpt renamed to ‎tests/debugger/start_with_request_default_session-001.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Starting Debugger: default, XDEBUG_SESSION
2+
Starting Debugger: default, XDEBUG_SESSION [1]
33
--ENV--
44
XDEBUG_SESSION=sessionName
55
--FILE--
@@ -9,7 +9,7 @@ require 'dbgp/dbgpclient.php';
99
dbgpRunFile(
1010
dirname(__FILE__) . '/empty-echo.inc',
1111
['step_into', 'step_into', 'property_get -n $e', 'detach'],
12-
['xdebug.mode' => 'debug', 'xdebug.start_with_request' => 'default']
12+
['xdebug.mode' => 'debug', 'xdebug.start_with_request' => 'default', 'variables_order' => 'PGCS']
1313
);
1414
?>
1515
--EXPECTF--

‎tests/debugger/start_with_request_default_session-002.phpt

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
--TEST--
2+
Starting Debugger: default, XDEBUG_SESSION [2]
3+
--ENV--
4+
XDEBUG_SESSION=sessionName
5+
--FILE--
6+
<?php
7+
require 'dbgp/dbgpclient.php';
8+
9+
dbgpRunFile(
10+
dirname(__FILE__) . '/empty-echo.inc',
11+
['step_into', 'step_into', 'property_get -n $e', 'detach'],
12+
['xdebug.mode' => 'debug', 'xdebug.start_with_request' => 'default', 'variables_order' => 'EPGCS']
13+
);
14+
?>
15+
--EXPECTF--
16+
<?xml version="1.0" encoding="iso-8859-1"?>
17+
<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" fileuri="file://empty-echo.inc" language="PHP" xdebug:language_version="" protocol_version="1.0" appid="" idekey="sessionName"><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>
18+
19+
-> step_into -i 1
20+
<?xml version="1.0" encoding="iso-8859-1"?>
21+
<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="step_into" transaction_id="1" status="break" reason="ok"><xdebug:message filename="file://empty-echo.inc" lineno="2"></xdebug:message></response>
22+
23+
-> step_into -i 2
24+
<?xml version="1.0" encoding="iso-8859-1"?>
25+
<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="step_into" transaction_id="2" status="break" reason="ok"><xdebug:message filename="file://empty-echo.inc" lineno="3"></xdebug:message></response>
26+
27+
-> property_get -i 3 -n $e
28+
<?xml version="1.0" encoding="iso-8859-1"?>
29+
<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="property_get" transaction_id="3"><property name="$e" fullname="$e" type="array" children="0" numchildren="0" page="0" pagesize="32"></property></response>
30+
31+
-> detach -i 4
32+
<?xml version="1.0" encoding="iso-8859-1"?>
33+
<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="detach" transaction_id="4" status="stopping" reason="ok"></response>

‎tests/debugger/start_with_request_default_session_start.phpt renamed to ‎tests/debugger/start_with_request_default_session_start-001.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Starting Debugger: default, XDEBUG_SESSION_START
2+
Starting Debugger: default, XDEBUG_SESSION_START [1]
33
--ENV--
44
XDEBUG_SESSION_START=foobar
55
--FILE--
@@ -9,7 +9,7 @@ require 'dbgp/dbgpclient.php';
99
dbgpRunFile(
1010
dirname(__FILE__) . '/empty-echo.inc',
1111
['step_into', 'step_into', 'property_get -n $e', 'detach'],
12-
['xdebug.mode' => 'debug', 'xdebug.start_with_request' => 'default']
12+
['xdebug.mode' => 'debug', 'xdebug.start_with_request' => 'default', 'variables_order' => 'PGCS']
1313
);
1414
?>
1515
--EXPECTF--

‎tests/debugger/start_with_request_default_session_start-002.phpt

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
--TEST--
2+
Starting Debugger: default, XDEBUG_SESSION_START [2]
3+
--ENV--
4+
XDEBUG_SESSION_START=foobar
5+
--FILE--
6+
<?php
7+
require 'dbgp/dbgpclient.php';
8+
9+
dbgpRunFile(
10+
dirname(__FILE__) . '/empty-echo.inc',
11+
['step_into', 'step_into', 'property_get -n $e', 'detach'],
12+
['xdebug.mode' => 'debug', 'xdebug.start_with_request' => 'default', 'variables_order' => 'EPGCS']
13+
);
14+
?>
15+
--EXPECTF--
16+
<?xml version="1.0" encoding="iso-8859-1"?>
17+
<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" fileuri="file://empty-echo.inc" language="PHP" xdebug:language_version="" protocol_version="1.0" appid="" idekey="foobar"><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>
18+
19+
-> step_into -i 1
20+
<?xml version="1.0" encoding="iso-8859-1"?>
21+
<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="step_into" transaction_id="1" status="break" reason="ok"><xdebug:message filename="file://empty-echo.inc" lineno="2"></xdebug:message></response>
22+
23+
-> step_into -i 2
24+
<?xml version="1.0" encoding="iso-8859-1"?>
25+
<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="step_into" transaction_id="2" status="break" reason="ok"><xdebug:message filename="file://empty-echo.inc" lineno="3"></xdebug:message></response>
26+
27+
-> property_get -i 3 -n $e
28+
<?xml version="1.0" encoding="iso-8859-1"?>
29+
<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="property_get" transaction_id="3"><property name="$e" fullname="$e" type="array" children="1" numchildren="1" page="0" pagesize="32"><property name="0" fullname="$e[0]" type="string" size="%d" encoding="base64"><![CDATA[U2V0LUNvb2tpZTogWERFQlVHX1NFU1NJT049Zm9vYmFyOyBleHBp%s]]></property></property></response>
30+
31+
-> detach -i 4
32+
<?xml version="1.0" encoding="iso-8859-1"?>
33+
<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="detach" transaction_id="4" status="stopping" reason="ok"></response>

‎tests/debugger/start_with_request_trigger_session.phpt renamed to ‎tests/debugger/start_with_request_trigger_session-001.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Starting Debugger: trigger, XDEBUG_SESSION
2+
Starting Debugger: trigger, XDEBUG_SESSION [1]
33
--ENV--
44
XDEBUG_SESSION=sessionName
55
--FILE--
@@ -9,7 +9,7 @@ require 'dbgp/dbgpclient.php';
99
dbgpRunFile(
1010
dirname(__FILE__) . '/empty-echo.inc',
1111
['step_into', 'step_into', 'property_get -n $e', 'detach'],
12-
['xdebug.mode' => 'debug', 'xdebug.start_with_request' => 'trigger']
12+
['xdebug.mode' => 'debug', 'xdebug.start_with_request' => 'trigger', 'variables_order' => 'PGCS']
1313
);
1414
?>
1515
--EXPECT--

‎tests/debugger/start_with_request_trigger_session-002.phpt

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
--TEST--
2+
Starting Debugger: trigger, XDEBUG_SESSION [2]
3+
--ENV--
4+
XDEBUG_SESSION=sessionName
5+
--FILE--
6+
<?php
7+
require 'dbgp/dbgpclient.php';
8+
9+
dbgpRunFile(
10+
dirname(__FILE__) . '/empty-echo.inc',
11+
['step_into', 'step_into', 'property_get -n $e', 'detach'],
12+
['xdebug.mode' => 'debug', 'xdebug.start_with_request' => 'trigger', 'variables_order' => 'EPGCS']
13+
);
14+
?>
15+
--EXPECT--
16+
<?xml version="1.0" encoding="iso-8859-1"?>
17+
<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" fileuri="file://empty-echo.inc" language="PHP" xdebug:language_version="" protocol_version="1.0" appid="" idekey="sessionName"><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>
18+
19+
-> step_into -i 1
20+
<?xml version="1.0" encoding="iso-8859-1"?>
21+
<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="step_into" transaction_id="1" status="break" reason="ok"><xdebug:message filename="file://empty-echo.inc" lineno="2"></xdebug:message></response>
22+
23+
-> step_into -i 2
24+
<?xml version="1.0" encoding="iso-8859-1"?>
25+
<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="step_into" transaction_id="2" status="break" reason="ok"><xdebug:message filename="file://empty-echo.inc" lineno="3"></xdebug:message></response>
26+
27+
-> property_get -i 3 -n $e
28+
<?xml version="1.0" encoding="iso-8859-1"?>
29+
<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="property_get" transaction_id="3"><property name="$e" fullname="$e" type="array" children="0" numchildren="0" page="0" pagesize="32"></property></response>
30+
31+
-> detach -i 4
32+
<?xml version="1.0" encoding="iso-8859-1"?>
33+
<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="detach" transaction_id="4" status="stopping" reason="ok"></response>

‎tests/debugger/start_with_request_trigger_session_start.phpt renamed to ‎tests/debugger/start_with_request_trigger_session_start-001.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Starting Debugger: trigger, XDEBUG_SESSION_START
2+
Starting Debugger: trigger, XDEBUG_SESSION_START [1]
33
--ENV--
44
XDEBUG_SESSION_START=foobar
55
--FILE--
@@ -9,7 +9,7 @@ require 'dbgp/dbgpclient.php';
99
dbgpRunFile(
1010
dirname(__FILE__) . '/empty-echo.inc',
1111
['step_into', 'step_into', 'property_get -n $e', 'detach'],
12-
['xdebug.mode' => 'debug', 'xdebug.start_with_request' => 'trigger']
12+
['xdebug.mode' => 'debug', 'xdebug.start_with_request' => 'trigger', 'variables_order' => 'PGCS']
1313
);
1414
?>
1515
--EXPECTF--

‎tests/debugger/start_with_request_trigger_session_start-002.phpt

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
--TEST--
2+
Starting Debugger: trigger, XDEBUG_SESSION_START [2]
3+
--ENV--
4+
XDEBUG_SESSION_START=foobar
5+
--FILE--
6+
<?php
7+
require 'dbgp/dbgpclient.php';
8+
9+
dbgpRunFile(
10+
dirname(__FILE__) . '/empty-echo.inc',
11+
['step_into', 'step_into', 'property_get -n $e', 'detach'],
12+
['xdebug.mode' => 'debug', 'xdebug.start_with_request' => 'trigger', 'variables_order' => 'EPGCS']
13+
);
14+
?>
15+
--EXPECTF--
16+
<?xml version="1.0" encoding="iso-8859-1"?>
17+
<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" fileuri="file://empty-echo.inc" language="PHP" xdebug:language_version="" protocol_version="1.0" appid="" idekey="foobar"><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>
18+
19+
-> step_into -i 1
20+
<?xml version="1.0" encoding="iso-8859-1"?>
21+
<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="step_into" transaction_id="1" status="break" reason="ok"><xdebug:message filename="file://empty-echo.inc" lineno="2"></xdebug:message></response>
22+
23+
-> step_into -i 2
24+
<?xml version="1.0" encoding="iso-8859-1"?>
25+
<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="step_into" transaction_id="2" status="break" reason="ok"><xdebug:message filename="file://empty-echo.inc" lineno="3"></xdebug:message></response>
26+
27+
-> property_get -i 3 -n $e
28+
<?xml version="1.0" encoding="iso-8859-1"?>
29+
<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="property_get" transaction_id="3"><property name="$e" fullname="$e" type="array" children="1" numchildren="1" page="0" pagesize="32"><property name="0" fullname="$e[0]" type="string" size="%d" encoding="base64"><![CDATA[U2V0LUNvb2tpZTogWERFQlVHX1NFU1NJT049Zm9vYmFyOyBleHBp%s]]></property></property></response>
30+
31+
-> detach -i 4
32+
<?xml version="1.0" encoding="iso-8859-1"?>
33+
<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="detach" transaction_id="4" status="stopping" reason="ok"></response>

‎tests/debugger/start_with_request_trigger_session_start_and_session.phpt renamed to ‎tests/debugger/start_with_request_trigger_session_start_and_session-001.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Starting Debugger: trigger, XDEBUG_SESSION_START and XDEBUG_SESSION
2+
Starting Debugger: trigger, XDEBUG_SESSION_START and XDEBUG_SESSION [1]
33
--ENV--
44
XDEBUG_SESSION=sessionName
55
XDEBUG_SESSION_START=sessionStartName
@@ -10,7 +10,7 @@ require 'dbgp/dbgpclient.php';
1010
dbgpRunFile(
1111
dirname(__FILE__) . '/empty-echo.inc',
1212
['step_into', 'step_into', 'property_get -n $e', 'detach'],
13-
['xdebug.mode' => 'debug', 'xdebug.start_with_request' => 'trigger']
13+
['xdebug.mode' => 'debug', 'xdebug.start_with_request' => 'trigger', 'variables_order' => 'PGCS']
1414
);
1515
?>
1616
--EXPECTF--

‎tests/debugger/start_with_request_trigger_session_start_and_session-002.phpt

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
--TEST--
2+
Starting Debugger: trigger, XDEBUG_SESSION_START and XDEBUG_SESSION [2]
3+
--ENV--
4+
XDEBUG_SESSION=sessionName
5+
XDEBUG_SESSION_START=sessionStartName
6+
--FILE--
7+
<?php
8+
require 'dbgp/dbgpclient.php';
9+
10+
dbgpRunFile(
11+
dirname(__FILE__) . '/empty-echo.inc',
12+
['step_into', 'step_into', 'property_get -n $e', 'detach'],
13+
['xdebug.mode' => 'debug', 'xdebug.start_with_request' => 'trigger', 'variables_order' => 'EPGCS']
14+
);
15+
?>
16+
--EXPECTF--
17+
<?xml version="1.0" encoding="iso-8859-1"?>
18+
<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" fileuri="file://empty-echo.inc" language="PHP" xdebug:language_version="" protocol_version="1.0" appid="" idekey="sessionStartName"><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>
19+
20+
-> step_into -i 1
21+
<?xml version="1.0" encoding="iso-8859-1"?>
22+
<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="step_into" transaction_id="1" status="break" reason="ok"><xdebug:message filename="file://empty-echo.inc" lineno="2"></xdebug:message></response>
23+
24+
-> step_into -i 2
25+
<?xml version="1.0" encoding="iso-8859-1"?>
26+
<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="step_into" transaction_id="2" status="break" reason="ok"><xdebug:message filename="file://empty-echo.inc" lineno="3"></xdebug:message></response>
27+
28+
-> property_get -i 3 -n $e
29+
<?xml version="1.0" encoding="iso-8859-1"?>
30+
<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="property_get" transaction_id="3"><property name="$e" fullname="$e" type="array" children="1" numchildren="1" page="0" pagesize="32"><property name="0" fullname="$e[0]" type="string" size="%d" encoding="base64"><![CDATA[U2V0LUNvb2tpZTogWERFQlVHX1NFU1NJT049c2Vzc2lvblN0YXJ0TmFtZTs%s]]></property></property></response>
31+
32+
-> detach -i 4
33+
<?xml version="1.0" encoding="iso-8859-1"?>
34+
<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="detach" transaction_id="4" status="stopping" reason="ok"></response>

‎tests/profiler/start_with_request_trigger_env.phpt renamed to ‎tests/profiler/start_with_request_trigger_env-001.phpt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
--TEST--
2-
Starting Profiler: trigger, environment
2+
Starting Profiler: trigger, environment [1]
33
--INI--
44
xdebug.mode=profile
55
xdebug.start_with_request=trigger
66
xdebug.collect_return=0
77
xdebug.collect_assignments=0
8+
variables_order=PGCS
89
--ENV--
910
XDEBUG_PROFILE=anything
1011
--FILE--
@@ -17,7 +18,7 @@ echo file_get_contents($fileName);
1718
--EXPECTF--
1819
version: 1
1920
creator: xdebug %d.%s (PHP %s)
20-
cmd: %sstart_with_request_trigger_env.php
21+
cmd: %sstart_with_request_trigger_env-001.php
2122
part: 1
2223
positions: line
2324

0 commit comments

Comments
 (0)