summaryrefslogtreecommitdiffstats
path: root/php74.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-09-19 07:36:47 +0200
committerRemi Collet <remi@remirepo.net>2019-09-19 07:36:47 +0200
commit35301069a50867faec1b3ea3f78234f73e941880 (patch)
tree00968b4dbc599ca28efe02fafe2fa21ac7821d0b /php74.patch
parentf44c13bef1dc36789dff7941e8b8300ec613a857 (diff)
v0.30.2
Diffstat (limited to 'php74.patch')
-rw-r--r--php74.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/php74.patch b/php74.patch
new file mode 100644
index 0000000..41926ff
--- /dev/null
+++ b/php74.patch
@@ -0,0 +1,37 @@
+Adapted for 0.30.2 from upstream patch
+
+
+
+From 433177dd98f81585748e697ebaa104d0ad76a234 Mon Sep 17 00:00:00 2001
+From: Levi Morrison <levi.morrison@datadoghq.com>
+Date: Fri, 23 Aug 2019 08:06:27 -0600
+Subject: [PATCH] Avoid reserved word "fn"
+
+In PHP 7.4 and forward "fn" is a keyword.
+Also fixes misspelling in the name of the file.
+diff --git a/tests/ext/desctructor_called_when_this_gets_out_of_scope.phpt b/tests/ext/desctructor_called_when_this_gets_out_of_scope.phpt
+--- a/tests/ext/desctructor_called_when_this_gets_out_of_scope.phpt
++++ b/tests/ext/desctructor_called_when_this_gets_out_of_scope.phpt
+@@ -16,18 +16,18 @@ class Test {
+ dd_trace("Test", "m", function() {
+ return dd_trace_forward_call() . " OVERRIDE";
+ });
+-function fn() {
++function func() {
+ $test = new Test();
+ echo $test->m() . PHP_EOL;
+- echo "FN" . PHP_EOL;
++ echo "FUNC" . PHP_EOL;
+ }
+
+-fn();
++func();
+ echo "FINISH" . PHP_EOL;
+ ?>
+
+ --EXPECT--
+ M OVERRIDE
+-FN
++FUNC
+ DESTRUCT
+ FINISH