From e8cfce439afed945e352ad28f73f0a5f7840f503 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Thu, 28 Mar 2019 22:55:17 +0100
Subject: gnu: php: Disable failing tests on armhf.

* gnu/packages/php.scm (php)[arguments]: Disable failing tests on armhf.
---
 gnu/packages/php.scm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/php.scm')

diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm
index 8d96e54c90..ffb81da5fc 100644
--- a/gnu/packages/php.scm
+++ b/gnu/packages/php.scm
@@ -86,7 +86,7 @@
                   #t))))
     (build-system gnu-build-system)
     (arguments
-     '(#:configure-flags
+     `(#:configure-flags
        (let-syntax ((with (syntax-rules ()
                             ((_ option input)
                              (string-append option "="
@@ -182,6 +182,17 @@
              (substitute* "ext/standard/tests/streams/bug60602.phpt"
                (("'ls'") (string-append "'" (which "ls") "'")))
 
+             ,@(if (string-prefix? "armhf" (or (%current-system)
+                                               (%current-target-system)))
+                   ;; Drop tests known to fail on armhf.
+                   '((for-each delete-file
+                              (list
+                                "ext/calendar/tests/unixtojd_error1.phpt"
+                                ;; arm can be a lot slower, so a time-related test fails
+                                "ext/fileinfo/tests/cve-2014-3538-nojit.phpt"
+                                "ext/pcre/tests/bug76514.phpt"
+                                "ext/pcre/tests/preg_match_error3.phpt"))))
+
              ;; Drop tests that are known to fail.
              (for-each delete-file
                        '("ext/posix/tests/posix_getgrgid.phpt"    ; Requires /etc/group.
-- 
cgit 1.4.1


From 9398152ad1f4e130ad895c8bb756de8a33e91f7f Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Fri, 29 Mar 2019 15:34:37 +0100
Subject: gnu: php: Fix typo.

Regression introduced in e8cfce439afed945e352ad28f73f0a5f7840f503.

* gnu/packages/php.scm (php)[arguments]: Add missing 'else' branch of
the 'if'.  Change first argument to 'string-prefix?' to match GNU
triplets as well.
---
 gnu/packages/php.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/php.scm')

diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm
index ffb81da5fc..ea002f8c59 100644
--- a/gnu/packages/php.scm
+++ b/gnu/packages/php.scm
@@ -182,8 +182,8 @@
              (substitute* "ext/standard/tests/streams/bug60602.phpt"
                (("'ls'") (string-append "'" (which "ls") "'")))
 
-             ,@(if (string-prefix? "armhf" (or (%current-system)
-                                               (%current-target-system)))
+             ,@(if (string-prefix? "arm" (or (%current-system)
+                                             (%current-target-system)))
                    ;; Drop tests known to fail on armhf.
                    '((for-each delete-file
                               (list
@@ -191,7 +191,8 @@
                                 ;; arm can be a lot slower, so a time-related test fails
                                 "ext/fileinfo/tests/cve-2014-3538-nojit.phpt"
                                 "ext/pcre/tests/bug76514.phpt"
-                                "ext/pcre/tests/preg_match_error3.phpt"))))
+                                "ext/pcre/tests/preg_match_error3.phpt")))
+                   '())
 
              ;; Drop tests that are known to fail.
              (for-each delete-file
-- 
cgit 1.4.1


From a779689714173877916c1c4a732f8db2c0045ff8 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Thu, 4 Apr 2019 21:37:30 +0200
Subject: gnu: php: Update to 7.3.4.

* gnu/packages/php.scm (php): Update to 7.3.4.
---
 gnu/packages/php.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/php.scm')

diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm
index ea002f8c59..c7e6fcb6e9 100644
--- a/gnu/packages/php.scm
+++ b/gnu/packages/php.scm
@@ -58,7 +58,7 @@
 (define-public php
   (package
     (name "php")
-    (version "7.3.3")
+    (version "7.3.4")
     (home-page "https://secure.php.net/")
     (source (origin
               (method url-fetch)
@@ -66,7 +66,7 @@
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1cxrpaz5cvx1qq9klwgvcyvcly865sxpn4bdk82wpl43l5wkxc3b"))
+                "10rvj9dn41213w0q2l123rn6sycr29syik88czprhpv5z2hrzrvg"))
               (modules '((guix build utils)))
               (snippet
                '(with-directory-excursion "ext"
-- 
cgit 1.4.1


From bd9d5dbb86c7204a73b6e7dbe03b767748b33365 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Wed, 1 May 2019 21:13:00 +0200
Subject: gnu: php: Disable failing tests on armhf.

* gnu/packages/php.scm (php)[arguments]: Disable two failing tests on
armhf.
---
 gnu/packages/php.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/php.scm')

diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm
index c7e6fcb6e9..45dd2bdd3a 100644
--- a/gnu/packages/php.scm
+++ b/gnu/packages/php.scm
@@ -191,7 +191,9 @@
                                 ;; arm can be a lot slower, so a time-related test fails
                                 "ext/fileinfo/tests/cve-2014-3538-nojit.phpt"
                                 "ext/pcre/tests/bug76514.phpt"
-                                "ext/pcre/tests/preg_match_error3.phpt")))
+                                "ext/pcre/tests/preg_match_error3.phpt"
+                                "ext/standard/tests/general_functions/var_export-locale.phpt"
+                                "ext/standard/tests/general_functions/var_export_basic1.phpt")))
                    '())
 
              ;; Drop tests that are known to fail.
-- 
cgit 1.4.1