Fix observer tests on Windows

Use %e instead of a hardcoded forward slash.
php · Jan 19, 2021 · f341575 · f341575
1 parent 05d1680
commit f341575
Show file tree

Hide file tree

Showing 38 changed files with 140 additions and 140 deletions.
diff --git a/ext/zend_test/tests/observer_backtrace_01.phpt b/ext/zend_test/tests/observer_backtrace_01.phpt
@@ -37,23 +37,23 @@ 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() -->
     <!--
         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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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'>