[xdebug-dev] xdebug xdebug/test-5.1.sh xdebug/test-5.2.sh xdebug/test-4.3.sh xdebug/xdebug.c xdebug/xdebug_code_coverage.c xdebug/tests/bug00022-ze1.phpt xdebug/tests/bug00212a-ze1.phpt xdebug/tests/coverage-ze1.phpt xdebug/tests/coverage2-ze1.phpt xdebug/tests/coverage3-ze1.phpt xdebug/tests/test6-ze1.phpt xdebug/tests/array_map.phpt xdebug/tests/bug00022.phpt xdebug/tests/bug00032-ze1.phpt xdebug/tests/bug00057-ze1.phpt xdebug/tests/bug00173.phpt xdebug/tests/bug00176.phpt xdebug/tests/bug00178.phpt xdebug/tests/bug00212a.phpt xdebug/tests/bug00212b.phpt xdebug/tests/bug00212c.phpt xdebug/tests/bug00213.phpt xdebug/tests/coverage.phpt xdebug/tests/coverage2.phpt xdebug/tests/coverage3.phpt xdebug/tests/local_vars_in_error-ze1.phpt xdebug/tests/test14.phpt xdebug/tests/test20.phpt xdebug/tests/test6.phpt xdebug/tests/test9b.phpt xdebug/tests/xdebug_call.phpt xdebug/tests/xdebug_call_depth.phpt xdebug/tests/xdebug_call_depth2.phpt - PHP 4.4 compatibility.

From: Derick Rethans <derick[@]derickrethans.nl>
Date: Sat, 23 Dec 2006 21:04:24 +0100

Date: Sat Dec 23 21:04:22 CET 2006
User: Derick Rethans
Directory: xdebug

Log Message:
[2.00]
- PHP 4.4 compatibility.
- Fixed/added test cases for PHP 4.4.

Modified files:
           xdebug/test-4.3.sh (version: 1.2)
           xdebug/xdebug.c (version: 1.364)
           xdebug/xdebug_code_coverage.c (version: 1.30)
           xdebug/tests/array_map.phpt (version: 1.13)
           xdebug/tests/bug00022.phpt (version: 1.5)
           xdebug/tests/bug00032-ze1.phpt (version: 1.6)
           xdebug/tests/bug00057-ze1.phpt (version: 1.6)
           xdebug/tests/bug00173.phpt (version: 1.5)
           xdebug/tests/bug00176.phpt (version: 1.2)
           xdebug/tests/bug00178.phpt (version: 1.3)
           xdebug/tests/bug00212a.phpt (version: 1.2)
           xdebug/tests/bug00212b.phpt (version: 1.2)
           xdebug/tests/bug00212c.phpt (version: 1.2)
           xdebug/tests/bug00213.phpt (version: 1.2)
           xdebug/tests/coverage.phpt (version: 1.5)
           xdebug/tests/coverage2.phpt (version: 1.5)
           xdebug/tests/coverage3.phpt (version: 1.5)
           xdebug/tests/local_vars_in_error-ze1.phpt (version: 1.5)
           xdebug/tests/test14.phpt (version: 1.13)
           xdebug/tests/test20.phpt (version: 1.10)
           xdebug/tests/test6.phpt (version: 1.19)
           xdebug/tests/test9b.phpt (version: 1.9)
           xdebug/tests/xdebug_call.phpt (version: 1.2)
           xdebug/tests/xdebug_call_depth.phpt (version: 1.2)
           xdebug/tests/xdebug_call_depth2.phpt (version: 1.2)
Added files:
           xdebug/test-5.1.sh (new version: 1.1)
           xdebug/test-5.2.sh (new version: 1.1)
           xdebug/tests/bug00022-ze1.phpt (new version: 1.1)
           xdebug/tests/bug00212a-ze1.phpt (new version: 1.1)
           xdebug/tests/coverage-ze1.phpt (new version: 1.1)
           xdebug/tests/coverage2-ze1.phpt (new version: 1.1)
           xdebug/tests/coverage3-ze1.phpt (new version: 1.1)
           xdebug/tests/test6-ze1.phpt (new version: 1.1)

[FILE: /xdebug/test-5.1.sh]

TEST_PHP_EXECUTABLE=`which php-5.1dev` php-5.1dev -dxdebug.auto_trace=0 /dat/dev/php/php-5.1dev/run-tests.php tests/*.phpt

[FILE: /xdebug/test-5.2.sh]

TEST_PHP_EXECUTABLE=`which php-5.2dev` php-5.2dev -dxdebug.auto_trace=0 /dat/dev/php/php-5.2dev/run-tests.php tests/*.phpt

[FILE: /xdebug/test-4.3.sh]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xdebug/test-4.3.sh:1.1 Sat Apr 10 08:33:49 2004 GMT
+++ xdebug/test-4.3.sh Sat Dec 23 19:04:21 2006 GMT
@@ -1 +1 @@
-TEST_PHP_EXECUTABLE=`which php-4.3dev` php-4.3dev /dat/dev/php/php-4.3dev/run-tests.php tests/*.phpt
+TEST_PHP_EXECUTABLE=`which php-4.4dev` php-5.2dev /dat/dev/php/php-5.2dev/run-tests.php tests/*.phpt

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -r1.363 -r1.364
--- xdebug/xdebug.c:1.363 Fri Dec 22 12:51:03 2006 GMT
+++ xdebug/xdebug.c Sat Dec 23 19:04:21 2006 GMT
@@ -1073,9 +1073,11 @@
                                 arguments_wanted = arguments_sent;
                         }
 
+# if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1) || PHP_MAJOR_VERSION >= 6
                         if (tmp->user_defined == XDEBUG_EXTERNAL) {
                                 arguments_wanted = op_array->num_args;
                         }
+# endif
 
                         if (arguments_wanted > arguments_sent) {
                                 arguments_storage = arguments_wanted;
@@ -1105,6 +1107,8 @@
                                 }
                                 tmp->varc++;
                         }
+
+# if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1) || PHP_MAJOR_VERSION >= 6
                         /* Sometimes not enough arguments are send to a user defined
                          * function, so we have to gather only the name for those extra. */
                         if (tmp->user_defined == XDEBUG_EXTERNAL && arguments_sent < arguments_wanted) {
@@ -1113,6 +1117,7 @@
                                         tmp->varc++;
                                 }
                         }
+# endif
                 }
         }
 

[FILE: /xdebug/xdebug_code_coverage.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xdebug/xdebug_code_coverage.c:1.29 Thu Oct 19 18:45:48 2006 GMT
+++ xdebug/xdebug_code_coverage.c Sat Dec 23 19:04:21 2006 GMT
@@ -118,7 +118,11 @@
 
         zend_op opcode = opa->opcodes[position];
         if (opcode.opcode == ZEND_JMP) {
+#ifdef ZEND_ENGINE_2
                 *jmp1 = (opcode.op1.u.opline_num - base_address) / sizeof(zend_op);
+#else
+ *jmp1 = opcode.op1.u.opline_num;
+#endif
                 return 1;
         } else if (
                 opcode.opcode == ZEND_JMPZ ||
@@ -127,7 +131,11 @@
                 opcode.opcode == ZEND_JMPNZ_EX
         ) {
                 *jmp1 = position + 1;
+#ifdef ZEND_ENGINE_2
                 *jmp2 = (opcode.op2.u.opline_num - base_address) / sizeof(zend_op);
+#else
+ *jmp2 = opcode.op1.u.opline_num;
+#endif
                 return 1;
         } else if (opcode.opcode == ZEND_JMPZNZ) {
                 *jmp1 = opcode.op2.u.opline_num;

[FILE: /xdebug/tests/bug00022-ze1.phpt]

--TEST--
Test for segmentation fault with xdebug_get_function_stack() and collect_params=1. (ZE1)
--SKIPIF--
<?php if (!extension_loaded("xdebug")) print "skip"; ?>
<?php if(version_compare(zend_version(), "2.0.0-dev", '>')) echo "skip Zend Engine 1 needed\n"; ?>
--INI--
xdebug.enable=1
xdebug.auto_trace=0
xdebug.collect_params=1
xdebug.profiler_enable=0
--FILE--
<?php
function foo($s) {
        print $s;
        var_dump(xdebug_get_function_stack());
}
 
foo('bar');
?>
--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'"
    }
  }
}

[FILE: /xdebug/tests/bug00212a-ze1.phpt]

--TEST--
Test for bug #212: coverage coverage inaccurate (ZE1).
--SKIPIF--
<?php if (!extension_loaded("xdebug")) print "skip"; ?>
<?php if(version_compare(zend_version(), "2.0.0-dev", '>')) 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--
<?php
        xdebug_start_code_coverage( XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE );
        $file = realpath('./tests/bug00212a.inc');
        include $file;
        $cc = xdebug_get_code_coverage();
        xdebug_stop_code_coverage();
        var_dump($cc[$file]);
?>
--EXPECT--
array(5) {
  [5]=>
  int(1)
  [7]=>
  int(1)
  [9]=>
  int(1)
  [10]=>
  int(-1)
  [12]=>
  int(1)
}

[FILE: /xdebug/tests/coverage-ze1.phpt]

--TEST--
Test with Code Coverage (ZE1)
--SKIPIF--
<?php if (!extension_loaded("xdebug")) print "skip"; ?>
<?php if(version_compare(zend_version(), "2.0.0-dev", '>')) 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--
<?php
        xdebug_start_code_coverage();
        $file = realpath('./tests/coverage.inc');
        include $file;
        $cc = xdebug_get_code_coverage();
        xdebug_stop_code_coverage();
        var_dump($cc[$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)
}

[FILE: /xdebug/tests/coverage2-ze1.phpt]

--TEST--
Test with Code Coverage with unused lines (ZE1)
--SKIPIF--
<?php if (!extension_loaded("xdebug")) print "skip"; ?>
<?php if(version_compare(zend_version(), "2.0.0-dev", '>')) 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--
<?php
        xdebug_start_code_coverage(XDEBUG_CC_UNUSED);
        $file = realpath('./tests/coverage.inc');
        include $file;
        $cc = xdebug_get_code_coverage();
        xdebug_stop_code_coverage();
        var_dump($cc[$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)
}

[FILE: /xdebug/tests/coverage3-ze1.phpt]

--TEST--
Test with Code Coverage with unused lines (ZE1)
--SKIPIF--
<?php if (!extension_loaded("xdebug")) print "skip"; ?>
<?php if(version_compare(zend_version(), "2.0.0-dev", '>')) 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--
<?php
    function a($b)
    {
        if ($b == 0)
        {
            return true;
        }
        else
        if ($b == 1)
        {
            return false;
        }
    };

    xdebug_start_code_coverage(true);

    a(1);

    xdebug_stop_code_coverage(false);
    var_dump(xdebug_get_code_coverage());
?>
--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)
  }
}

[FILE: /xdebug/tests/test6-ze1.phpt]

--TEST--
Test for complex parameters to a function (ZE1)
--SKIPIF--
<?php if (!extension_loaded("xdebug")) print "skip"; ?>
<?php if(version_compare(zend_version(), "2.0.0-dev", '>')) 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--
<?php
        function foo2 ($a, $b, $c)
        {
                return foo();
        }

        foo2 (4, array(array('blaat', 5, FALSE)));
?>
--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))

[FILE: /xdebug/tests/array_map.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xdebug/tests/array_map.phpt:1.12 Fri Dec 22 12:51:03 2006 GMT
+++ xdebug/tests/array_map.phpt Sat Dec 23 19:04:22 2006 GMT
@@ -29,8 +29,8 @@
 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:5
-%w%f %w%d -> strlen('bb') /%s/array_map.php:5
-%w%f %w%d -> strlen('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

[FILE: /xdebug/tests/bug00022.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xdebug/tests/bug00022.phpt:1.4 Fri Dec 22 12:51:03 2006 GMT
+++ xdebug/tests/bug00022.phpt Sat Dec 23 19:04:22 2006 GMT
@@ -1,7 +1,8 @@
 --TEST--
-Test for segmentation fault with xdebug_get_function_stack() and collect_params=1.
+Test for segmentation fault with xdebug_get_function_stack() and collect_params=1. (ZE20)
 --SKIPIF--
 <?php if (!extension_loaded("xdebug")) print "skip"; ?>
+<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2.0 needed\n"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0

[FILE: /xdebug/tests/bug00032-ze1.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xdebug/tests/bug00032-ze1.phpt:1.5 Fri Dec 30 13:52:37 2005 GMT
+++ xdebug/tests/bug00032-ze1.phpt Sat Dec 23 19:04:22 2006 GMT
@@ -9,6 +9,7 @@
 xdebug.collect_params=1
 xdebug.profiler_enable=0
 xdebug.show_local_vars=0
+xdebug.dump_globals=0
 --FILE--
 <?php
         ${1} = "foo";
@@ -32,10 +33,12 @@
 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
@@ -43,8 +46,10 @@
 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

[FILE: /xdebug/tests/bug00057-ze1.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xdebug/tests/bug00057-ze1.phpt:1.5 Fri Dec 30 13:52:37 2005 GMT
+++ xdebug/tests/bug00057-ze1.phpt Sat Dec 23 19:04:22 2006 GMT
@@ -11,6 +11,7 @@
 xdebug.show_mem_delta=0
 xdebug.profiler_enable=0
 xdebug.show_local_vars=0
+xdebug.dump_globals=0
 --FILE--
 <?php
 class OO {
@@ -37,12 +38,14 @@
 
 Call Stack:
     %f %d 1. {main}() /%s/bug00057-ze1.php:0
- %f %d 2. oo->__call('oo', array (), NULL) /%s/bug00057-ze1.php:16
+ %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
 

[FILE: /xdebug/tests/bug00173.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xdebug/tests/bug00173.phpt:1.4 Fri Dec 22 12:51:03 2006 GMT
+++ xdebug/tests/bug00173.phpt Sat Dec 23 19:04:22 2006 GMT
@@ -1,5 +1,8 @@
 --TEST--
 Test for bug #173: Xdebug segfaults using SPL ArrayIterator.
+--SKIPIF--
+<?php if (!extension_loaded("xdebug")) print "skip"; ?>
+<?php if(version_compare(zend_version(), "2.2.0-dev", '<')) echo "skip Zend Engine 2.2 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=1

[FILE: /xdebug/tests/bug00176.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xdebug/tests/bug00176.phpt:1.1 Sun May 07 19:36:38 2006 GMT
+++ xdebug/tests/bug00176.phpt Sat Dec 23 19:04:22 2006 GMT
@@ -1,5 +1,8 @@
 --TEST--
 Test for bug #176: Segfault using SplTempFileObject
+--SKIPIF--
+<?php if (!extension_loaded("xdebug")) print "skip"; ?>
+<?php if(version_compare(zend_version(), "2.2.0-dev", '<')) echo "skip Zend Engine 2.2 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0

[FILE: /xdebug/tests/bug00178.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xdebug/tests/bug00178.phpt:1.2 Fri Oct 06 12:23:04 2006 GMT
+++ xdebug/tests/bug00178.phpt Sat Dec 23 19:04:22 2006 GMT
@@ -22,7 +22,7 @@
 echo "> ", $php_errormsg, "\n";
 ?>
 DONE
---EXPECT--
+--EXPECTF--
> fsockopen() expects at least 1 parameter, 0 given
-> fsockopen(): unable to connect to localhost:5000 (Connection refused)
+> %snable to connect to localhost:500%s
 DONE

[FILE: /xdebug/tests/bug00212a.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xdebug/tests/bug00212a.phpt:1.1 Wed Oct 18 12:47:23 2006 GMT
+++ xdebug/tests/bug00212a.phpt Sat Dec 23 19:04:22 2006 GMT
@@ -1,7 +1,8 @@
 --TEST--
-Test for bug #212: coverage coverage inaccurate.
+Test for bug #212: coverage coverage inaccurate (ZE2).
 --SKIPIF--
 <?php if (!extension_loaded("xdebug")) print "skip"; ?>
+<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0

[FILE: /xdebug/tests/bug00212b.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xdebug/tests/bug00212b.phpt:1.1 Wed Oct 18 12:47:23 2006 GMT
+++ xdebug/tests/bug00212b.phpt Sat Dec 23 19:04:22 2006 GMT
@@ -2,6 +2,7 @@
 Test for bug #212: coverage coverage inaccurate.
 --SKIPIF--
 <?php if (!extension_loaded("xdebug")) print "skip"; ?>
+<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0

[FILE: /xdebug/tests/bug00212c.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xdebug/tests/bug00212c.phpt:1.1 Wed Oct 18 12:47:23 2006 GMT
+++ xdebug/tests/bug00212c.phpt Sat Dec 23 19:04:22 2006 GMT
@@ -2,6 +2,7 @@
 Test for bug #212: coverage coverage inaccurate.
 --SKIPIF--
 <?php if (!extension_loaded("xdebug")) print "skip"; ?>
+<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0

[FILE: /xdebug/tests/bug00213.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xdebug/tests/bug00213.phpt:1.1 Wed Oct 18 16:46:44 2006 GMT
+++ xdebug/tests/bug00213.phpt Sat Dec 23 19:04:22 2006 GMT
@@ -2,6 +2,7 @@
 Test for bug #213: Dead code analysis doesn't take catches for throws into account.
 --SKIPIF--
 <?php if (!extension_loaded("xdebug")) print "skip"; ?>
+<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0

[FILE: /xdebug/tests/coverage.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xdebug/tests/coverage.phpt:1.4 Fri Dec 30 13:52:37 2005 GMT
+++ xdebug/tests/coverage.phpt Sat Dec 23 19:04:22 2006 GMT
@@ -1,7 +1,8 @@
 --TEST--
-Test with Code Coverage
+Test with Code Coverage (ZE2)
 --SKIPIF--
 <?php if (!extension_loaded("xdebug")) print "skip"; ?>
+<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0

[FILE: /xdebug/tests/coverage2.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xdebug/tests/coverage2.phpt:1.4 Fri Dec 30 13:52:37 2005 GMT
+++ xdebug/tests/coverage2.phpt Sat Dec 23 19:04:22 2006 GMT
@@ -1,7 +1,8 @@
 --TEST--
-Test with Code Coverage with unused lines
+Test with Code Coverage with unused lines (ZE2)
 --SKIPIF--
 <?php if (!extension_loaded("xdebug")) print "skip"; ?>
+<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0

[FILE: /xdebug/tests/coverage3.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xdebug/tests/coverage3.phpt:1.4 Mon Sep 18 06:58:35 2006 GMT
+++ xdebug/tests/coverage3.phpt Sat Dec 23 19:04:22 2006 GMT
@@ -1,7 +1,8 @@
 --TEST--
-Test with Code Coverage with unused lines
+Test with Code Coverage with unused lines (ZE2)
 --SKIPIF--
 <?php if (!extension_loaded("xdebug")) print "skip"; ?>
+<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0

[FILE: /xdebug/tests/local_vars_in_error-ze1.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xdebug/tests/local_vars_in_error-ze1.phpt:1.4 Fri Dec 30 13:52:37 2005 GMT
+++ xdebug/tests/local_vars_in_error-ze1.phpt Sat Dec 23 19:04:22 2006 GMT
@@ -26,10 +26,10 @@
 
 Call Stack:
     %f %d 1. {main}() /%s/local_vars_in_error-ze1.php:0
- %f %d 2. a(5, 6) /%s/local_vars_in_error-ze1.php:8
+ %f %d 2. a(long, long) /%s/local_vars_in_error-ze1.php:8
 
 
-Variables in local scope:
+Variables in local scope (#2):
   $d = class stdClass { }
   $a = 5
   $c = array (0 => 5, 1 => 36)

[FILE: /xdebug/tests/test14.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xdebug/tests/test14.phpt:1.12 Fri Dec 30 13:52:37 2005 GMT
+++ xdebug/tests/test14.phpt Sat Dec 23 19:04:22 2006 GMT
@@ -11,6 +11,7 @@
 xdebug.auto_profile=0
 xdebug.profiler_enable=0
 xdebug.trace_format=0
+xdebug.var_display_max_depth=3
 --FILE--
 <?php
         $tf = xdebug_start_trace('/tmp/'. uniqid('xdt', TRUE));

[FILE: /xdebug/tests/test20.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xdebug/tests/test20.phpt:1.9 Fri Dec 30 13:52:37 2005 GMT
+++ xdebug/tests/test20.phpt Sat Dec 23 19:04:22 2006 GMT
@@ -28,5 +28,5 @@
 --EXPECTF--
 test
 TRACE START [%d-%d-%d %d:%d:%d]
- %f %d -> db::query('test') /dat/dev/php/xdebug/tests/test20.php:9
- %f %d -> file_get_contents('/tmp/%s') /%s/test20.php:11
+%w%f %w%d -> db::query('test') /dat/dev/php/xdebug/tests/test20.php:9
+%w%f %w%d -> file_get_contents('/tmp/%s') /%s/test20.php:11

[FILE: /xdebug/tests/test6.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xdebug/tests/test6.phpt:1.18 Fri Dec 22 12:51:03 2006 GMT
+++ xdebug/tests/test6.phpt Sat Dec 23 19:04:22 2006 GMT
@@ -1,7 +1,8 @@
 --TEST--
-Test for complex parameters to a function
+Test for complex parameters to a function (ZE2)
 --SKIPIF--
 <?php if (!extension_loaded("xdebug")) print "skip"; ?>
+<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.collect_params=1

[FILE: /xdebug/tests/test9b.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xdebug/tests/test9b.phpt:1.8 Mon Jan 02 15:12:31 2006 GMT
+++ xdebug/tests/test9b.phpt Sat Dec 23 19:04:22 2006 GMT
@@ -2,7 +2,7 @@
 Test for nested static method calls (ZE2)
 --SKIPIF--
 <?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 1 needed\n"; ?>
+<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0

[FILE: /xdebug/tests/xdebug_call.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xdebug/tests/xdebug_call.phpt:1.1 Sat Aug 19 11:34:03 2006 GMT
+++ xdebug/tests/xdebug_call.phpt Sat Dec 23 19:04:22 2006 GMT
@@ -1,5 +1,8 @@
 --TEST--
 Test for xdebug_call_*()
+--SKIPIF--
+<?php if (!extension_loaded("xdebug")) print "skip"; ?>
+<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0

[FILE: /xdebug/tests/xdebug_call_depth.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xdebug/tests/xdebug_call_depth.phpt:1.1 Sat Aug 19 11:34:03 2006 GMT
+++ xdebug/tests/xdebug_call_depth.phpt Sat Dec 23 19:04:22 2006 GMT
@@ -1,5 +1,8 @@
 --TEST--
 Test for xdebug_call_*(1)
+--SKIPIF--
+<?php if (!extension_loaded("xdebug")) print "skip"; ?>
+<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0

[FILE: /xdebug/tests/xdebug_call_depth2.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xdebug/tests/xdebug_call_depth2.phpt:1.1 Sat Aug 19 11:34:03 2006 GMT
+++ xdebug/tests/xdebug_call_depth2.phpt Sat Dec 23 19:04:22 2006 GMT
@@ -1,5 +1,8 @@
 --TEST--
 Test for xdebug_call_*(2)
+--SKIPIF--
+<?php if (!extension_loaded("xdebug")) print "skip"; ?>
+<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
Received on Sat Dec 23 2006 - 21:04:42 GMT

This archive was generated by hypermail 2.2.0 : Sun Jun 24 2018 - 04:00:03 BST