diff options
author | Remi Collet <remi@remirepo.net> | 2019-05-27 11:29:28 +0200 |
---|---|---|
committer | Remi Collet <remi@remirepo.net> | 2019-05-27 11:29:28 +0200 |
commit | eabc1c8d680c17b8454078b7588760341077cd9f (patch) | |
tree | 1d26774e1a8aa4ae336fbf6563d3646fd6c9680c /452.patch | |
parent | 6035729de45e4cbdaad682f70712d5867d2fbed8 (diff) |
add patch for 7.4 from https://github.com/DataDog/dd-trace-php/pull/452
Diffstat (limited to '452.patch')
-rw-r--r-- | 452.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/452.patch b/452.patch new file mode 100644 index 0000000..0f0aa7e --- /dev/null +++ b/452.patch @@ -0,0 +1,65 @@ +From 780eb8ebf70e5e31fab71010b0a49a6fde125f63 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Mon, 27 May 2019 11:23:39 +0200 +Subject: [PATCH] fix test for upcomint 7.4 + +--- + tests/ext/namespaces.phpt | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/tests/ext/namespaces.phpt b/tests/ext/namespaces.phpt +index 60ac9d6e..1c870ee3 100644 +--- a/tests/ext/namespaces.phpt ++++ b/tests/ext/namespaces.phpt +@@ -2,7 +2,7 @@ + Verify functions and methods can be overriden even when in namespaces. + --FILE-- + <?php +-namespace Fn { ++namespace Func { + function test($c, $end){ + echo "FUNCTION START " . $c . PHP_EOL; + +@@ -21,8 +21,8 @@ namespace Klass { + class Test { + public function m($c, $end){ + echo "METHOD START " . $c . PHP_EOL; +- \Fn\test(1, 2); +- \Fn\test_va(1,2); ++ \Func\test(1, 2); ++ \Func\test_va(1,2); + + if ($c < $end) { + $this->m($c + 1, $end); +@@ -42,15 +42,15 @@ namespace Klass { + } + + namespace { +- dd_trace("Fn\\test", function($c, $end){ ++ dd_trace("Func\\test", function($c, $end){ + echo "F HOOK START " . $c . PHP_EOL; +- Fn\test($c, $end); ++ Func\test($c, $end); + echo "F HOOK END " . $c . PHP_EOL; + }); + +- dd_trace("Fn\\test_va", function($c, $end){ ++ dd_trace("Func\\test_va", function($c, $end){ + echo "FVA HOOK START " . $c . PHP_EOL; +- Fn\test_va($c, $end); ++ Func\test_va($c, $end); + echo "FVA HOOK END " . $c . PHP_EOL; + }); + +@@ -60,9 +60,9 @@ namespace { + echo "M2 HOOK END " . $c . PHP_EOL; + }); + +- Fn\test(1, 3); ++ Func\test(1, 3); + echo PHP_EOL; +- Fn\test_va(1,3); ++ Func\test_va(1,3); + echo PHP_EOL; + (new Klass\Test())->m(1,3); + echo PHP_EOL; |