From f3415758d1f95eadb0dc467eae78930521b0d003 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 19 Jan 2021 11:11:40 +0100
Subject: Fix observer tests on Windows

Use %e instead of a hardcoded forward slash.
---
 ext/zend_test/tests/observer_backtrace_01.phpt         | 18 +++++++++---------
 ext/zend_test/tests/observer_basic_01.phpt             |  6 +++---
 ext/zend_test/tests/observer_basic_02.phpt             |  6 +++---
 ext/zend_test/tests/observer_basic_03.phpt             | 12 ++++++------
 ext/zend_test/tests/observer_basic_04.phpt             | 12 ++++++------
 ext/zend_test/tests/observer_basic_05.phpt             |  4 ++--
 ext/zend_test/tests/observer_call_user_func_01.phpt    |  6 +++---
 ext/zend_test/tests/observer_call_user_func_02.phpt    |  6 +++---
 ext/zend_test/tests/observer_call_user_func_03.phpt    |  6 +++---
 ext/zend_test/tests/observer_call_user_func_04.phpt    |  6 +++---
 ext/zend_test/tests/observer_closure_01.phpt           |  6 +++---
 ext/zend_test/tests/observer_error_01.phpt             |  6 +++---
 ext/zend_test/tests/observer_error_02.phpt             |  6 +++---
 ext/zend_test/tests/observer_error_03.phpt             |  6 +++---
 ext/zend_test/tests/observer_error_04.phpt             |  6 +++---
 ext/zend_test/tests/observer_eval_01.phpt              | 12 ++++++------
 ext/zend_test/tests/observer_exception_01.phpt         | 12 ++++++------
 ext/zend_test/tests/observer_generator_01.phpt         |  6 +++---
 ext/zend_test/tests/observer_generator_02.phpt         |  6 +++---
 ext/zend_test/tests/observer_generator_03.phpt         |  6 +++---
 ext/zend_test/tests/observer_generator_04.phpt         |  6 +++---
 ext/zend_test/tests/observer_generator_05.phpt         | 14 +++++++-------
 ext/zend_test/tests/observer_magic_01.phpt             |  6 +++---
 ext/zend_test/tests/observer_opline_01.phpt            | 12 ++++++------
 ext/zend_test/tests/observer_retval_01.phpt            |  6 +++---
 ext/zend_test/tests/observer_retval_02.phpt            |  6 +++---
 ext/zend_test/tests/observer_retval_03.phpt            |  6 +++---
 ext/zend_test/tests/observer_retval_04.phpt            |  6 +++---
 ext/zend_test/tests/observer_retval_05.phpt            |  6 +++---
 ext/zend_test/tests/observer_retval_06.phpt            |  6 +++---
 ext/zend_test/tests/observer_retval_07.phpt            |  6 +++---
 ext/zend_test/tests/observer_retval_by_ref_01.phpt     |  6 +++---
 ext/zend_test/tests/observer_retval_by_ref_02.phpt     |  6 +++---
 ext/zend_test/tests/observer_retval_by_ref_03.phpt     |  6 +++---
 ext/zend_test/tests/observer_shutdown_01.phpt          |  6 +++---
 ext/zend_test/tests/observer_shutdown_02.phpt          |  6 +++---
 ext/zend_test/tests/observer_types_01.phpt             | 10 +++++-----
 .../tests/observer_zend_call_function_01.phpt          |  6 +++---
 38 files changed, 140 insertions(+), 140 deletions(-)

diff --git a/ext/zend_test/tests/observer_backtrace_01.phpt b/ext/zend_test/tests/observer_backtrace_01.phpt
index 7aa47c2ef2..ece481cbba 100644
--- 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 9e31204dbe..064ed99a29 100644
--- 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 9d16b4fe18..2b4d632d69 100644
--- 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 6a2d0b16ee..8675a0fdc0 100644
--- 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 6c0a8df59d..6fc1fae1c0 100644
--- 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 27462aadb3..de14ebc1fd 100644
--- 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 0f12fa6835..802db43e33 100644
--- 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 28dd6a9825..25de267c06 100644
--- 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 1ff841d434..7c041cbc70 100644
--- 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 9df131db4d..ebcf06082b 100644
--- 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 3e120493bc..85312b32ef 100644
--- 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 5ea619f324..e80a9ec3c7 100644
--- 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 959544e9b8..9dfa71d182 100644
--- 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 3d8150a440..606b827bb2 100644
--- 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 ca2532a06b..49c56c17ab 100644
--- 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 1a230c7d96..addce2dba5 100644
--- 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 fd49c0618b..6ded60c970 100644
--- 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 a2d8b02a2b..34314cbf36 100644
--- 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 2e045f93f2..9d29b9e8e5 100644
--- 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 459bdfb424..cad6e3bb96 100644
--- 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 bf6b4e6c69..dd941dd78f 100644
--- 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 d13f6fa39b..8809511361 100644
--- 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 920f934b6c..bae01e3b17 100644
--- 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 d7d17f2b47..924c22b3a0 100644
--- 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 844d9037f3..1359a00d40 100644
--- 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 6b2e3548a2..b48d8d6b7e 100644
--- 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 a21ed97c25..227fe5670a 100644
--- 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 883dd85498..f6aea0d1e2 100644
--- 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 45fe981f29..e987a06d7a 100644
--- 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 f5d2988725..b3a64b3ee8 100644
--- 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 abd518b0e4..678027a01a 100644
--- 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 4e96ab010b..2e7d910aac 100644
--- 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 b056a80ce7..7283a8d967 100644
--- 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 f09174fc22..b75e589095 100644
--- 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 04784cd175..5fcc7aeb81 100644
--- 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 b666a92e15..410403df1a 100644
--- 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 31c1206714..7b5408a456 100644
--- 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 03d7287470..73b0f92cce 100644
--- 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'>
-- 
cgit v1.2.1