From b9c0e38dbc75c0102e3a361f8f831a7ec72c50cf Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 4 Oct 2019 08:08:20 +0200 Subject: v0.31.0 --- php74.patch | 37 ------------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 php74.patch (limited to 'php74.patch') diff --git a/php74.patch b/php74.patch deleted file mode 100644 index 41926ff..0000000 --- a/php74.patch +++ /dev/null @@ -1,37 +0,0 @@ -Adapted for 0.30.2 from upstream patch - - - -From 433177dd98f81585748e697ebaa104d0ad76a234 Mon Sep 17 00:00:00 2001 -From: Levi Morrison -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 -- cgit