Fix observer tests on Windows

Use %e instead of a hardcoded forward slash.

diff --git a/ext/zend_test/tests/observer_backtrace_01.phpt b/ext/zend_test/tests/observer_backtrace_01.phpt
index 7aa47c2ef281206043d1af07e454cc758289003c..ece481cbba0a686210bd0f0f68c65aa92e55e068 100644 (file)
--- a/ext/zend_test/tests/observer_backtrace_01.phpt
+++ b/ext/zend_test/tests/observer_backtrace_01.phpt
@@ -37,15 +37,15 @@ function foo()
 var_dump(foo());
 ?>
 --EXPECTF--
-<!-- init '%s/observer_backtrace_%d.php' -->
+<!-- init '%s%eobserver_backtrace_%d.php' -->
 <!--
-    {main} %s/observer_backtrace_%d.php
+    {main} %s%eobserver_backtrace_%d.php
 -->
-<file '%s/observer_backtrace_%d.php'>
+<file '%s%eobserver_backtrace_%d.php'>
   <!-- init foo() -->
   <!--
       foo()
-      {main} %s/observer_backtrace_%d.php
+      {main} %s%eobserver_backtrace_%d.php
   -->
   <foo>
     <!-- init gen() -->
@@ -53,7 +53,7 @@ var_dump(foo());
         gen()
         Generator::current()
         foo()
-        {main} %s/observer_backtrace_%d.php
+        {main} %s%eobserver_backtrace_%d.php
     -->
     <gen>
       <!-- init TestClass::foo() -->
@@ -62,7 +62,7 @@ var_dump(foo());
           gen()
           Generator::current()
           foo()
-          {main} %s/observer_backtrace_%d.php
+          {main} %s%eobserver_backtrace_%d.php
       -->
       <TestClass::foo>
         <!-- init TestClass::{closure}() -->
@@ -73,7 +73,7 @@ var_dump(foo());
             gen()
             Generator::current()
             foo()
-            {main} %s/observer_backtrace_%d.php
+            {main} %s%eobserver_backtrace_%d.php
         -->
         <TestClass::{closure}>
           <!-- init TestClass::bar() -->
@@ -85,7 +85,7 @@ var_dump(foo());
               gen()
               Generator::current()
               foo()
-              {main} %s/observer_backtrace_%d.php
+              {main} %s%eobserver_backtrace_%d.php
           -->
           <TestClass::bar>
           </TestClass::bar>
@@ -103,4 +103,4 @@ array(2) {
   [1]=>
   int(1337)
 }
-</file '%s/observer_backtrace_%d.php'>
+</file '%s%eobserver_backtrace_%d.php'>

diff --git a/ext/zend_test/tests/observer_basic_01.phpt b/ext/zend_test/tests/observer_basic_01.phpt
index 9e31204dbe2d8c4195334b3dbb6edb57b3a86b6c..064ed99a296a0bcb4e25576ad124869249569f67 100644 (file)
--- a/ext/zend_test/tests/observer_basic_01.phpt
+++ b/ext/zend_test/tests/observer_basic_01.phpt
@@ -26,8 +26,8 @@ foo();
 echo 'DONE' . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_basic_01.php' -->
-<file '%s/observer_basic_01.php'>
+<!-- init '%s%eobserver_basic_01.php' -->
+<file '%s%eobserver_basic_01.php'>
   <!-- init foo() -->
   <foo>
 Foo
@@ -52,4 +52,4 @@ int(6)
     </bar>
   </foo>
 DONE
-</file '%s/observer_basic_01.php'>
+</file '%s%eobserver_basic_01.php'>

diff --git a/ext/zend_test/tests/observer_basic_02.phpt b/ext/zend_test/tests/observer_basic_02.phpt
index 9d16b4fe1852fee55fd1842ca1e5ce79d559794b..2b4d632d69674365faf5324c003b1cae42bdee3a 100644 (file)
--- a/ext/zend_test/tests/observer_basic_02.phpt
+++ b/ext/zend_test/tests/observer_basic_02.phpt
@@ -30,8 +30,8 @@ $test->foo();
 echo 'DONE' . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_basic_02.php' -->
-<file '%s/observer_basic_02.php'>
+<!-- init '%s%eobserver_basic_02.php' -->
+<file '%s%eobserver_basic_02.php'>
   <!-- init TestClass::foo() -->
   <TestClass::foo>
 Foo
@@ -56,4 +56,4 @@ int(6)
     </TestClass::bar>
   </TestClass::foo>
 DONE
-</file '%s/observer_basic_02.php'>
+</file '%s%eobserver_basic_02.php'>

diff --git a/ext/zend_test/tests/observer_basic_03.phpt b/ext/zend_test/tests/observer_basic_03.phpt
index 6a2d0b16eeab9a6b5a9eb02206dd8e1b2ae261d8..8675a0fdc0bb54dcd2228f864929716aef25db6d 100644 (file)
--- a/ext/zend_test/tests/observer_basic_03.phpt
+++ b/ext/zend_test/tests/observer_basic_03.phpt
@@ -17,20 +17,20 @@ include __DIR__ . '/observer.inc';
 foo();
 ?>
 --EXPECTF--
-<!-- init '%s/observer_basic_03.php' -->
-<file '%s/observer_basic_03.php'>
+<!-- init '%s%eobserver_basic_03.php' -->
+<file '%s%eobserver_basic_03.php'>
   <!-- init foo() -->
   <foo>
 Foo
   </foo>
-  <!-- init '%s/observer.inc' -->
-  <file '%s/observer.inc'>
+  <!-- init '%s%eobserver.inc' -->
+  <file '%s%eobserver.inc'>
     <!-- init foo_observer_test() -->
     <foo_observer_test>
 foo_observer_test
     </foo_observer_test>
-  </file '%s/observer.inc'>
+  </file '%s%eobserver.inc'>
   <foo>
 Foo
   </foo>
-</file '%s/observer_basic_03.php'>
+</file '%s%eobserver_basic_03.php'>

diff --git a/ext/zend_test/tests/observer_basic_04.phpt b/ext/zend_test/tests/observer_basic_04.phpt
index 6c0a8df59da0170dd7481bccd129f556666633b0..6fc1fae1c09312ed36ee60fe0616399183a1ea8f 100644 (file)
--- a/ext/zend_test/tests/observer_basic_04.phpt
+++ b/ext/zend_test/tests/observer_basic_04.phpt
@@ -17,14 +17,14 @@ include __DIR__ . '/observer.inc';
 foo();
 ?>
 --EXPECTF--
-<!-- init '%s/observer_basic_04.php' -->
-<file '%s/observer_basic_04.php'>
+<!-- init '%s%eobserver_basic_04.php' -->
+<file '%s%eobserver_basic_04.php'>
   <!-- init foo() -->
 Foo
-  <!-- init '%s/observer.inc' -->
-  <file '%s/observer.inc'>
+  <!-- init '%s%eobserver.inc' -->
+  <file '%s%eobserver.inc'>
     <!-- init foo_observer_test() -->
 foo_observer_test
-  </file '%s/observer.inc'>
+  </file '%s%eobserver.inc'>
 Foo
-</file '%s/observer_basic_04.php'>
+</file '%s%eobserver_basic_04.php'>

diff --git a/ext/zend_test/tests/observer_basic_05.phpt b/ext/zend_test/tests/observer_basic_05.phpt
index 27462aadb37845bfec43f675712feec668319b54..de14ebc1fd061f8fce543005e7135518e5a46b55 100644 (file)
--- a/ext/zend_test/tests/observer_basic_05.phpt
+++ b/ext/zend_test/tests/observer_basic_05.phpt
@@ -17,12 +17,12 @@ include __DIR__ . '/observer.inc';
 foo();
 ?>
 --EXPECTF--
-<!-- init '%s/observer_basic_05.php' -->
+<!-- init '%s%eobserver_basic_05.php' -->
 <!-- init foo() -->
 <foo>
 Foo
 </foo>
-<!-- init '%s/observer.inc' -->
+<!-- init '%s%eobserver.inc' -->
 <!-- init foo_observer_test() -->
 <foo_observer_test>
 foo_observer_test

diff --git a/ext/zend_test/tests/observer_call_user_func_01.phpt b/ext/zend_test/tests/observer_call_user_func_01.phpt
index 0f12fa6835f00eedc761c1e730756428bd26c017..802db43e3305bccab78260565c819e5938d52225 100644 (file)
--- a/ext/zend_test/tests/observer_call_user_func_01.phpt
+++ b/ext/zend_test/tests/observer_call_user_func_01.phpt
@@ -27,8 +27,8 @@ namespace {
 }
 ?>
 --EXPECTF--
-<!-- init '%s/observer_call_user_func_%d.php' -->
-<file '%s/observer_call_user_func_%d.php'>
+<!-- init '%s%eobserver_call_user_func_%d.php' -->
+<file '%s%eobserver_call_user_func_%d.php'>
   <!-- init Test\MyClass::myMethod() -->
   <Test\MyClass::myMethod>
 MyClass::myMethod called
@@ -37,4 +37,4 @@ MyClass::myMethod called
   <Test\my_function>
 my_function called
   </Test\my_function>
-</file '%s/observer_call_user_func_%d.php'>
+</file '%s%eobserver_call_user_func_%d.php'>

diff --git a/ext/zend_test/tests/observer_call_user_func_02.phpt b/ext/zend_test/tests/observer_call_user_func_02.phpt
index 28dd6a98254405d95a63abaa04253acb5dc9b6c2..25de267c0640dec96aa8fcc4602ed640b38b2820 100644 (file)
--- a/ext/zend_test/tests/observer_call_user_func_02.phpt
+++ b/ext/zend_test/tests/observer_call_user_func_02.phpt
@@ -27,8 +27,8 @@ namespace {
 }
 ?>
 --EXPECTF--
-<!-- init '%s/observer_call_user_func_%d.php' -->
-<file '%s/observer_call_user_func_%d.php'>
+<!-- init '%s%eobserver_call_user_func_%d.php' -->
+<file '%s%eobserver_call_user_func_%d.php'>
   <!-- init Test\MyClass::myMethod() -->
   <Test\MyClass::myMethod>
 MyClass::myMethod called
@@ -37,4 +37,4 @@ MyClass::myMethod called
   <Test\my_function>
 my_function called
   </Test\my_function>
-</file '%s/observer_call_user_func_%d.php'>
+</file '%s%eobserver_call_user_func_%d.php'>

diff --git a/ext/zend_test/tests/observer_call_user_func_03.phpt b/ext/zend_test/tests/observer_call_user_func_03.phpt
index 1ff841d4340d585f06c9bf9aaa68c725636f6d72..7c041cbc703f0aee1c9cd507b1a32535b9365d4e 100644 (file)
--- a/ext/zend_test/tests/observer_call_user_func_03.phpt
+++ b/ext/zend_test/tests/observer_call_user_func_03.phpt
@@ -26,8 +26,8 @@ namespace Test {
 }
 ?>
 --EXPECTF--
-<!-- init '%s/observer_call_user_func_%d.php' -->
-<file '%s/observer_call_user_func_%d.php'>
+<!-- init '%s%eobserver_call_user_func_%d.php' -->
+<file '%s%eobserver_call_user_func_%d.php'>
   <!-- init Test\MyClass::myMethod() -->
   <Test\MyClass::myMethod>
 MyClass::myMethod called
@@ -36,4 +36,4 @@ MyClass::myMethod called
   <Test\my_function>
 my_function called
   </Test\my_function>
-</file '%s/observer_call_user_func_%d.php'>
+</file '%s%eobserver_call_user_func_%d.php'>

diff --git a/ext/zend_test/tests/observer_call_user_func_04.phpt b/ext/zend_test/tests/observer_call_user_func_04.phpt
index 9df131db4dd0dd761c89228b24e5efb507fb89da..ebcf06082ba6409543dd454c21f8a4d4f23ded34 100644 (file)
--- a/ext/zend_test/tests/observer_call_user_func_04.phpt
+++ b/ext/zend_test/tests/observer_call_user_func_04.phpt
@@ -26,8 +26,8 @@ namespace Test {
 }
 ?>
 --EXPECTF--
-<!-- init '%s/observer_call_user_func_%d.php' -->
-<file '%s/observer_call_user_func_%d.php'>
+<!-- init '%s%eobserver_call_user_func_%d.php' -->
+<file '%s%eobserver_call_user_func_%d.php'>
   <!-- init Test\MyClass::myMethod() -->
   <Test\MyClass::myMethod>
 MyClass::myMethod called
@@ -36,4 +36,4 @@ MyClass::myMethod called
   <Test\my_function>
 my_function called
   </Test\my_function>
-</file '%s/observer_call_user_func_%d.php'>
+</file '%s%eobserver_call_user_func_%d.php'>

diff --git a/ext/zend_test/tests/observer_closure_01.phpt b/ext/zend_test/tests/observer_closure_01.phpt
index 3e120493bc1a9f8f0bc4d9a29f99a5ccf3fde7eb..85312b32ef289e66adb84abe07d671d61e5fc8da 100644 (file)
--- a/ext/zend_test/tests/observer_closure_01.phpt
+++ b/ext/zend_test/tests/observer_closure_01.phpt
@@ -23,8 +23,8 @@ $foo($bar);
 echo 'DONE' . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_closure_%d.php' -->
-<file '%s/observer_closure_%d.php'>
+<!-- init '%s%eobserver_closure_%d.php' -->
+<file '%s%eobserver_closure_%d.php'>
   <!-- init {closure}() -->
   <{closure}>
 Answer
@@ -46,4 +46,4 @@ int(42)
     </{closure}>
   </{closure}>
 DONE
-</file '%s/observer_closure_%d.php'>
+</file '%s%eobserver_closure_%d.php'>

diff --git a/ext/zend_test/tests/observer_error_01.phpt b/ext/zend_test/tests/observer_error_01.phpt
index 5ea619f32414cbbfb8e870aaf25e5cf84704ae49..e80a9ec3c74d89989c6aac505e94f56dd77b1ca2 100644 (file)
--- a/ext/zend_test/tests/observer_error_01.phpt
+++ b/ext/zend_test/tests/observer_error_01.phpt
@@ -19,11 +19,11 @@ foo();
 echo 'You should not see this.';
 ?>
 --EXPECTF--
-<!-- init '%s/observer_error_%d.php' -->
-<file '%s/observer_error_%d.php'>
+<!-- init '%s%eobserver_error_%d.php' -->
+<file '%s%eobserver_error_%d.php'>
   <!-- init foo() -->
   <foo>
 
 Fatal error: Allowed memory size of 2097152 bytes exhausted%s(tried to allocate %d bytes) in %s on line %d
   </foo:NULL>
-</file '%s/observer_error_%d.php'>
+</file '%s%eobserver_error_%d.php'>

diff --git a/ext/zend_test/tests/observer_error_02.phpt b/ext/zend_test/tests/observer_error_02.phpt
index 959544e9b8e9a86d50c86d414c88a45740fb405c..9dfa71d182ed5fba0cd3df936a0f77e4b1984992 100644 (file)
--- a/ext/zend_test/tests/observer_error_02.phpt
+++ b/ext/zend_test/tests/observer_error_02.phpt
@@ -18,11 +18,11 @@ foo();
 echo 'You should not see this.';
 ?>
 --EXPECTF--
-<!-- init '%s/observer_error_%d.php' -->
-<file '%s/observer_error_%d.php'>
+<!-- init '%s%eobserver_error_%d.php' -->
+<file '%s%eobserver_error_%d.php'>
   <!-- init foo() -->
   <foo>
 
 Fatal error: Foo error in %s on line %d
   </foo:NULL>
-</file '%s/observer_error_%d.php'>
+</file '%s%eobserver_error_%d.php'>

diff --git a/ext/zend_test/tests/observer_error_03.phpt b/ext/zend_test/tests/observer_error_03.phpt
index 3d8150a440754e09d0b9c8e18c5c14f2b618f2de..606b827bb2ea177686f26504816d7e25f6d615ef 100644 (file)
--- a/ext/zend_test/tests/observer_error_03.phpt
+++ b/ext/zend_test/tests/observer_error_03.phpt
@@ -24,8 +24,8 @@ main();
 echo 'Done.' . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_error_%d.php' -->
-<file '%s/observer_error_%d.php'>
+<!-- init '%s%eobserver_error_%d.php' -->
+<file '%s%eobserver_error_%d.php'>
   <!-- init main() -->
   <main>
     <!-- init foo() -->
@@ -36,4 +36,4 @@ Warning: Undefined variable $this_does_not_exit in %s on line %d
 After error.
   </main:NULL>
 Done.
-</file '%s/observer_error_%d.php'>
+</file '%s%eobserver_error_%d.php'>

diff --git a/ext/zend_test/tests/observer_error_04.phpt b/ext/zend_test/tests/observer_error_04.phpt
index ca2532a06ba9da3df2583303b79009a95f376253..49c56c17abb30fae27af959e8fa1114f046b7d0e 100644 (file)
--- a/ext/zend_test/tests/observer_error_04.phpt
+++ b/ext/zend_test/tests/observer_error_04.phpt
@@ -30,8 +30,8 @@ try {
 echo 'Done.' . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_error_%d.php' -->
-<file '%s/observer_error_%d.php'>
+<!-- init '%s%eobserver_error_%d.php' -->
+<file '%s%eobserver_error_%d.php'>
   <!-- init main() -->
   <main>
     <!-- init foo() -->
@@ -43,4 +43,4 @@ echo 'Done.' . PHP_EOL;
 SOAP-ERROR: Parsing WSDL: Couldn't load from 'foo' : failed to load external entity "foo"
 
 Done.
-</file '%s/observer_error_%d.php'>
+</file '%s%eobserver_error_%d.php'>

diff --git a/ext/zend_test/tests/observer_eval_01.phpt b/ext/zend_test/tests/observer_eval_01.phpt
index 1a230c7d96329edcbf85edb8f29b6d71a05c4b4e..addce2dba5a0e3ebb4ed2c931e9cec163526bc49 100644 (file)
--- a/ext/zend_test/tests/observer_eval_01.phpt
+++ b/ext/zend_test/tests/observer_eval_01.phpt
@@ -11,11 +11,11 @@ echo eval("return 'Foo eval' . PHP_EOL;");
 echo 'DONE' . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_eval_%d.php' -->
-<file '%s/observer_eval_%d.php'>
-  <!-- init '%s/observer_eval_%d.php(%d) : eval()'d code' -->
-  <file '%s/observer_eval_%d.php(%d) : eval()'d code'>
-  </file '%s/observer_eval_%d.php(%d) : eval()'d code'>
+<!-- init '%s%eobserver_eval_%d.php' -->
+<file '%s%eobserver_eval_%d.php'>
+  <!-- init '%s%eobserver_eval_%d.php(%d) : eval()'d code' -->
+  <file '%s%eobserver_eval_%d.php(%d) : eval()'d code'>
+  </file '%s%eobserver_eval_%d.php(%d) : eval()'d code'>
 Foo eval
 DONE
-</file '%s/observer_eval_%d.php'>
+</file '%s%eobserver_eval_%d.php'>

diff --git a/ext/zend_test/tests/observer_exception_01.phpt b/ext/zend_test/tests/observer_exception_01.phpt
index fd49c0618b5bd932bfd01c067140ce0079780922..6ded60c9708508202ce1c74bb2739b9d1a264816 100644 (file)
--- a/ext/zend_test/tests/observer_exception_01.phpt
+++ b/ext/zend_test/tests/observer_exception_01.phpt
@@ -23,8 +23,8 @@ foo();
 echo 'You should not see this' . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_exception_%d.php' -->
-<file '%s/observer_exception_%d.php'>
+<!-- init '%s%eobserver_exception_%d.php' -->
+<file '%s%eobserver_exception_%d.php'>
   <!-- init foo() -->
   <foo>
 Call #0
@@ -37,10 +37,10 @@ Call #2
     <!-- Exception: RuntimeException -->
   </foo>
   <!-- Exception: RuntimeException -->
-</file '%s/observer_exception_%d.php'>
+</file '%s%eobserver_exception_%d.php'>
 
-Fatal error: Uncaught RuntimeException: Third time is a charm in %s/observer_exception_%d.php:%d
+Fatal error: Uncaught RuntimeException: Third time is a charm in %s%eobserver_exception_%d.php:%d
 Stack trace:
-#0 %s/observer_exception_%d.php(%d): foo()
+#0 %s%eobserver_exception_%d.php(%d): foo()
 #1 {main}
-  thrown in %s/observer_exception_%d.php on line %d
+  thrown in %s%eobserver_exception_%d.php on line %d

diff --git a/ext/zend_test/tests/observer_generator_01.phpt b/ext/zend_test/tests/observer_generator_01.phpt
index a2d8b02a2b5bc8641a05774303063e3ae56a5de4..34314cbf36821c49b3724c64dcc76f461edaf21f 100644 (file)
--- a/ext/zend_test/tests/observer_generator_01.phpt
+++ b/ext/zend_test/tests/observer_generator_01.phpt
@@ -26,8 +26,8 @@ function doSomething() {
 echo doSomething() . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_generator_%d.php' -->
-<file '%s/observer_generator_%d.php'>
+<!-- init '%s%eobserver_generator_%d.php' -->
+<file '%s%eobserver_generator_%d.php'>
   <!-- init doSomething() -->
   <doSomething>
     <!-- init getResults() -->
@@ -44,4 +44,4 @@ echo doSomething() . PHP_EOL;
     </getResults:NULL>
   </doSomething:'Done'>
 Done
-</file '%s/observer_generator_%d.php'>
+</file '%s%eobserver_generator_%d.php'>

diff --git a/ext/zend_test/tests/observer_generator_02.phpt b/ext/zend_test/tests/observer_generator_02.phpt
index 2e045f93f2f9f9967827a73fe7a96161794dd7b9..9d29b9e8e569543296d92e577113752211ca996a 100644 (file)
--- a/ext/zend_test/tests/observer_generator_02.phpt
+++ b/ext/zend_test/tests/observer_generator_02.phpt
@@ -28,8 +28,8 @@ function doSomething() {
 echo doSomething() . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_generator_%d.php' -->
-<file '%s/observer_generator_%d.php'>
+<!-- init '%s%eobserver_generator_%d.php' -->
+<file '%s%eobserver_generator_%d.php'>
   <!-- init doSomething() -->
   <doSomething>
     <!-- init getResults() -->
@@ -47,4 +47,4 @@ echo doSomething() . PHP_EOL;
 1337
   </doSomething:'Done'>
 Done
-</file '%s/observer_generator_%d.php'>
+</file '%s%eobserver_generator_%d.php'>

diff --git a/ext/zend_test/tests/observer_generator_03.phpt b/ext/zend_test/tests/observer_generator_03.phpt
index 459bdfb424510a6ed0963f8c25122ae6e6de63fb..cad6e3bb96ee1fc4a86f40f7766d764007f2e4e6 100644 (file)
--- a/ext/zend_test/tests/observer_generator_03.phpt
+++ b/ext/zend_test/tests/observer_generator_03.phpt
@@ -33,8 +33,8 @@ function doSomething() {
 echo doSomething() . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_generator_%d.php' -->
-<file '%s/observer_generator_%d.php'>
+<!-- init '%s%eobserver_generator_%d.php' -->
+<file '%s%eobserver_generator_%d.php'>
   <!-- init doSomething() -->
   <doSomething>
     <!-- init fooResults() -->
@@ -65,4 +65,4 @@ echo doSomething() . PHP_EOL;
     </fooResults:NULL>
   </doSomething:'Done'>
 Done
-</file '%s/observer_generator_%d.php'>
+</file '%s%eobserver_generator_%d.php'>

diff --git a/ext/zend_test/tests/observer_generator_04.phpt b/ext/zend_test/tests/observer_generator_04.phpt
index bf6b4e6c6947b806899f6d3473de95f7ae0c1032..dd941dd78f3b5ff8e78a94eceb62b9c1f26d2db2 100644 (file)
--- a/ext/zend_test/tests/observer_generator_04.phpt
+++ b/ext/zend_test/tests/observer_generator_04.phpt
@@ -33,8 +33,8 @@ function doSomething() {
 echo doSomething() . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_generator_%d.php' -->
-<file '%s/observer_generator_%d.php'>
+<!-- init '%s%eobserver_generator_%d.php' -->
+<file '%s%eobserver_generator_%d.php'>
   <!-- init doSomething() -->
   <doSomething>
     <!-- init fooResults() -->
@@ -61,4 +61,4 @@ Starting generator
     </fooResults:NULL>
   </doSomething:'Done'>
 Done
-</file '%s/observer_generator_%d.php'>
+</file '%s%eobserver_generator_%d.php'>

diff --git a/ext/zend_test/tests/observer_generator_05.phpt b/ext/zend_test/tests/observer_generator_05.phpt
index d13f6fa39b19855469a6fe4104c6dbaa04c4abd4..8809511361f3927ae2cb5f037d60f84e9aecfc8b 100644 (file)
--- a/ext/zend_test/tests/observer_generator_05.phpt
+++ b/ext/zend_test/tests/observer_generator_05.phpt
@@ -26,8 +26,8 @@ function doSomething() {
 echo doSomething() . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_generator_%d.php' -->
-<file '%s/observer_generator_%d.php'>
+<!-- init '%s%eobserver_generator_%d.php' -->
+<file '%s%eobserver_generator_%d.php'>
   <!-- init doSomething() -->
   <doSomething>
     <!-- init fooResults() -->
@@ -43,11 +43,11 @@ echo doSomething() . PHP_EOL;
     <!-- Exception: RuntimeException -->
   </doSomething:NULL>
   <!-- Exception: RuntimeException -->
-</file '%s/observer_generator_%d.php'>
+</file '%s%eobserver_generator_%d.php'>
 
-Fatal error: Uncaught RuntimeException: Oops! in %s/observer_generator_%d.php:%d
+Fatal error: Uncaught RuntimeException: Oops! in %s%eobserver_generator_%d.php:%d
 Stack trace:
-#0 %s/observer_generator_%d.php(%d): fooResults()
-#1 %s/observer_generator_%d.php(%d): doSomething()
+#0 %s%eobserver_generator_%d.php(%d): fooResults()
+#1 %s%eobserver_generator_%d.php(%d): doSomething()
 #2 {main}
-  thrown in %s/observer_generator_%d.php on line %d
+  thrown in %s%eobserver_generator_%d.php on line %d

diff --git a/ext/zend_test/tests/observer_magic_01.phpt b/ext/zend_test/tests/observer_magic_01.phpt
index 920f934b6c4c950c98931e10f835f9b0d36b38f4..bae01e3b17424b1e7977c309cb777e2f6e97b853 100644 (file)
--- a/ext/zend_test/tests/observer_magic_01.phpt
+++ b/ext/zend_test/tests/observer_magic_01.phpt
@@ -28,8 +28,8 @@ $test->bar();
 echo 'DONE' . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_magic_01.php' -->
-<file '%s/observer_magic_01.php'>
+<!-- init '%s%eobserver_magic_01.php' -->
+<file '%s%eobserver_magic_01.php'>
   <!-- init MagicTest::foo() -->
   <MagicTest::foo>
 test
@@ -42,4 +42,4 @@ bar
     </MagicTest::foo>
   </MagicTest::__call>
 DONE
-</file '%s/observer_magic_01.php'>
+</file '%s%eobserver_magic_01.php'>

diff --git a/ext/zend_test/tests/observer_opline_01.phpt b/ext/zend_test/tests/observer_opline_01.phpt
index d7d17f2b47747bfb2fd9119975889421c26cefbd..924c22b3a04b86377ec4a98c70ad65a2bfcfc268 100644 (file)
--- a/ext/zend_test/tests/observer_opline_01.phpt
+++ b/ext/zend_test/tests/observer_opline_01.phpt
@@ -19,9 +19,9 @@ echo array_sum([1,2,3]) . PHP_EOL;
 foo();
 ?>
 --EXPECTF--
-<!-- init '%s/observer_opline_%d.php' -->
+<!-- init '%s%eobserver_opline_%d.php' -->
 <!-- opcode: 'ZEND_INIT_FCALL' -->
-<file '%s/observer_opline_%d.php'>
+<file '%s%eobserver_opline_%d.php'>
   <!-- opcode: 'ZEND_INIT_FCALL' -->
   <!-- init foo() -->
   <!-- opcode: 'ZEND_ECHO' -->
@@ -30,9 +30,9 @@ foo();
 Foo
     <!-- opcode: 'ZEND_RETURN' -->
   </foo>
-  <!-- init '%s/observer.inc' -->
+  <!-- init '%s%eobserver.inc' -->
   <!-- opcode: 'ZEND_INIT_FCALL' -->
-  <file '%s/observer.inc'>
+  <file '%s%eobserver.inc'>
     <!-- opcode: 'ZEND_INIT_FCALL' -->
     <!-- init foo_observer_test() -->
     <!-- opcode: 'ZEND_ECHO' -->
@@ -42,7 +42,7 @@ foo_observer_test
       <!-- opcode: 'ZEND_RETURN' -->
     </foo_observer_test>
     <!-- opcode: 'ZEND_RETURN' -->
-  </file '%s/observer.inc'>
+  </file '%s%eobserver.inc'>
 6
   <foo>
     <!-- opcode: 'ZEND_ECHO' -->
@@ -50,4 +50,4 @@ Foo
     <!-- opcode: 'ZEND_RETURN' -->
   </foo>
   <!-- opcode: 'ZEND_RETURN' -->
-</file '%s/observer_opline_%d.php'>
+</file '%s%eobserver_opline_%d.php'>

diff --git a/ext/zend_test/tests/observer_retval_01.phpt b/ext/zend_test/tests/observer_retval_01.phpt
index 844d9037f34b0e9fe7fb64f362ab1b32f28baaf2..1359a00d40b6e2bdfba99a12154a4f1437a0e45c 100644 (file)
--- a/ext/zend_test/tests/observer_retval_01.phpt
+++ b/ext/zend_test/tests/observer_retval_01.phpt
@@ -19,12 +19,12 @@ foo(); // Retval unused
 echo 'Done' . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_retval_%d.php' -->
-<file '%s/observer_retval_%d.php'>
+<!-- init '%s%eobserver_retval_%d.php' -->
+<file '%s%eobserver_retval_%d.php'>
   <!-- init foo() -->
   <foo>
   </foo:'I should be observable'>
   <foo>
   </foo:'I should be observable'>
 Done
-</file '%s/observer_retval_%d.php'>
+</file '%s%eobserver_retval_%d.php'>

diff --git a/ext/zend_test/tests/observer_retval_02.phpt b/ext/zend_test/tests/observer_retval_02.phpt
index 6b2e3548a2aac98fa11c63688e512c6b25e029fa..b48d8d6b7ea5b7cb10f64d844b384f0c07047ff3 100644 (file)
--- a/ext/zend_test/tests/observer_retval_02.phpt
+++ b/ext/zend_test/tests/observer_retval_02.phpt
@@ -21,12 +21,12 @@ $gen->current();
 echo 'Done' . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_retval_%d.php' -->
-<file '%s/observer_retval_%d.php'>
+<!-- init '%s%eobserver_retval_%d.php' -->
+<file '%s%eobserver_retval_%d.php'>
   <!-- init foo() -->
   <foo>
   </foo:'I should be observable'>
   <foo>
   </foo:'Me too!'>
 Done
-</file '%s/observer_retval_%d.php'>
+</file '%s%eobserver_retval_%d.php'>

diff --git a/ext/zend_test/tests/observer_retval_03.phpt b/ext/zend_test/tests/observer_retval_03.phpt
index a21ed97c253631052f15a6cf0312efce5616285f..227fe5670aac9c37120b8e4adb5224a848f8cd67 100644 (file)
--- a/ext/zend_test/tests/observer_retval_03.phpt
+++ b/ext/zend_test/tests/observer_retval_03.phpt
@@ -21,12 +21,12 @@ foo(); // Retval unused
 echo 'Done' . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_retval_%d.php' -->
-<file '%s/observer_retval_%d.php'>
+<!-- init '%s%eobserver_retval_%d.php' -->
+<file '%s%eobserver_retval_%d.php'>
   <!-- init foo() -->
   <foo>
   </foo:object(MyRetval)#%d>
   <foo>
   </foo:object(MyRetval)#%d>
 Done
-</file '%s/observer_retval_%d.php'>
+</file '%s%eobserver_retval_%d.php'>

diff --git a/ext/zend_test/tests/observer_retval_04.phpt b/ext/zend_test/tests/observer_retval_04.phpt
index 883dd85498fb493764d0686e266a8b800690a33e..f6aea0d1e2d629b5bdbc4dee891036a07e644ba5 100644 (file)
--- a/ext/zend_test/tests/observer_retval_04.phpt
+++ b/ext/zend_test/tests/observer_retval_04.phpt
@@ -31,8 +31,8 @@ bar('freed'); // Retval unused
 echo 'Done' . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_retval_%d.php' -->
-<file '%s/observer_retval_%d.php'>
+<!-- init '%s%eobserver_retval_%d.php' -->
+<file '%s%eobserver_retval_%d.php'>
   <!-- init foo() -->
   <foo>
     <!-- init getObj() -->
@@ -49,4 +49,4 @@ echo 'Done' . PHP_EOL;
   <bar>
   </bar:'This gets freed in the return handler when unused'>
 Done
-</file '%s/observer_retval_%d.php'>
+</file '%s%eobserver_retval_%d.php'>

diff --git a/ext/zend_test/tests/observer_retval_05.phpt b/ext/zend_test/tests/observer_retval_05.phpt
index 45fe981f29abe4160b9d60030740a33ea6a71b53..e987a06d7ac63f120d4ec4377ef3508b7f1e5ca3 100644 (file)
--- a/ext/zend_test/tests/observer_retval_05.phpt
+++ b/ext/zend_test/tests/observer_retval_05.phpt
@@ -18,8 +18,8 @@ foo(); // Retval unused
 echo 'Done' . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_retval_%d.php' -->
-<file '%s/observer_retval_%d.php'>
+<!-- init '%s%eobserver_retval_%d.php' -->
+<file '%s%eobserver_retval_%d.php'>
   <!-- init foo() -->
   <foo>
 
@@ -30,4 +30,4 @@ Warning: Undefined variable $i_do_not_exist in %s on line %d
 Warning: Undefined variable $i_do_not_exist in %s on line %d
   </foo:NULL>
 Done
-</file '%s/observer_retval_%d.php'>
+</file '%s%eobserver_retval_%d.php'>

diff --git a/ext/zend_test/tests/observer_retval_06.phpt b/ext/zend_test/tests/observer_retval_06.phpt
index f5d2988725f6063c30307f9cc6e45acb42132b77..b3a64b3ee8e60ed71370e4421908dc3f9e4b3a2e 100644 (file)
--- a/ext/zend_test/tests/observer_retval_06.phpt
+++ b/ext/zend_test/tests/observer_retval_06.phpt
@@ -19,12 +19,12 @@ foo(); // Retval unused
 echo 'Done' . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_retval_%d.php' -->
-<file '%s/observer_retval_%d.php'>
+<!-- init '%s%eobserver_retval_%d.php' -->
+<file '%s%eobserver_retval_%d.php'>
   <!-- init foo() -->
   <foo>
   </foo:'I should be observable'>
   <foo>
   </foo:'I should be observable'>
 Done
-</file '%s/observer_retval_%d.php'>
+</file '%s%eobserver_retval_%d.php'>

diff --git a/ext/zend_test/tests/observer_retval_07.phpt b/ext/zend_test/tests/observer_retval_07.phpt
index abd518b0e423ca83dbd8379f6ece8a4b2bb99e4c..678027a01a6f723024d7ee996ddc0f7864244d18 100644 (file)
--- a/ext/zend_test/tests/observer_retval_07.phpt
+++ b/ext/zend_test/tests/observer_retval_07.phpt
@@ -23,8 +23,8 @@ foo(); // Retval unused
 echo 'Done' . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_retval_%d.php' -->
-<file '%s/observer_retval_%d.php'>
+<!-- init '%s%eobserver_retval_%d.php' -->
+<file '%s%eobserver_retval_%d.php'>
   <!-- init foo() -->
   <foo>
     <!-- init getMessage() -->
@@ -36,4 +36,4 @@ echo 'Done' . PHP_EOL;
     </getMessage:'I should be observable'>
   </foo:'I should be observable'>
 Done
-</file '%s/observer_retval_%d.php'>
+</file '%s%eobserver_retval_%d.php'>

diff --git a/ext/zend_test/tests/observer_retval_by_ref_01.phpt b/ext/zend_test/tests/observer_retval_by_ref_01.phpt
index 4e96ab010bd785cfc1e81a738d8a9ef3e45e86f4..2e7d910aac351128177c339610b96bb4736d7614 100644 (file)
--- a/ext/zend_test/tests/observer_retval_by_ref_01.phpt
+++ b/ext/zend_test/tests/observer_retval_by_ref_01.phpt
@@ -19,12 +19,12 @@ foo(); // Retval unused
 echo 'Done' . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_retval_by_ref_%d.php' -->
-<file '%s/observer_retval_by_ref_%d.php'>
+<!-- init '%s%eobserver_retval_by_ref_%d.php' -->
+<file '%s%eobserver_retval_by_ref_%d.php'>
   <!-- init foo() -->
   <foo>
   </foo:'I should be observable'>
   <foo>
   </foo:'I should be observable'>
 Done
-</file '%s/observer_retval_by_ref_%d.php'>
+</file '%s%eobserver_retval_by_ref_%d.php'>

diff --git a/ext/zend_test/tests/observer_retval_by_ref_02.phpt b/ext/zend_test/tests/observer_retval_by_ref_02.phpt
index b056a80ce7d12af9221549099258b07e02c87ca1..7283a8d967006554aaf33569c416044e8af374f2 100644 (file)
--- a/ext/zend_test/tests/observer_retval_by_ref_02.phpt
+++ b/ext/zend_test/tests/observer_retval_by_ref_02.phpt
@@ -19,8 +19,8 @@ foo(); // Retval unused
 echo 'Done' . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_retval_by_ref_%d.php' -->
-<file '%s/observer_retval_by_ref_%d.php'>
+<!-- init '%s%eobserver_retval_by_ref_%d.php' -->
+<file '%s%eobserver_retval_by_ref_%d.php'>
   <!-- init foo() -->
   <foo>
 
@@ -31,4 +31,4 @@ Notice: Only variable references should be returned by reference in %s on line %
 Notice: Only variable references should be returned by reference in %s on line %d
   </foo:'I should be observable'>
 Done
-</file '%s/observer_retval_by_ref_%d.php'>
+</file '%s%eobserver_retval_by_ref_%d.php'>

diff --git a/ext/zend_test/tests/observer_retval_by_ref_03.phpt b/ext/zend_test/tests/observer_retval_by_ref_03.phpt
index f09174fc22e0f02623c71531d05b2282276db0cd..b75e589095f796ba6ddf12df5b8cebfdb3d02e5e 100644 (file)
--- a/ext/zend_test/tests/observer_retval_by_ref_03.phpt
+++ b/ext/zend_test/tests/observer_retval_by_ref_03.phpt
@@ -23,8 +23,8 @@ foo(); // Retval unused
 echo 'Done' . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_retval_by_ref_%d.php' -->
-<file '%s/observer_retval_by_ref_%d.php'>
+<!-- init '%s%eobserver_retval_by_ref_%d.php' -->
+<file '%s%eobserver_retval_by_ref_%d.php'>
   <!-- init foo() -->
   <foo>
     <!-- init getMessage() -->
@@ -40,4 +40,4 @@ Notice: Only variable references should be returned by reference in %s on line %
 Notice: Only variable references should be returned by reference in %s on line %d
   </foo:'I should be observable'>
 Done
-</file '%s/observer_retval_by_ref_%d.php'>
+</file '%s%eobserver_retval_by_ref_%d.php'>

diff --git a/ext/zend_test/tests/observer_shutdown_01.phpt b/ext/zend_test/tests/observer_shutdown_01.phpt
index 04784cd17527379b07545b5b04851af6f6ee8c51..5fcc7aeb81a827aff05dce7b974defe4bb68c621 100644 (file)
--- a/ext/zend_test/tests/observer_shutdown_01.phpt
+++ b/ext/zend_test/tests/observer_shutdown_01.phpt
@@ -24,13 +24,13 @@ function foo() {
 echo 'Done: ' . bar(40) . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_shutdown_%d.php' -->
-<file '%s/observer_shutdown_%d.php'>
+<!-- init '%s%eobserver_shutdown_%d.php' -->
+<file '%s%eobserver_shutdown_%d.php'>
   <!-- init bar() -->
   <bar>
   </bar:40>
 Done: 40
-</file '%s/observer_shutdown_%d.php'>
+</file '%s%eobserver_shutdown_%d.php'>
 <!-- init {closure}() -->
 <{closure}>
   <!-- init foo() -->

diff --git a/ext/zend_test/tests/observer_shutdown_02.phpt b/ext/zend_test/tests/observer_shutdown_02.phpt
index b666a92e15088ee84217ab635e3b467e325929fb..410403df1a417d47d70089399d288cd4512a3c3c 100644 (file)
--- a/ext/zend_test/tests/observer_shutdown_02.phpt
+++ b/ext/zend_test/tests/observer_shutdown_02.phpt
@@ -30,13 +30,13 @@ $mc = new MyClass();
 echo 'Done: ' . bar(40) . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_shutdown_%d.php' -->
-<file '%s/observer_shutdown_%d.php'>
+<!-- init '%s%eobserver_shutdown_%d.php' -->
+<file '%s%eobserver_shutdown_%d.php'>
   <!-- init bar() -->
   <bar>
   </bar:40>
 Done: 40
-</file '%s/observer_shutdown_%d.php'>
+</file '%s%eobserver_shutdown_%d.php'>
 <!-- init MyClass::__destruct() -->
 <MyClass::__destruct>
   <!-- init foo() -->

diff --git a/ext/zend_test/tests/observer_types_01.phpt b/ext/zend_test/tests/observer_types_01.phpt
index 31c120671401c8b6bbacfb69ac6446e8d73c95d7..7b5408a456f130d8924b6662aa9e7838559c344e 100644 (file)
--- a/ext/zend_test/tests/observer_types_01.phpt
+++ b/ext/zend_test/tests/observer_types_01.phpt
@@ -12,17 +12,17 @@ function foo(array $a) { return 1; }
 foo(42);
 ?>
 --EXPECTF--
-<!-- init '%s/observer_types_%d.php' -->
-<file '%s/observer_types_%d.php'>
+<!-- init '%s%eobserver_types_%d.php' -->
+<file '%s%eobserver_types_%d.php'>
   <!-- init foo() -->
   <foo>
     <!-- Exception: TypeError -->
   </foo:NULL>
   <!-- Exception: TypeError -->
-</file '%s/observer_types_%d.php'>
+</file '%s%eobserver_types_%d.php'>
 
 Fatal error: Uncaught TypeError: foo(): Argument #1 ($a) must be of type array, int given, called in %s:%d
 Stack trace:
-#0 %s/observer_types_%d.php(%d): foo(42)
+#0 %s%eobserver_types_%d.php(%d): foo(42)
 #1 {main}
-  thrown in %s/observer_types_%d.php on line %d
+  thrown in %s%eobserver_types_%d.php on line %d

diff --git a/ext/zend_test/tests/observer_zend_call_function_01.phpt b/ext/zend_test/tests/observer_zend_call_function_01.phpt
index 03d7287470c8340412fb4142b88708d68a421811..73b0f92cce2c137eb9c365f4d906daa68665033d 100644 (file)
--- a/ext/zend_test/tests/observer_zend_call_function_01.phpt
+++ b/ext/zend_test/tests/observer_zend_call_function_01.phpt
@@ -18,8 +18,8 @@ var_dump(array_reduce($a, 'sum'));
 echo 'Done' . PHP_EOL;
 ?>
 --EXPECTF--
-<!-- init '%s/observer_zend_call_function_%d.php' -->
-<file '%s/observer_zend_call_function_%d.php'>
+<!-- init '%s%eobserver_zend_call_function_%d.php' -->
+<file '%s%eobserver_zend_call_function_%d.php'>
   <!-- init sum() -->
   <sum>
   </sum>
@@ -33,4 +33,4 @@ echo 'Done' . PHP_EOL;
   </sum>
 int(15)
 Done
-</file '%s/observer_zend_call_function_%d.php'>
+</file '%s%eobserver_zend_call_function_%d.php'>