Skip to content

Commit d1fe9ae

Browse files
nikicnikic
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Fix observer tests on Windows
2 parents 8c3d279 + f341575 commit d1fe9ae

38 files changed

+140
-140
lines changed

‎ext/zend_test/tests/observer_backtrace_01.phpt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,23 @@ function foo()
3737
var_dump(foo());
3838
?>
3939
--EXPECTF--
40-
<!-- init '%s/observer_backtrace_%d.php' -->
40+
<!-- init '%s%eobserver_backtrace_%d.php' -->
4141
<!--
42-
{main} %s/observer_backtrace_%d.php
42+
{main} %s%eobserver_backtrace_%d.php
4343
-->
44-
<file '%s/observer_backtrace_%d.php'>
44+
<file '%s%eobserver_backtrace_%d.php'>
4545
<!-- init foo() -->
4646
<!--
4747
foo()
48-
{main} %s/observer_backtrace_%d.php
48+
{main} %s%eobserver_backtrace_%d.php
4949
-->
5050
<foo>
5151
<!-- init gen() -->
5252
<!--
5353
gen()
5454
Generator::current()
5555
foo()
56-
{main} %s/observer_backtrace_%d.php
56+
{main} %s%eobserver_backtrace_%d.php
5757
-->
5858
<gen>
5959
<!-- init TestClass::foo() -->
@@ -62,7 +62,7 @@ var_dump(foo());
6262
gen()
6363
Generator::current()
6464
foo()
65-
{main} %s/observer_backtrace_%d.php
65+
{main} %s%eobserver_backtrace_%d.php
6666
-->
6767
<TestClass::foo>
6868
<!-- init TestClass::{closure}() -->
@@ -73,7 +73,7 @@ var_dump(foo());
7373
gen()
7474
Generator::current()
7575
foo()
76-
{main} %s/observer_backtrace_%d.php
76+
{main} %s%eobserver_backtrace_%d.php
7777
-->
7878
<TestClass::{closure}>
7979
<!-- init TestClass::bar() -->
@@ -85,7 +85,7 @@ var_dump(foo());
8585
gen()
8686
Generator::current()
8787
foo()
88-
{main} %s/observer_backtrace_%d.php
88+
{main} %s%eobserver_backtrace_%d.php
8989
-->
9090
<TestClass::bar>
9191
</TestClass::bar>
@@ -103,4 +103,4 @@ array(2) {
103103
[1]=>
104104
int(1337)
105105
}
106-
</file '%s/observer_backtrace_%d.php'>
106+
</file '%s%eobserver_backtrace_%d.php'>

‎ext/zend_test/tests/observer_basic_01.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ foo();
2626
echo 'DONE' . PHP_EOL;
2727
?>
2828
--EXPECTF--
29-
<!-- init '%s/observer_basic_01.php' -->
30-
<file '%s/observer_basic_01.php'>
29+
<!-- init '%s%eobserver_basic_01.php' -->
30+
<file '%s%eobserver_basic_01.php'>
3131
<!-- init foo() -->
3232
<foo>
3333
Foo
@@ -52,4 +52,4 @@ int(6)
5252
</bar>
5353
</foo>
5454
DONE
55-
</file '%s/observer_basic_01.php'>
55+
</file '%s%eobserver_basic_01.php'>

‎ext/zend_test/tests/observer_basic_02.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ $test->foo();
3030
echo 'DONE' . PHP_EOL;
3131
?>
3232
--EXPECTF--
33-
<!-- init '%s/observer_basic_02.php' -->
34-
<file '%s/observer_basic_02.php'>
33+
<!-- init '%s%eobserver_basic_02.php' -->
34+
<file '%s%eobserver_basic_02.php'>
3535
<!-- init TestClass::foo() -->
3636
<TestClass::foo>
3737
Foo
@@ -56,4 +56,4 @@ int(6)
5656
</TestClass::bar>
5757
</TestClass::foo>
5858
DONE
59-
</file '%s/observer_basic_02.php'>
59+
</file '%s%eobserver_basic_02.php'>

‎ext/zend_test/tests/observer_basic_03.phpt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@ include __DIR__ . '/observer.inc';
1717
foo();
1818
?>
1919
--EXPECTF--
20-
<!-- init '%s/observer_basic_03.php' -->
21-
<file '%s/observer_basic_03.php'>
20+
<!-- init '%s%eobserver_basic_03.php' -->
21+
<file '%s%eobserver_basic_03.php'>
2222
<!-- init foo() -->
2323
<foo>
2424
Foo
2525
</foo>
26-
<!-- init '%s/observer.inc' -->
27-
<file '%s/observer.inc'>
26+
<!-- init '%s%eobserver.inc' -->
27+
<file '%s%eobserver.inc'>
2828
<!-- init foo_observer_test() -->
2929
<foo_observer_test>
3030
foo_observer_test
3131
</foo_observer_test>
32-
</file '%s/observer.inc'>
32+
</file '%s%eobserver.inc'>
3333
<foo>
3434
Foo
3535
</foo>
36-
</file '%s/observer_basic_03.php'>
36+
</file '%s%eobserver_basic_03.php'>

‎ext/zend_test/tests/observer_basic_04.phpt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ include __DIR__ . '/observer.inc';
1717
foo();
1818
?>
1919
--EXPECTF--
20-
<!-- init '%s/observer_basic_04.php' -->
21-
<file '%s/observer_basic_04.php'>
20+
<!-- init '%s%eobserver_basic_04.php' -->
21+
<file '%s%eobserver_basic_04.php'>
2222
<!-- init foo() -->
2323
Foo
24-
<!-- init '%s/observer.inc' -->
25-
<file '%s/observer.inc'>
24+
<!-- init '%s%eobserver.inc' -->
25+
<file '%s%eobserver.inc'>
2626
<!-- init foo_observer_test() -->
2727
foo_observer_test
28-
</file '%s/observer.inc'>
28+
</file '%s%eobserver.inc'>
2929
Foo
30-
</file '%s/observer_basic_04.php'>
30+
</file '%s%eobserver_basic_04.php'>

‎ext/zend_test/tests/observer_basic_05.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ include __DIR__ . '/observer.inc';
1717
foo();
1818
?>
1919
--EXPECTF--
20-
<!-- init '%s/observer_basic_05.php' -->
20+
<!-- init '%s%eobserver_basic_05.php' -->
2121
<!-- init foo() -->
2222
<foo>
2323
Foo
2424
</foo>
25-
<!-- init '%s/observer.inc' -->
25+
<!-- init '%s%eobserver.inc' -->
2626
<!-- init foo_observer_test() -->
2727
<foo_observer_test>
2828
foo_observer_test

‎ext/zend_test/tests/observer_call_user_func_01.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ namespace {
2727
}
2828
?>
2929
--EXPECTF--
30-
<!-- init '%s/observer_call_user_func_%d.php' -->
31-
<file '%s/observer_call_user_func_%d.php'>
30+
<!-- init '%s%eobserver_call_user_func_%d.php' -->
31+
<file '%s%eobserver_call_user_func_%d.php'>
3232
<!-- init Test\MyClass::myMethod() -->
3333
<Test\MyClass::myMethod>
3434
MyClass::myMethod called
@@ -37,4 +37,4 @@ MyClass::myMethod called
3737
<Test\my_function>
3838
my_function called
3939
</Test\my_function>
40-
</file '%s/observer_call_user_func_%d.php'>
40+
</file '%s%eobserver_call_user_func_%d.php'>

‎ext/zend_test/tests/observer_call_user_func_02.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ namespace {
2727
}
2828
?>
2929
--EXPECTF--
30-
<!-- init '%s/observer_call_user_func_%d.php' -->
31-
<file '%s/observer_call_user_func_%d.php'>
30+
<!-- init '%s%eobserver_call_user_func_%d.php' -->
31+
<file '%s%eobserver_call_user_func_%d.php'>
3232
<!-- init Test\MyClass::myMethod() -->
3333
<Test\MyClass::myMethod>
3434
MyClass::myMethod called
@@ -37,4 +37,4 @@ MyClass::myMethod called
3737
<Test\my_function>
3838
my_function called
3939
</Test\my_function>
40-
</file '%s/observer_call_user_func_%d.php'>
40+
</file '%s%eobserver_call_user_func_%d.php'>

‎ext/zend_test/tests/observer_call_user_func_03.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ namespace Test {
2626
}
2727
?>
2828
--EXPECTF--
29-
<!-- init '%s/observer_call_user_func_%d.php' -->
30-
<file '%s/observer_call_user_func_%d.php'>
29+
<!-- init '%s%eobserver_call_user_func_%d.php' -->
30+
<file '%s%eobserver_call_user_func_%d.php'>
3131
<!-- init Test\MyClass::myMethod() -->
3232
<Test\MyClass::myMethod>
3333
MyClass::myMethod called
@@ -36,4 +36,4 @@ MyClass::myMethod called
3636
<Test\my_function>
3737
my_function called
3838
</Test\my_function>
39-
</file '%s/observer_call_user_func_%d.php'>
39+
</file '%s%eobserver_call_user_func_%d.php'>

‎ext/zend_test/tests/observer_call_user_func_04.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ namespace Test {
2626
}
2727
?>
2828
--EXPECTF--
29-
<!-- init '%s/observer_call_user_func_%d.php' -->
30-
<file '%s/observer_call_user_func_%d.php'>
29+
<!-- init '%s%eobserver_call_user_func_%d.php' -->
30+
<file '%s%eobserver_call_user_func_%d.php'>
3131
<!-- init Test\MyClass::myMethod() -->
3232
<Test\MyClass::myMethod>
3333
MyClass::myMethod called
@@ -36,4 +36,4 @@ MyClass::myMethod called
3636
<Test\my_function>
3737
my_function called
3838
</Test\my_function>
39-
</file '%s/observer_call_user_func_%d.php'>
39+
</file '%s%eobserver_call_user_func_%d.php'>

‎ext/zend_test/tests/observer_closure_01.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ $foo($bar);
2323
echo 'DONE' . PHP_EOL;
2424
?>
2525
--EXPECTF--
26-
<!-- init '%s/observer_closure_%d.php' -->
27-
<file '%s/observer_closure_%d.php'>
26+
<!-- init '%s%eobserver_closure_%d.php' -->
27+
<file '%s%eobserver_closure_%d.php'>
2828
<!-- init {closure}() -->
2929
<{closure}>
3030
Answer
@@ -46,4 +46,4 @@ int(42)
4646
</{closure}>
4747
</{closure}>
4848
DONE
49-
</file '%s/observer_closure_%d.php'>
49+
</file '%s%eobserver_closure_%d.php'>

‎ext/zend_test/tests/observer_error_01.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ foo();
1919
echo 'You should not see this.';
2020
?>
2121
--EXPECTF--
22-
<!-- init '%s/observer_error_%d.php' -->
23-
<file '%s/observer_error_%d.php'>
22+
<!-- init '%s%eobserver_error_%d.php' -->
23+
<file '%s%eobserver_error_%d.php'>
2424
<!-- init foo() -->
2525
<foo>
2626

2727
Fatal error: Allowed memory size of 2097152 bytes exhausted%s(tried to allocate %d bytes) in %s on line %d
2828
</foo:NULL>
29-
</file '%s/observer_error_%d.php'>
29+
</file '%s%eobserver_error_%d.php'>

‎ext/zend_test/tests/observer_error_02.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ foo();
1818
echo 'You should not see this.';
1919
?>
2020
--EXPECTF--
21-
<!-- init '%s/observer_error_%d.php' -->
22-
<file '%s/observer_error_%d.php'>
21+
<!-- init '%s%eobserver_error_%d.php' -->
22+
<file '%s%eobserver_error_%d.php'>
2323
<!-- init foo() -->
2424
<foo>
2525

2626
Fatal error: Foo error in %s on line %d
2727
</foo:NULL>
28-
</file '%s/observer_error_%d.php'>
28+
</file '%s%eobserver_error_%d.php'>

‎ext/zend_test/tests/observer_error_03.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ main();
2424
echo 'Done.' . PHP_EOL;
2525
?>
2626
--EXPECTF--
27-
<!-- init '%s/observer_error_%d.php' -->
28-
<file '%s/observer_error_%d.php'>
27+
<!-- init '%s%eobserver_error_%d.php' -->
28+
<file '%s%eobserver_error_%d.php'>
2929
<!-- init main() -->
3030
<main>
3131
<!-- init foo() -->
@@ -36,4 +36,4 @@ Warning: Undefined variable $this_does_not_exit in %s on line %d
3636
After error.
3737
</main:NULL>
3838
Done.
39-
</file '%s/observer_error_%d.php'>
39+
</file '%s%eobserver_error_%d.php'>

‎ext/zend_test/tests/observer_error_04.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ try {
3030
echo 'Done.' . PHP_EOL;
3131
?>
3232
--EXPECTF--
33-
<!-- init '%s/observer_error_%d.php' -->
34-
<file '%s/observer_error_%d.php'>
33+
<!-- init '%s%eobserver_error_%d.php' -->
34+
<file '%s%eobserver_error_%d.php'>
3535
<!-- init main() -->
3636
<main>
3737
<!-- init foo() -->
@@ -43,4 +43,4 @@ echo 'Done.' . PHP_EOL;
4343
SOAP-ERROR: Parsing WSDL: Couldn't load from 'foo' : failed to load external entity "foo"
4444

4545
Done.
46-
</file '%s/observer_error_%d.php'>
46+
</file '%s%eobserver_error_%d.php'>

‎ext/zend_test/tests/observer_eval_01.phpt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ echo eval("return 'Foo eval' . PHP_EOL;");
1111
echo 'DONE' . PHP_EOL;
1212
?>
1313
--EXPECTF--
14-
<!-- init '%s/observer_eval_%d.php' -->
15-
<file '%s/observer_eval_%d.php'>
16-
<!-- init '%s/observer_eval_%d.php(%d) : eval()'d code' -->
17-
<file '%s/observer_eval_%d.php(%d) : eval()'d code'>
18-
</file '%s/observer_eval_%d.php(%d) : eval()'d code'>
14+
<!-- init '%s%eobserver_eval_%d.php' -->
15+
<file '%s%eobserver_eval_%d.php'>
16+
<!-- init '%s%eobserver_eval_%d.php(%d) : eval()'d code' -->
17+
<file '%s%eobserver_eval_%d.php(%d) : eval()'d code'>
18+
</file '%s%eobserver_eval_%d.php(%d) : eval()'d code'>
1919
Foo eval
2020
DONE
21-
</file '%s/observer_eval_%d.php'>
21+
</file '%s%eobserver_eval_%d.php'>

‎ext/zend_test/tests/observer_exception_01.phpt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ foo();
2323
echo 'You should not see this' . PHP_EOL;
2424
?>
2525
--EXPECTF--
26-
<!-- init '%s/observer_exception_%d.php' -->
27-
<file '%s/observer_exception_%d.php'>
26+
<!-- init '%s%eobserver_exception_%d.php' -->
27+
<file '%s%eobserver_exception_%d.php'>
2828
<!-- init foo() -->
2929
<foo>
3030
Call #0
@@ -37,10 +37,10 @@ Call #2
3737
<!-- Exception: RuntimeException -->
3838
</foo>
3939
<!-- Exception: RuntimeException -->
40-
</file '%s/observer_exception_%d.php'>
40+
</file '%s%eobserver_exception_%d.php'>
4141

42-
Fatal error: Uncaught RuntimeException: Third time is a charm in %s/observer_exception_%d.php:%d
42+
Fatal error: Uncaught RuntimeException: Third time is a charm in %s%eobserver_exception_%d.php:%d
4343
Stack trace:
44-
#0 %s/observer_exception_%d.php(%d): foo()
44+
#0 %s%eobserver_exception_%d.php(%d): foo()
4545
#1 {main}
46-
thrown in %s/observer_exception_%d.php on line %d
46+
thrown in %s%eobserver_exception_%d.php on line %d

‎ext/zend_test/tests/observer_generator_01.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ function doSomething() {
2626
echo doSomething() . PHP_EOL;
2727
?>
2828
--EXPECTF--
29-
<!-- init '%s/observer_generator_%d.php' -->
30-
<file '%s/observer_generator_%d.php'>
29+
<!-- init '%s%eobserver_generator_%d.php' -->
30+
<file '%s%eobserver_generator_%d.php'>
3131
<!-- init doSomething() -->
3232
<doSomething>
3333
<!-- init getResults() -->
@@ -44,4 +44,4 @@ echo doSomething() . PHP_EOL;
4444
</getResults:NULL>
4545
</doSomething:'Done'>
4646
Done
47-
</file '%s/observer_generator_%d.php'>
47+
</file '%s%eobserver_generator_%d.php'>

‎ext/zend_test/tests/observer_generator_02.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ function doSomething() {
2828
echo doSomething() . PHP_EOL;
2929
?>
3030
--EXPECTF--
31-
<!-- init '%s/observer_generator_%d.php' -->
32-
<file '%s/observer_generator_%d.php'>
31+
<!-- init '%s%eobserver_generator_%d.php' -->
32+
<file '%s%eobserver_generator_%d.php'>
3333
<!-- init doSomething() -->
3434
<doSomething>
3535
<!-- init getResults() -->
@@ -47,4 +47,4 @@ echo doSomething() . PHP_EOL;
4747
1337
4848
</doSomething:'Done'>
4949
Done
50-
</file '%s/observer_generator_%d.php'>
50+
</file '%s%eobserver_generator_%d.php'>

0 commit comments

Comments
 (0)