04/04: gnu: PHP: Fix test failure with newer cURL.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit 7aab4eddd04e4b26986903680b28dce2de0f4db0
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Jul 23 16:32:33 2022 +0200

    gnu: PHP: Fix test failure with newer cURL.
    
    * gnu/packages/patches/php-curl-compat.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Adjust accordingly.
    * gnu/packages/php.scm (php)[source](patches): Add it.
---
 gnu/local.mk                               |  3 ++-
 gnu/packages/patches/php-curl-compat.patch | 17 +++++++++++++++++
 gnu/packages/php.scm                       |  3 ++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 9dd87d2e88..0c4edf6e56 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1631,7 +1631,8 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/perl-www-curl-fix-struct-void.patch     \
   %D%/packages/patches/perl-www-curl-remove-symbol.patch       \
   %D%/packages/patches/phoronix-test-suite-fsdg.patch          \
-  %D%/packages/patches/php-bug-74093-test.patch \
+  %D%/packages/patches/php-bug-74093-test.patch                        \
+  %D%/packages/patches/php-curl-compat.patch                   \
   %D%/packages/patches/picard-fix-id3-rename-test.patch                \
   %D%/packages/patches/picprog-non-intel-support.patch         \
   %D%/packages/patches/pidgin-add-search-path.patch            \
diff --git a/gnu/packages/patches/php-curl-compat.patch 
b/gnu/packages/patches/php-curl-compat.patch
new file mode 100644
index 0000000000..0617251194
--- /dev/null
+++ b/gnu/packages/patches/php-curl-compat.patch
@@ -0,0 +1,17 @@
+Fix test result with cURL 7.83 and later.
+
+Taken from upstream:
+
+  
https://github.com/php/php-src/commit/a4179e4c92b6365d39e09cb9cd63c476848013af
+
+diff --git a/ext/curl/tests/curl_basic_007.phpt 
b/ext/curl/tests/curl_basic_007.phpt
+index 3b53658d6a7e..3834e4674f82 100644
+--- a/ext/curl/tests/curl_basic_007.phpt
++++ b/ext/curl/tests/curl_basic_007.phpt
+@@ -20,5 +20,5 @@ curl_close($ch);
+ 
+ ?>
+ --EXPECTF--
+-string(%d) "No URL set!%w"
++string(%d) "No URL set%A"
+ int(3)
diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm
index 22cf674218..fdea27160d 100644
--- a/gnu/packages/php.scm
+++ b/gnu/packages/php.scm
@@ -70,7 +70,8 @@
               (sha256
                (base32
                 "03d7icwys4ikl45q3rgsxv1m3i7kfxhykpx75nn7jzn6697s6wpa"))
-              (patches (search-patches "php-bug-74093-test.patch"))
+              (patches (search-patches "php-bug-74093-test.patch"
+                                       "php-curl-compat.patch"))
               (modules '((guix build utils)))
               (snippet
                '(with-directory-excursion "ext"