Skip to content

Commit

Permalink
Merge branch 'xdebug_2_1'
Browse files Browse the repository at this point in the history
  • Loading branch information
derickr committed Feb 28, 2012
2 parents 2656908 + 55bc065 commit aea78a3
Show file tree
Hide file tree
Showing 2 changed files with 111 additions and 0 deletions.
49 changes: 49 additions & 0 deletions tests/bug00757a.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
--TEST--
Test for bug #757: XDEBUG_CC_UNUSED does not work with code outside a function.
--INI--
xdebug.default_enable=1
xdebug.overload_var_dump=0
xdebug.auto_trace=0
xdebug.trace_options=0
xdebug.trace_output_dir=/tmp
xdebug.collect_params=1
xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.profiler_enable=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.extended_info=1
--FILE--
<?php
xdebug_start_code_coverage(XDEBUG_CC_UNUSED);

$x = 1;
if ($x) {
$y = 2;
} else {
$y = 3;
}
echo $y, "\n";

$cc = xdebug_get_code_coverage();
xdebug_stop_code_coverage();
var_dump($cc[__FILE__]);
?>
--EXPECT--
2
array(6) {
[4]=>
int(1)
[5]=>
int(1)
[6]=>
int(1)
[7]=>
int(1)
[10]=>
int(1)
[12]=>
int(1)
}
62 changes: 62 additions & 0 deletions tests/bug00757b.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
--TEST--
Test for bug #757: XDEBUG_CC_UNUSED does not work with code outside a function.
--INI--
xdebug.default_enable=1
xdebug.overload_var_dump=0
xdebug.auto_trace=0
xdebug.trace_options=0
xdebug.trace_output_dir=/tmp
xdebug.collect_params=1
xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.profiler_enable=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.extended_info=1
--FILE--
<?php
xdebug_start_code_coverage(XDEBUG_CC_UNUSED);

function f()
{
$x = 1;
if ($x) {
$y = 2;
} else {
$y = 3;
}
echo $y, "\n";
}

f();

$cc = xdebug_get_code_coverage();
xdebug_stop_code_coverage();
var_dump($cc[__FILE__]);
?>
--EXPECT--
2
array(10) {
[4]=>
int(1)
[6]=>
int(1)
[7]=>
int(1)
[8]=>
int(1)
[9]=>
int(1)
[10]=>
int(-1)
[12]=>
int(1)
[13]=>
int(1)
[15]=>
int(1)
[17]=>
int(1)
}

0 comments on commit aea78a3

Please sign in to comment.