Modified: xdebug/branches/xdebug_2_1/tests/array_map.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/array_map.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/array_map.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -30,8 +30,5 @@ array TRACE START [%d-%d-%d %d:%d:%d] %w%f %w%d -> array_map('strlen', array (0 => 'a', 1 => 'bb', 2 => 'ccc')) /%s/array_map.php:5 -%w%f %w%d -> strlen('a') /%s/array_map.php:0 -%w%f %w%d -> strlen('bb') /%s/array_map.php:0 -%w%f %w%d -> strlen('ccc') /%s/array_map.php:0 %w%f %w%d -> gettype(array (0 => 1, 1 => 2, 2 => 3)) /%s/array_map.php:7 %w%f %w%d -> file_get_contents('/tmp/%s') /%s/array_map.php:9 Modified: xdebug/branches/xdebug_2_1/tests/assignment-trace1.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/assignment-trace1.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/assignment-trace1.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -7,7 +7,7 @@ xdebug.trace_format=0 xdebug.collect_vars=1 xdebug.collect_params=4 -xdebug.collect_returns=0 +xdebug.collect_return=0 xdebug.collect_assignments=1 --FILE-- 42); - foo($array); + $a = foo($array); echo file_get_contents($tf); unlink($tf); Modified: xdebug/branches/xdebug_2_1/tests/bug00241.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/bug00241.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/bug00241.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -74,13 +74,13 @@ ["errno"]=> string(1) "8" ["string"]=> - string(22) "'Undefined index: FOO'" + string(2%d) "'Undefined index:%sFOO'" ["file"]=> string(%d) "'%sbug00241.php'" ["line"]=> string(2) "32" ["context"]=> - string(%d) "array ('GLOBALS' => ..., '_ENV' => array ('%s' => '%s', '%s' => '%s', ...), ...)" + string(%d) "array (%s)" } } [2]=> @@ -96,7 +96,7 @@ ["params"]=> array(1) { ["errno"]=> - string(4) "NULL" + string(%d) "%s } } [3]=> Modified: xdebug/branches/xdebug_2_1/tests/bug00334.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/bug00334.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/bug00334.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -14,18 +14,13 @@ xdebug_start_code_coverage(XDEBUG_CC_DEAD_CODE | XDEBUG_CC_UNUSED); // MUST be both code coverage options to cause problems include(dirname(__FILE__).'/bug00334.inc'); // File with problem in it. -var_dump(xdebug_get_code_coverage()); +$c = xdebug_get_code_coverage(); +ksort($c); +var_dump($c); xdebug_stop_code_coverage(); ?> --EXPECTF-- array(2) { - ["%sbug00334.php"]=> - array(2) { - [5]=> - int(1) - [6]=> - int(1) - } ["%sbug00334.inc"]=> array(3) { [5]=> @@ -35,4 +30,11 @@ [9]=> int(1) } + ["%sbug00334.php"]=> + array(2) { + [5]=> + int(1) + [6]=> + int(1) + } } Modified: xdebug/branches/xdebug_2_1/tests/bug00340.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/bug00340.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/bug00340.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -4,6 +4,7 @@ xdebug.default_enable=1 html_errors=1 xdebug.file_link_format= +xdebug.dump.GET= --FILE-- --EXPECTF-- Hi2 -Version: 2.1%s +Version: 2.%d%s File format: 2 TRACE START [%s] 2 2 1 %f %d Modified: xdebug/branches/xdebug_2_1/tests/bug00389.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/bug00389.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/bug00389.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -3,6 +3,7 @@ --INI-- log_errors=0 xdebug.default_enable=1 +xdebug.dump.GET= --FILE-- xpath("//page"); + + // Iterate through all 3 occurances of elements + foreach ($projectsIterator as $pageXML) + { + // Set a breakpoint somewhere inside this loop. + // You won't see any variables in the Local Variables panel until the second + // time through the loop. After that, they seem to work fine. + $currentPageXML= $pageXML; + $name = $currentPageXML["name"]; + echo $name . ' +'; + } +} + +iterateXML(); + Modified: xdebug/branches/xdebug_2_1/tests/bug00421.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/bug00421.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/bug00421.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -6,31 +6,8 @@ $file = dirname(__FILE__) . "/localvariables.xml"; -$data = <<<'NOWDOC' -xpath("//page"); +$data = file_get_contents( dirname(__FILE__) . '/bug00421.inc' ); - // Iterate through all 3 occurances of elements - foreach ($projectsIterator as $pageXML) - { - // Set a breakpoint somewhere inside this loop. - // You won't see any variables in the Local Variables panel until the second - // time through the loop. After that, they seem to work fine. - $currentPageXML= $pageXML; - $name = $currentPageXML["name"]; - echo $name . ' -'; - } -} - -iterateXML(); - -NOWDOC; - $commands = array( 'step_into', 'feature_set -n max_depth -v 2', Modified: xdebug/branches/xdebug_2_1/tests/bug00470.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/bug00470.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/bug00470.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -23,13 +23,13 @@ include 'bug00470.inc'; $cc = xdebug_get_code_coverage(); - array_shift($cc); - var_dump($cc); + ksort($cc); + var_dump(array_slice($cc, 0, 1)); new Ticket842; $cc = xdebug_get_code_coverage(); - array_shift($cc); - var_dump($cc); + ksort($cc); + var_dump(array_slice($cc, 0, 1)); xdebug_stop_code_coverage(false); ?> Modified: xdebug/branches/xdebug_2_1/tests/bug00472.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/bug00472.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/bug00472.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -23,8 +23,8 @@ include 'bug00472.inc'; $cc = xdebug_get_code_coverage(); - array_shift($cc); - var_dump($cc); + ksort($cc); + var_dump(array_slice($cc, 0, 1)); xdebug_stop_code_coverage(false); ?> Modified: xdebug/branches/xdebug_2_1/tests/bug00475.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/bug00475.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/bug00475.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -3,10 +3,10 @@ --FILE-- "Value", "example" => "value\0key" ); -var_dump( $a ); +\$a = array( "example\0key" => "Value", "example" => "value\0key" ); +var_dump( \$a ); NOWDOC; $commands = array( Modified: xdebug/branches/xdebug_2_1/tests/bug00476-2.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/bug00476-2.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/bug00476-2.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -4,6 +4,7 @@ --INI-- xdebug.default_enable=1 +xdebug.dump.GET= --FILE-- --INI-- xdebug.default_enable=1 +xdebug.dump.GET= --FILE-- arr = array( + 0 => array("some", "values"), + 1 => array("some", "more", "values") + ); + } +} + +class def extends abc { + private $arr; +} + +$o = new def; +echo "o: "; +var_dump($o); Modified: xdebug/branches/xdebug_2_1/tests/bug00494.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/bug00494.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/bug00494.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -3,27 +3,8 @@ --FILE-- arr = array( - 0 => array("some", "values"), - 1 => array("some", "more", "values") - ); - } -} +$data = file_get_contents(dirname(__FILE__) . '/bug00494.inc'); -class def extends abc { - private $arr; -} - -$o = new def; -echo "o: "; -var_dump($o); -NOWDOC; - $commands = array( 'step_into', 'breakpoint_set -t line -n 17', Modified: xdebug/branches/xdebug_2_1/tests/bug00515.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/bug00515.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/bug00515.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -22,8 +22,8 @@ include 'bug00515.inc'; $cc = xdebug_get_code_coverage(); - array_shift($cc); - var_dump($cc); + ksort($cc); + var_dump(array_slice($cc, 0, 1)); xdebug_stop_code_coverage(false); ?> Added: xdebug/branches/xdebug_2_1/tests/bug00530.inc =================================================================== --- xdebug/branches/xdebug_2_1/tests/bug00530.inc (rev 0) +++ xdebug/branches/xdebug_2_1/tests/bug00530.inc 2010-11-03 01:07:34 UTC (rev 3362) @@ -0,0 +1,21 @@ +b = 'b'; + $c = 'a' . 'b'; + } + // I hoover in nb over this $a + public function test($a) { + echo "a ist: " . $a; + } +} + +$a = 1; +$b = 2; +$c = new MyClass(); +$f = 3; +$c->test('gogo'); // this call*** +$c->test('gogo'); Modified: xdebug/branches/xdebug_2_1/tests/bug00530.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/bug00530.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/bug00530.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -5,30 +5,8 @@ --FILE-- b = 'b'; - $c = 'a' . 'b'; - } - // I hoover in nb over this $a - public function test($a) { - echo "a ist: " . $a; - } -} - -$a = 1; -$b = 2; -$c = new MyClass(); -$f = 3; -$c->test('gogo'); // this call*** -$c->test('gogo'); -NOWDOC; - $commands = array( 'step_into', 'breakpoint_set -t line -n 12', Modified: xdebug/branches/xdebug_2_1/tests/bug00538-2.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/bug00538-2.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/bug00538-2.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -47,7 +47,7 @@ ["params"]=> array(3) { ["param1"]=> - string(%d) "'%sxdebug'" + string(%d) "'%sxdebug%s'" ["param2"]=> string(16) "'candena\\a\\nb'" ["param3"]=> Added: xdebug/branches/xdebug_2_1/tests/bug00538.inc =================================================================== --- xdebug/branches/xdebug_2_1/tests/bug00538.inc (rev 0) +++ xdebug/branches/xdebug_2_1/tests/bug00538.inc 2010-11-03 01:07:34 UTC (rev 3362) @@ -0,0 +1,14 @@ + + --FILE-- => 4 %w%f %w%d -> strlen('views') %sbug00566-1.php:14 >=> 5 + >=> NULL %w%f %w%d -> loadMod($module = 'test') %sbug00566-1.php:18 %w%f %w%d -> strlen('test') %sbug00566-1.php:5 >=> 4 %w%f %w%d -> strlen('tests') %sbug00566-1.php:7 >=> 5 + >=> NULL %w%f %w%d -> loadMod($module = 'view') %sbug00566-1.php:19 %w%f %w%d -> strlen('view') %sbug00566-1.php:5 >=> 4 %w%f %w%d -> strlen('views') %sbug00566-1.php:7 >=> 5 + >=> NULL %w%f %w%d -> xdebug_stop_trace() %sbug00566-1.php:21 %w%f %w%d TRACE END [%d-%d-%d %d:%d:%d] Added: xdebug/branches/xdebug_2_1/tests/bug00566-2.inc =================================================================== --- xdebug/branches/xdebug_2_1/tests/bug00566-2.inc (rev 0) +++ xdebug/branches/xdebug_2_1/tests/bug00566-2.inc 2010-11-03 01:07:34 UTC (rev 3362) @@ -0,0 +1,19 @@ + -')) echo "skip Zend Engine 1 needed\n"; ?> ---INI-- -xdebug.default_enable=1 -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-- - ---EXPECTF-- -This is a YYYY-MM-DD format. -This is a YYYYMMDD HHii format. -array(12) { - [2]=> - int(1) - [4]=> - int(1) - [7]=> - int(1) - [8]=> - int(1) - [10]=> - int(1) - [11]=> - int(1) - [17]=> - int(1) - [18]=> - int(1) - [20]=> - int(1) - [21]=> - int(1) - [22]=> - int(1) - [25]=> - int(1) -} Deleted: xdebug/branches/xdebug_2_1/tests/coverage2-ze1.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/coverage2-ze1.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/coverage2-ze1.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -1,69 +0,0 @@ ---TEST-- -Test with Code Coverage with unused lines (ZE1) ---SKIPIF-- - -')) echo "skip Zend Engine 1 needed\n"; ?> ---INI-- -xdebug.default_enable=1 -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-- - ---EXPECTF-- -This is a YYYY-MM-DD format. -This is a YYYYMMDD HHii format. -array(%d) { - [2]=> - int(1) - [4]=> - int(1) - [5]=> - int(-1) - [6]=> - int(-1) - [7]=> - int(1) - [8]=> - int(1) - [9]=> - int(-1) - [10]=> - int(1) - [11]=> - int(1) - [12]=> - int(-1) - [14]=> - int(-1) - [17]=> - int(1) - [18]=> - int(1) - [20]=> - int(1) - [21]=> - int(1) - [22]=> - int(1) - [23]=> - int(-1) - [25]=> - int(1) -} Deleted: xdebug/branches/xdebug_2_1/tests/coverage3-ze1.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/coverage3-ze1.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/coverage3-ze1.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -1,71 +0,0 @@ ---TEST-- -Test with Code Coverage with unused lines (ZE1) ---SKIPIF-- - -')) echo "skip Zend Engine 1 needed\n"; ?> ---INI-- -xdebug.default_enable=1 -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-- - ---EXPECTF-- -array(1) { - ["%scoverage3-ze1.php"]=> - array(12) { - [2]=> - int(-1) - [4]=> - int(1) - [5]=> - int(-1) - [6]=> - int(-1) - [7]=> - int(-1) - [9]=> - int(-1) - [10]=> - int(-1) - [11]=> - int(1) - [12]=> - int(-1) - [13]=> - int(-1) - [17]=> - int(1) - [19]=> - int(1) - } -} Modified: xdebug/branches/xdebug_2_1/tests/coverage4.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/coverage4.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/coverage4.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -24,7 +24,9 @@ include 'coverage4.inc'; xdebug_stop_code_coverage(false); - var_dump(xdebug_get_code_coverage()); + $c = xdebug_get_code_coverage(); + ksort($c); + var_dump($c); ?> --EXPECTF-- array(2) { Modified: xdebug/branches/xdebug_2_1/tests/dbgp/dbgpclient.php =================================================================== --- xdebug/branches/xdebug_2_1/tests/dbgp/dbgpclient.php 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/dbgp/dbgpclient.php 2010-11-03 01:07:34 UTC (rev 3362) @@ -15,7 +15,7 @@ 2 => array( 'file', '/tmp/error-output.txt', 'a' ) ); - $cmd = "php -dxdebug.remote_autostart=1 -dxdebug.remote_port=9991 /tmp/xdebug-dbgp-test.php"; + $cmd = "php -dxdebug.remote_enable=1 -dxdebug.remote_autostart=1 -dxdebug.remote_port=9991 /tmp/xdebug-dbgp-test.php"; $cwd = dirname( __FILE__ ); $process = proc_open( $cmd, $descriptorspec, $pipes, $cwd ); Modified: xdebug/branches/xdebug_2_1/tests/local_vars_in_error.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/local_vars_in_error.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/local_vars_in_error.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -30,7 +30,7 @@ Variables in local scope (#2): - $d = class stdClass { } $a = 5 + $b = 6 $c = array (0 => 5, 1 => 36) - $b = 6 + $d = class stdClass { } Deleted: xdebug/branches/xdebug_2_1/tests/test14.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/test14.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/test14.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -1,44 +0,0 @@ ---TEST-- -Test for circular references (ZE1) ---SKIPIF-- - -=')) echo "skip Zend Engine 1 needed\n"; ?> ---INI-- -xdebug.enable=1 -xdebug.auto_trace=0 -report_memleaks=0 -xdebug.collect_params=1 -xdebug.collect_assignments=0 -xdebug.auto_profile=0 -xdebug.profiler_enable=0 -xdebug.trace_format=0 -xdebug.var_display_max_depth=3 ---FILE-- -a = &$this; - $this->b = &$this; - } - - } - - function bar($o) { - } - - $f = new foo(); - bar($f); - bar($f); - - echo file_get_contents($tf); - unlink($tf); -?> ---EXPECTF-- -TRACE START [%d-%d-%d %d:%d:%d] - %f %d -> foo->foo() /%s/test14.php:16 - %f %d -> bar(class foo { var $a = class foo { var $a = ...; var $b = ... }; var $b = class foo { var $a = ...; var $b = ... } }) /%s/test14.php:17 - %f %d -> bar(class foo { var $a = class foo { var $a = ...; var $b = ... }; var $b = class foo { var $a = ...; var $b = ... } }) /%s/test14.php:18 - %f %d -> file_get_contents('/tmp/%s') /%s/test14.php:20 Deleted: xdebug/branches/xdebug_2_1/tests/test16.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/test16.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/test16.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -1,49 +0,0 @@ ---TEST-- -Test for overloaded member functions / classes (ZE1) ---SKIPIF-- - -=')) echo "skip Zend Engine 1 needed\n"; ?> ---INI-- -xdebug.enable=1 -xdebug.auto_trace=0 -xdebug.auto_profile=0 -xdebug.profiler_enable=0 -xdebug.collect_params=1 -xdebug.collect_assignments=0 -xdebug.trace_format=0 ---FILE-- -func_a1(); - $B->func_b1(); - - echo file_get_contents($tf); - unlink($tf); -?> ---EXPECTF-- -TRACE START [%d-%d-%d %d:%d:%d] - %f %d -> b->func_a1() /%s/test16.php:25 - %f %d -> b->func_b1() /%s/test16.php:26 - %f %d -> file_get_contents('/tmp/%s') /%s/test16.php:28 Deleted: xdebug/branches/xdebug_2_1/tests/test20.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/test20.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/test20.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -1,33 +0,0 @@ ---TEST-- -Test for static method calls ---SKIPIF-- - -=')) echo "skip Zend Engine 1 needed\n"; ?> ---INI-- -xdebug.enable=1 -xdebug.auto_trace=0 -xdebug.collect_params=1 -xdebug.collect_return=0 -xdebug.collect_assignments=0 -xdebug.auto_profile=0 -xdebug.profiler_enable=0 -xdebug.trace_format=0 ---FILE-- - ---EXPECTF-- -test -TRACE START [%d-%d-%d %d:%d:%d] -%w%f %w%d -> db::query('test') /%s/test20.php:9 -%w%f %w%d -> file_get_contents('/tmp/%s') /%s/test20.php:11 Deleted: xdebug/branches/xdebug_2_1/tests/test6-ze1.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/test6-ze1.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/test6-ze1.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -1,48 +0,0 @@ ---TEST-- -Test for complex parameters to a function (ZE1) ---SKIPIF-- - -')) echo "skip Zend Engine 1 needed\n"; ?> ---INI-- -xdebug.default_enable=1 -xdebug.collect_params=1 -xdebug.dump_globals=0 -xdebug.show_local_vars=1 -xdebug.show_mem_delta=0 -xdebug.profiler_enable=0 -xdebug.var_display_max_depth=3 -xdebug.var_display_max_children=3 ---FILE-- - ---EXPECTF-- -Warning: Missing argument 3 for foo2()%sin /%s/test6-ze1.php on line 2 - -Call Stack: -%w%f %w%d 1. {main}() /%s/test6-ze1.php:0 -%w%f %w%d 2. foo2(long, array(1)) /%s/test6-ze1.php:7 - - -Variables in local scope (#2): - $a = 4 - $c = NULL - $b = array (0 => array (0 => 'blaat', 1 => 5, 2 => FALSE)) - - -Fatal error: Call to undefined function%sfoo() in /%s/test6-ze1.php on line 4 - -Call Stack: -%w%f %w%d 1. {main}() /%s/test6-ze1.php:0 -%w%f %w%d 2. foo2(long, array(1)) /%s/test6-ze1.php:7 - - -Variables in local scope (#2): - $a = 4 - $c = NULL - $b = array (0 => array (0 => 'blaat', 1 => 5, 2 => FALSE)) Modified: xdebug/branches/xdebug_2_1/tests/test6.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/test6.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/test6.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -31,8 +31,8 @@ Variables in local scope (#2): $a = 4 + $b = array (0 => array (0 => 'blaat', 1 => 5, 2 => FALSE)) $c = *uninitialized* - $b = array (0 => array (0 => 'blaat', 1 => 5, 2 => FALSE)) Fatal error: Call to undefined function%sfoo() in /%s/test6.php on line 4 @@ -44,5 +44,5 @@ Variables in local scope (#2): $a = 4 + $b = array (0 => array (0 => 'blaat', 1 => 5, 2 => FALSE)) $c = *uninitialized* - $b = array (0 => array (0 => 'blaat', 1 => 5, 2 => FALSE)) Deleted: xdebug/branches/xdebug_2_1/tests/test7.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/test7.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/test7.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -1,54 +0,0 @@ ---TEST-- -Test for class members ---SKIPIF-- - -=')) echo "skip Zend Engine 1 needed\n"; ?> ---INI-- -xdebug.enable=1 -xdebug.auto_trace=0 -xdebug.auto_profile=0 -xdebug.collect_params=1 -xdebug.collect_return=0 -xdebug.collect_assignments=0 -xdebug.profiler_enable=0 -xdebug.trace_format=0 ---FILE-- -a1(); - $b->b1(); - $a->a2(); - - echo file_get_contents($tf); - unlink($tf); -?> ---EXPECTF-- -TRACE START [%d-%d-%d %d:%d:%d] - %f %d -> aaa->a1() /%s/test7.php:27 - %f %d -> bbb->b1() /%s/test7.php:28 - %f %d -> aaa->a2() /%s/test7.php:29 - %f %d -> file_get_contents('/tmp/%s') /%s/test7.php:31 Deleted: xdebug/branches/xdebug_2_1/tests/test9.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/test9.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/test9.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -1,46 +0,0 @@ ---TEST-- -Test for nested static method calls (ZE1) ---SKIPIF-- - -=')) echo "skip Zend Engine 1 needed\n"; ?> ---INI-- -xdebug.enable=1 -xdebug.auto_trace=0 -xdebug.collect_params=1 -xdebug.collect_return=0 -xdebug.collect_assignments=0 -xdebug.auto_profile=0 -xdebug.profiler_enable=0 -xdebug.trace_format=0 ---FILE-- -query("insert blah '".DBHelper::quote("test's").DBHelper::quote("test's")."' blah"); -$db->query("insert blah ' blah"); -echo file_get_contents($tf); -unlink($tf); -?> ---EXPECTF-- -TRACE START [%d-%d-%d %d:%d:%d] - %f %d -> dbhelper::quote('test\'s') /%s/test9.php:18 - %f %d -> addslashes('test\'s') /%s/test9.php:6 - %f %d -> dbhelper::quote('test\'s') /%s/test9.php:18 - %f %d -> addslashes('test\'s') /%s/test9.php:6 - %f %d -> db->query('insert blah \'test\\\'stest\\\'s\' blah') /%s/test9.php:18 - %f %d -> db->query('insert blah \' blah') /%s/test9.php:19 - %f %d -> file_get_contents('/tmp/%s') /%s/test9.php:20 Modified: xdebug/branches/xdebug_2_1/tests/xdebug_var_dump_non_overload.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/xdebug_var_dump_non_overload.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/branches/xdebug_2_1/tests/xdebug_var_dump_non_overload.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -15,163 +15,25 @@ self = &$this; $this->timestamp = $ts === null ? time() : $ts; - $this->user_defined = ($ts !== null); - $this->date = date("Y-m-d H:i:s T", $this->timestamp); - $this->tm = getdate($this->timestamp); } } $ts1 = new TimeStuff(1092515106); var_dump($ts1); - ini_set('xdebug.overload_var_dump', 1); + ini_set('xdebug.overload_var_dump', 1); // has no effect, because it's INI_SYSTEM/INI_PERDIR var_dump($ts1); ?> ---EXPECT-- -object(TimeStuff)#1 (5) { - ["timestamp":"TimeStuff":private]=> +--EXPECTF-- +object(TimeStuff)#1 (1) { + ["timestamp%sprivat%s]=> int(1092515106) - ["user_defined":"TimeStuff":private]=> - bool(true) - ["self":"TimeStuff":private]=> - object(TimeStuff)#1 (5) { - ["timestamp":"TimeStuff":private]=> - int(1092515106) - ["user_defined":"TimeStuff":private]=> - bool(true) - ["self":"TimeStuff":private]=> - *RECURSION* - ["tm":protected]=> - array(11) { - ["seconds"]=> - int(6) - ["minutes"]=> - int(25) - ["hours"]=> - int(22) - ["mday"]=> - int(14) - ["wday"]=> - int(6) - ["mon"]=> - int(8) - ["year"]=> - int(2004) - ["yday"]=> - int(226) - ["weekday"]=> - string(8) "Saturday" - ["month"]=> - string(6) "August" - [0]=> - int(1092515106) - } - ["date"]=> - string(24) "2004-08-14 22:25:06 CEST" - } - ["tm":protected]=> - array(11) { - ["seconds"]=> - int(6) - ["minutes"]=> - int(25) - ["hours"]=> - int(22) - ["mday"]=> - int(14) - ["wday"]=> - int(6) - ["mon"]=> - int(8) - ["year"]=> - int(2004) - ["yday"]=> - int(226) - ["weekday"]=> - string(8) "Saturday" - ["month"]=> - string(6) "August" - [0]=> - int(1092515106) - } - ["date"]=> - string(24) "2004-08-14 22:25:06 CEST" } -object(TimeStuff)#1 (5) { - ["timestamp":"TimeStuff":private]=> +object(TimeStuff)#1 (1) { + ["timestamp%sprivat%s]=> int(1092515106) - ["user_defined":"TimeStuff":private]=> - bool(true) - ["self":"TimeStuff":private]=> - object(TimeStuff)#1 (5) { - ["timestamp":"TimeStuff":private]=> - int(1092515106) - ["user_defined":"TimeStuff":private]=> - bool(true) - ["self":"TimeStuff":private]=> - *RECURSION* - ["tm":protected]=> - array(11) { - ["seconds"]=> - int(6) - ["minutes"]=> - int(25) - ["hours"]=> - int(22) - ["mday"]=> - int(14) - ["wday"]=> - int(6) - ["mon"]=> - int(8) - ["year"]=> - int(2004) - ["yday"]=> - int(226) - ["weekday"]=> - string(8) "Saturday" - ["month"]=> - string(6) "August" - [0]=> - int(1092515106) - } - ["date"]=> - string(24) "2004-08-14 22:25:06 CEST" - } - ["tm":protected]=> - array(11) { - ["seconds"]=> - int(6) - ["minutes"]=> - int(25) - ["hours"]=> - int(22) - ["mday"]=> - int(14) - ["wday"]=> - int(6) - ["mon"]=> - int(8) - ["year"]=> - int(2004) - ["yday"]=> - int(226) - ["weekday"]=> - string(8) "Saturday" - ["month"]=> - string(6) "August" - [0]=> - int(1092515106) - } - ["date"]=> - string(24) "2004-08-14 22:25:06 CEST" } Deleted: xdebug/trunk/tests/bug00022-ze1.phpt =================================================================== --- xdebug/trunk/tests/bug00022-ze1.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/trunk/tests/bug00022-ze1.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -1,49 +0,0 @@ ---TEST-- -Test for segmentation fault with xdebug_get_function_stack() and collect_params=1. (ZE1) ---SKIPIF-- - -')) echo "skip Zend Engine 1 needed\n"; ?> ---INI-- -xdebug.enable=1 -xdebug.auto_trace=0 -xdebug.collect_params=1 -xdebug.collect_assignments=0 -xdebug.profiler_enable=0 ---FILE-- - ---EXPECTF-- -bararray(2) { - [0]=> - array(4) { - ["function"]=> - string(6) "{main}" - ["file"]=> - string(%d) "/%s/bug00022-ze1.php" - ["line"]=> - int(0) - ["params"]=> - array(0) { - } - } - [1]=> - array(4) { - ["function"]=> - string(3) "foo" - ["file"]=> - string(%d) "/%s/bug00022-ze1.php" - ["line"]=> - int(7) - ["params"]=> - array(1) { - [0]=> - string(5) "'bar'" - } - } -} Deleted: xdebug/trunk/tests/bug00032-ze1.phpt =================================================================== --- xdebug/trunk/tests/bug00032-ze1.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/trunk/tests/bug00032-ze1.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -1,56 +0,0 @@ ---TEST-- -Test for segmentation fault with unusual variables (ZE1) ---SKIPIF-- - -')) echo "skip Zend Engine 1 needed\n"; ?> ---INI-- -xdebug.default_enable=1 -xdebug.auto_trace=0 -xdebug.collect_params=1 -xdebug.collect_assignments=0 -xdebug.profiler_enable=0 -xdebug.show_local_vars=0 -xdebug.dump_globals=0 ---FILE-- - ---EXPECTF-- -foo -foo - -Notice: Array to string conversion in %sbug00032-ze1.php on line 8 - -Call Stack: - %f %d 1. {main}() %sbug00032-ze1.php:0 - - -Notice: Array to string conversion in %sbug00032-ze1.php on line 9 - -Call Stack: - %f %d 1. {main}() %sbug00032-ze1.php:0 - -foo - -Notice: Object to string conversion in %sbug00032-ze1.php on line 11 - -Call Stack: - %f %d 1. {main}() %sbug00032-ze1.php:0 - - -Notice: Object to string conversion in %sbug00032-ze1.php on line 12 - -Call Stack: - %f %d 1. {main}() %sbug00032-ze1.php:0 - -foo Deleted: xdebug/trunk/tests/bug00057-ze1.phpt =================================================================== --- xdebug/trunk/tests/bug00057-ze1.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/trunk/tests/bug00057-ze1.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -1,54 +0,0 @@ ---TEST-- -Test for bug #57: Crash with overloading functions (ZE1) ---SKIPIF-- - -')) echo "skip Zend Engine 1 needed\n"; ?> ---INI-- -xdebug.default_enable=1 -xdebug.auto_trace=0 -xdebug.collect_params=1 -xdebug.collect_return=0 -xdebug.collect_assignments=0 -xdebug.show_mem_delta=0 -xdebug.profiler_enable=0 -xdebug.show_local_vars=0 -xdebug.dump_globals=0 ---FILE-- - 9, 'c' => 42); - - // Callback method for executing a method - function __call($function, $params) - { - echo strlen($params[0]); - } -} - -// Here we overload the OO object -overload('OO'); - -$o = new OO; - -echo $o->foo('80'); - -?> ---EXPECTF-- -Notice: Undefined offset: 0 in /%s/bug00057-ze1.php on line 9 - -Call Stack: - %f %d 1. {main}() /%s/bug00057-ze1.php:0 - %f %d 2. oo->__call(string(2), array(0), null) /%s/bug00057-ze1.php:0 - -0 -Warning: Call to undefined method oo::oo() in /%s/bug00057-ze1.php on line 16 - -Call Stack: - %f %d 1. {main}() /%s/bug00057-ze1.php:0 - -2 -Warning: Call to undefined method oo::foo() in /%s/bug00057-ze1.php on line 18 - -Call Stack: - %f %d 1. {main}() /%s/bug00057-ze1.php:0 Deleted: xdebug/trunk/tests/bug00212a-ze1.phpt =================================================================== --- xdebug/trunk/tests/bug00212a-ze1.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/trunk/tests/bug00212a-ze1.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -1,40 +0,0 @@ ---TEST-- -Test for bug #212: coverage coverage inaccurate (ZE1). ---SKIPIF-- - -')) echo "skip Zend Engine 1 needed\n"; ?> ---INI-- -xdebug.default_enable=1 -xdebug.auto_trace=0 -xdebug.trace_options=0 -xdebug.trace_output_dir=/tmp -xdebug.collect_params=1 -xdebug.collect_return=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-- - ---EXPECT-- -array(5) { - [5]=> - int(1) - [7]=> - int(1) - [9]=> - int(1) - [10]=> - int(-1) - [12]=> - int(1) -} Modified: xdebug/trunk/tests/bug00212a.phpt =================================================================== --- xdebug/trunk/tests/bug00212a.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/trunk/tests/bug00212a.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -16,6 +16,7 @@ xdebug.show_mem_delta=0 xdebug.trace_format=0 xdebug.extended_info=1 +xdebug.coverage_enable=1 --FILE-- --EXPECTF-- array(2) { - ["%sbug00334.php"]=> - array(2) { - [5]=> - int(1) - [6]=> - int(1) - } ["%sbug00334.inc"]=> array(3) { [5]=> @@ -35,4 +30,11 @@ [9]=> int(1) } + ["%sbug00334.php"]=> + array(2) { + [5]=> + int(1) + [6]=> + int(1) + } } Modified: xdebug/trunk/tests/bug00470.phpt =================================================================== --- xdebug/trunk/tests/bug00470.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/trunk/tests/bug00470.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -23,13 +23,13 @@ include 'bug00470.inc'; $cc = xdebug_get_code_coverage(); - array_shift($cc); - var_dump($cc); + ksort($cc); + var_dump(array_slice($cc, 0, 1)); new Ticket842; $cc = xdebug_get_code_coverage(); - array_shift($cc); - var_dump($cc); + ksort($cc); + var_dump(array_slice($cc, 0, 1)); xdebug_stop_code_coverage(false); ?> Modified: xdebug/trunk/tests/bug00472.phpt =================================================================== --- xdebug/trunk/tests/bug00472.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/trunk/tests/bug00472.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -17,14 +17,15 @@ xdebug.show_mem_delta=0 xdebug.trace_format=0 xdebug.extended_info=1 +xdebug.coverage_enable=1 --FILE-- Modified: xdebug/trunk/tests/bug00515.phpt =================================================================== --- xdebug/trunk/tests/bug00515.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/trunk/tests/bug00515.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -16,14 +16,15 @@ xdebug.show_mem_delta=0 xdebug.trace_format=0 xdebug.extended_info=1 +xdebug.coverage_enable=1 --FILE-- Deleted: xdebug/trunk/tests/coverage-ze1.phpt =================================================================== --- xdebug/trunk/tests/coverage-ze1.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/trunk/tests/coverage-ze1.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -1,57 +0,0 @@ ---TEST-- -Test with Code Coverage (ZE1) ---SKIPIF-- - -')) echo "skip Zend Engine 1 needed\n"; ?> ---INI-- -xdebug.default_enable=1 -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-- - ---EXPECTF-- -This is a YYYY-MM-DD format. -This is a YYYYMMDD HHii format. -array(12) { - [2]=> - int(1) - [4]=> - int(1) - [7]=> - int(1) - [8]=> - int(1) - [10]=> - int(1) - [11]=> - int(1) - [17]=> - int(1) - [18]=> - int(1) - [20]=> - int(1) - [21]=> - int(1) - [22]=> - int(1) - [25]=> - int(1) -} Deleted: xdebug/trunk/tests/coverage2-ze1.phpt =================================================================== --- xdebug/trunk/tests/coverage2-ze1.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/trunk/tests/coverage2-ze1.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -1,69 +0,0 @@ ---TEST-- -Test with Code Coverage with unused lines (ZE1) ---SKIPIF-- - -')) echo "skip Zend Engine 1 needed\n"; ?> ---INI-- -xdebug.default_enable=1 -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-- - ---EXPECTF-- -This is a YYYY-MM-DD format. -This is a YYYYMMDD HHii format. -array(%d) { - [2]=> - int(1) - [4]=> - int(1) - [5]=> - int(-1) - [6]=> - int(-1) - [7]=> - int(1) - [8]=> - int(1) - [9]=> - int(-1) - [10]=> - int(1) - [11]=> - int(1) - [12]=> - int(-1) - [14]=> - int(-1) - [17]=> - int(1) - [18]=> - int(1) - [20]=> - int(1) - [21]=> - int(1) - [22]=> - int(1) - [23]=> - int(-1) - [25]=> - int(1) -} Deleted: xdebug/trunk/tests/coverage3-ze1.phpt =================================================================== --- xdebug/trunk/tests/coverage3-ze1.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/trunk/tests/coverage3-ze1.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -1,71 +0,0 @@ ---TEST-- -Test with Code Coverage with unused lines (ZE1) ---SKIPIF-- - -')) echo "skip Zend Engine 1 needed\n"; ?> ---INI-- -xdebug.default_enable=1 -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-- - ---EXPECTF-- -array(1) { - ["%scoverage3-ze1.php"]=> - array(12) { - [2]=> - int(-1) - [4]=> - int(1) - [5]=> - int(-1) - [6]=> - int(-1) - [7]=> - int(-1) - [9]=> - int(-1) - [10]=> - int(-1) - [11]=> - int(1) - [12]=> - int(-1) - [13]=> - int(-1) - [17]=> - int(1) - [19]=> - int(1) - } -} Modified: xdebug/trunk/tests/coverage4.phpt =================================================================== --- xdebug/trunk/tests/coverage4.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/trunk/tests/coverage4.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -24,7 +24,9 @@ include 'coverage4.inc'; xdebug_stop_code_coverage(false); - var_dump(xdebug_get_code_coverage()); + $c = xdebug_get_code_coverage(); + ksort($c); + var_dump($c); ?> --EXPECTF-- array(2) { Deleted: xdebug/trunk/tests/local_vars_in_error-ze1.phpt =================================================================== --- xdebug/trunk/tests/local_vars_in_error-ze1.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/trunk/tests/local_vars_in_error-ze1.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -1,36 +0,0 @@ ---TEST-- -Test with showing local variables on errors (ZE1) ---SKIPIF-- - -')) echo "skip Zend Engine 1 needed\n"; ?> ---INI-- -xdebug.default_enable=1 -xdebug.auto_trace=0 -xdebug.collect_params=1 -xdebug.auto_profile=0 -xdebug.profiler_enable=0 -xdebug.dump_globals=0 -xdebug.show_local_vars=1 ---FILE-- - ---EXPECTF-- -Fatal error: Call to undefined function: do_f() in /%s/local_vars_in_error-ze1.php on line 5 - -Call Stack: - %f %d 1. {main}() /%s/local_vars_in_error-ze1.php:0 - %f %d 2. a(long, long) /%s/local_vars_in_error-ze1.php:8 - - -Variables in local scope (#2): - $d = class stdClass { } - $a = 5 - $c = array (0 => 5, 1 => 36) - $b = 6 Deleted: xdebug/trunk/tests/test10.phpt =================================================================== --- xdebug/trunk/tests/test10.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/trunk/tests/test10.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -1,45 +0,0 @@ ---TEST-- -Test for nested indirect function call ---SKIPIF-- - -=')) echo "skip Zend Engine 1 needed\n"; ?> ---INI-- -xdebug.enable=1 -xdebug.auto_trace=0 -xdebug.collect_params=1 -xdebug.collect_return=0 -xdebug.collect_assignments=0 -xdebug.auto_profile=0 -xdebug.profiler_enable=0 -xdebug.trace_format=0 ---FILE-- - ---EXPECTF-- -TRACE START [%d-%d-%d %d:%d:%d] - %f %d -> d::c('blah') /%s/test10.php:19 - %f %d -> d::a('c') /%s/test10.php:19 - %f %d -> d::b('a') /%s/test10.php:19 - %f %d -> d::a('b') /%s/test10.php:19 - %f %d -> blaat('insert blah \'a') /%s/test10.php:19 - %f %d -> file_get_contents('/tmp/%s') /%s/test10.php:20 Deleted: xdebug/trunk/tests/test14.phpt =================================================================== --- xdebug/trunk/tests/test14.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/trunk/tests/test14.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -1,44 +0,0 @@ ---TEST-- -Test for circular references (ZE1) ---SKIPIF-- - -=')) echo "skip Zend Engine 1 needed\n"; ?> ---INI-- -xdebug.enable=1 -xdebug.auto_trace=0 -report_memleaks=0 -xdebug.collect_params=1 -xdebug.collect_assignments=0 -xdebug.auto_profile=0 -xdebug.profiler_enable=0 -xdebug.trace_format=0 -xdebug.var_display_max_depth=3 ---FILE-- -a = &$this; - $this->b = &$this; - } - - } - - function bar($o) { - } - - $f = new foo(); - bar($f); - bar($f); - - echo file_get_contents($tf); - unlink($tf); -?> ---EXPECTF-- -TRACE START [%d-%d-%d %d:%d:%d] - %f %d -> foo->foo() /%s/test14.php:16 - %f %d -> bar(class foo { var $a = class foo { var $a = ...; var $b = ... }; var $b = class foo { var $a = ...; var $b = ... } }) /%s/test14.php:17 - %f %d -> bar(class foo { var $a = class foo { var $a = ...; var $b = ... }; var $b = class foo { var $a = ...; var $b = ... } }) /%s/test14.php:18 - %f %d -> file_get_contents('/tmp/%s') /%s/test14.php:20 Deleted: xdebug/trunk/tests/test16.phpt =================================================================== --- xdebug/trunk/tests/test16.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/trunk/tests/test16.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -1,49 +0,0 @@ ---TEST-- -Test for overloaded member functions / classes (ZE1) ---SKIPIF-- - -=')) echo "skip Zend Engine 1 needed\n"; ?> ---INI-- -xdebug.enable=1 -xdebug.auto_trace=0 -xdebug.auto_profile=0 -xdebug.profiler_enable=0 -xdebug.collect_params=1 -xdebug.collect_assignments=0 -xdebug.trace_format=0 ---FILE-- -func_a1(); - $B->func_b1(); - - echo file_get_contents($tf); - unlink($tf); -?> ---EXPECTF-- -TRACE START [%d-%d-%d %d:%d:%d] - %f %d -> b->func_a1() /%s/test16.php:25 - %f %d -> b->func_b1() /%s/test16.php:26 - %f %d -> file_get_contents('/tmp/%s') /%s/test16.php:28 Deleted: xdebug/trunk/tests/test20.phpt =================================================================== --- xdebug/trunk/tests/test20.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/trunk/tests/test20.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -1,33 +0,0 @@ ---TEST-- -Test for static method calls ---SKIPIF-- - -=')) echo "skip Zend Engine 1 needed\n"; ?> ---INI-- -xdebug.enable=1 -xdebug.auto_trace=0 -xdebug.collect_params=1 -xdebug.collect_return=0 -xdebug.collect_assignments=0 -xdebug.auto_profile=0 -xdebug.profiler_enable=0 -xdebug.trace_format=0 ---FILE-- - ---EXPECTF-- -test -TRACE START [%d-%d-%d %d:%d:%d] -%w%f %w%d -> db::query('test') /%s/test20.php:9 -%w%f %w%d -> file_get_contents('/tmp/%s') /%s/test20.php:11 Deleted: xdebug/trunk/tests/test6-ze1.phpt =================================================================== --- xdebug/trunk/tests/test6-ze1.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/trunk/tests/test6-ze1.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -1,48 +0,0 @@ ---TEST-- -Test for complex parameters to a function (ZE1) ---SKIPIF-- - -')) echo "skip Zend Engine 1 needed\n"; ?> ---INI-- -xdebug.default_enable=1 -xdebug.collect_params=1 -xdebug.dump_globals=0 -xdebug.show_local_vars=1 -xdebug.show_mem_delta=0 -xdebug.profiler_enable=0 -xdebug.var_display_max_depth=3 -xdebug.var_display_max_children=3 ---FILE-- - ---EXPECTF-- -Warning: Missing argument 3 for foo2()%sin /%s/test6-ze1.php on line 2 - -Call Stack: -%w%f %w%d 1. {main}() /%s/test6-ze1.php:0 -%w%f %w%d 2. foo2(long, array(1)) /%s/test6-ze1.php:7 - - -Variables in local scope (#2): - $a = 4 - $c = NULL - $b = array (0 => array (0 => 'blaat', 1 => 5, 2 => FALSE)) - - -Fatal error: Call to undefined function%sfoo() in /%s/test6-ze1.php on line 4 - -Call Stack: -%w%f %w%d 1. {main}() /%s/test6-ze1.php:0 -%w%f %w%d 2. foo2(long, array(1)) /%s/test6-ze1.php:7 - - -Variables in local scope (#2): - $a = 4 - $c = NULL - $b = array (0 => array (0 => 'blaat', 1 => 5, 2 => FALSE)) Deleted: xdebug/trunk/tests/test7.phpt =================================================================== --- xdebug/trunk/tests/test7.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/trunk/tests/test7.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -1,54 +0,0 @@ ---TEST-- -Test for class members ---SKIPIF-- - -=')) echo "skip Zend Engine 1 needed\n"; ?> ---INI-- -xdebug.enable=1 -xdebug.auto_trace=0 -xdebug.auto_profile=0 -xdebug.collect_params=1 -xdebug.collect_return=0 -xdebug.collect_assignments=0 -xdebug.profiler_enable=0 -xdebug.trace_format=0 ---FILE-- -a1(); - $b->b1(); - $a->a2(); - - echo file_get_contents($tf); - unlink($tf); -?> ---EXPECTF-- -TRACE START [%d-%d-%d %d:%d:%d] - %f %d -> aaa->a1() /%s/test7.php:27 - %f %d -> bbb->b1() /%s/test7.php:28 - %f %d -> aaa->a2() /%s/test7.php:29 - %f %d -> file_get_contents('/tmp/%s') /%s/test7.php:31 Deleted: xdebug/trunk/tests/test9.phpt =================================================================== --- xdebug/trunk/tests/test9.phpt 2010-10-30 19:41:13 UTC (rev 3361) +++ xdebug/trunk/tests/test9.phpt 2010-11-03 01:07:34 UTC (rev 3362) @@ -1,46 +0,0 @@ ---TEST-- -Test for nested static method calls (ZE1) ---SKIPIF-- - -=')) echo "skip Zend Engine 1 needed\n"; ?> ---INI-- -xdebug.enable=1 -xdebug.auto_trace=0 -xdebug.collect_params=1 -xdebug.collect_return=0 -xdebug.collect_assignments=0 -xdebug.auto_profile=0 -xdebug.profiler_enable=0 -xdebug.trace_format=0 ---FILE-- -query("insert blah '".DBHelper::quote("test's").DBHelper::quote("test's")."' blah"); -$db->query("insert blah ' blah"); -echo file_get_contents($tf); -unlink($tf); -?> ---EXPECTF-- -TRACE START [%d-%d-%d %d:%d:%d] - %f %d -> dbhelper::quote('test\'s') /%s/test9.php:18 - %f %d -> addslashes('test\'s') /%s/test9.php:6 - %f %d -> dbhelper::quote('test\'s') /%s/test9.php:18 - %f %d -> addslashes('test\'s') /%s/test9.php:6 - %f %d -> db->query('insert blah \'test\\\'stest\\\'s\' blah') /%s/test9.php:18 - %f %d -> db->query('insert blah \' blah') /%s/test9.php:19 - %f %d -> file_get_contents('/tmp/%s') /%s/test9.php:20