From 38a1db9e76f1a3070a47d366eef29ec96a915fbd Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sun, 9 Jul 2023 18:12:50 -0400
Subject: [PATCH 1/2] ext/imap/tests/*mutf7*.phpt: update for missing
 utf8_to_mutf7()

Our ./configure script (ext/imap/config.m4) checks for the
utf8_to_mutf7() function in the c-client library, and defines
HAVE_IMAP_MUTF7 only if it exists. The two corresponding PHP
functions are disabled when it does not, but their tests do
not account for that. Here we add two SKIPIFs to hand that
scenario.
---
 ext/imap/tests/imap_mutf7_to_utf8.phpt       | 9 +++++++++
 ext/imap/tests/imap_utf8_to_mutf7_basic.phpt | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/ext/imap/tests/imap_mutf7_to_utf8.phpt b/ext/imap/tests/imap_mutf7_to_utf8.phpt
index 3d4d7a4057851..de0b3fe2588e3 100644
--- a/ext/imap/tests/imap_mutf7_to_utf8.phpt
+++ b/ext/imap/tests/imap_mutf7_to_utf8.phpt
@@ -2,6 +2,15 @@
 imap_mutf7_to_utf8
 --EXTENSIONS--
 imap
+--SKIPIF--
+<?php
+    // The underlying utf8_from_mutf7 function can be missing; there's
+    // a ./configure check for it that disables the corresponding PHP
+    // function.
+    if (!function_exists('imap_mutf7_to_utf8')) {
+        die("skip no imap_mutf7_to_utf8 function");
+    }
+?>
 --FILE--
 <?php
 
diff --git a/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt b/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt
index 97a9b47303446..64de6c85d4fa1 100644
--- a/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt
+++ b/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt
@@ -2,6 +2,15 @@
 imap_utf8_to_mutf7
 --EXTENSIONS--
 imap
+--SKIPIF--
+<?php
+    // The underlying utf8_to_mutf7 function can be missing; there's
+    // a ./configure check for it that disables the corresponding PHP
+    // function.
+    if (!function_exists('imap_utf8_to_mutf7')) {
+        die("skip no imap_utf8_to_mutf7 function");
+    }
+?>
 --FILE--
 <?php
 

From d5c32608f5b2a98d5ac350209d25510f42b855a4 Mon Sep 17 00:00:00 2001
From: George Peter Banyard <girgias@php.net>
Date: Mon, 10 Jul 2023 09:42:48 +0100
Subject: [PATCH 2/2] [skip ci] indent

---
 ext/imap/tests/imap_mutf7_to_utf8.phpt       | 11 +++++------
 ext/imap/tests/imap_utf8_to_mutf7_basic.phpt | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/ext/imap/tests/imap_mutf7_to_utf8.phpt b/ext/imap/tests/imap_mutf7_to_utf8.phpt
index de0b3fe2588e3..4ff2e15cc574f 100644
--- a/ext/imap/tests/imap_mutf7_to_utf8.phpt
+++ b/ext/imap/tests/imap_mutf7_to_utf8.phpt
@@ -4,12 +4,11 @@ imap_mutf7_to_utf8
 imap
 --SKIPIF--
 <?php
-    // The underlying utf8_from_mutf7 function can be missing; there's
-    // a ./configure check for it that disables the corresponding PHP
-    // function.
-    if (!function_exists('imap_mutf7_to_utf8')) {
-        die("skip no imap_mutf7_to_utf8 function");
-    }
+// The underlying imap_mutf7_to_utf8 function can be missing; there's a
+// ./configure check for it that disables the corresponding PHP function.
+if (!function_exists('imap_mutf7_to_utf8')) {
+    die("skip no imap_mutf7_to_utf8 function");
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt b/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt
index 64de6c85d4fa1..146c330c502eb 100644
--- a/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt
+++ b/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt
@@ -4,12 +4,11 @@ imap_utf8_to_mutf7
 imap
 --SKIPIF--
 <?php
-    // The underlying utf8_to_mutf7 function can be missing; there's
-    // a ./configure check for it that disables the corresponding PHP
-    // function.
-    if (!function_exists('imap_utf8_to_mutf7')) {
-        die("skip no imap_utf8_to_mutf7 function");
-    }
+// The underlying imap_utf8_to_mutf7 function can be missing; there's a
+// ./configure check for it that disables the corresponding PHP function.
+if (!function_exists('imap_utf8_to_mutf7')) {
+    die("skip no imap_utf8_to_mutf7 function");
+}
 ?>
 --FILE--
 <?php