summaryrefslogtreecommitdiffstats
path: root/php74.patch
blob: 41926ffa6c319b70a6040226bb76fc074d16478a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
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