Merge branch 'master' of github.com:xdebug/xdebug

xdebug · Apr 18, 2014 · d910c91 · d910c91
2 parents 12e8db4 + 122747a
commit d910c91
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tests/assignment-trace10.phpt b/tests/assignment-trace10.phpt
@@ -52,4 +52,4 @@ TRACE START [%d-%d-%d %d:%d:%d]
                            => $a = class testClass { public $a = 92236816; private $b = 4 } %sassignment-trace10.php:23
 %w%f %w%d     -> xdebug_stop_trace() %sassignment-trace10.php:25
 %w%f %w%d
-RACE END   [%d-%d-%d %d:%d:%d]
+TRACE END   [%d-%d-%d %d:%d:%d]
diff --git a/tests/bug00699.phpt b/tests/bug00699.phpt
@@ -33,7 +33,7 @@ TRACE START [%d-%d-%d %d:%d:%d]
 %w%f %w%d     -> require(%sbug00699.inc) %sbug00699.php:4
 %w%f %w%d     -> SomeClass->addData(string(6)) %sbug00699.php:6
 %w%f %w%d     -> count(class SomeClass) %sbug00699.php:10
-%w%f %w%d       -> SomeClass->count() %sbug00699.php:10
+%w%f %w%d       -> SomeClass->count(%S) %sbug00699.php:10
 %w%f %w%d         -> count(array(1)) %sbug00699.inc:17
 %w%f %w%d     -> xdebug_stop_trace() %sbug00699.php:14
 %w%f %w%d