From 7f0a1e2f2d234884e11a618817adf5c945c3bd66 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Sun, 26 Dec 2021 16:49:32 +0100
Subject: [PATCH] Fix bug40228*.phpt conflict

Both tests use the same directory structure; we avoid that by
extracting to separate subdirectories.

Closes GH-7831.
---
 ext/zip/tests/bug40228-mb.phpt | 5 +++--
 ext/zip/tests/bug40228.phpt    | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ext/zip/tests/bug40228-mb.phpt b/ext/zip/tests/bug40228-mb.phpt
index fddfb65f296..39715a615a0 100644
--- a/ext/zip/tests/bug40228-mb.phpt
+++ b/ext/zip/tests/bug40228-mb.phpt
@@ -4,8 +4,8 @@ Bug #40228 (extractTo does not create recursive empty path)
 <?php if (!extension_loaded("zip")) print "skip"; ?>
 --FILE--
 <?php
-$dest = __DIR__;
-$arc_name = $dest . "/bug40228私はガラスを食べられます.zip";
+$dest = __DIR__ . "/bug40228-mb";
+$arc_name = __DIR__ . "/bug40228私はガラスを食べられます.zip";
 $zip = new ZipArchive;
 $zip->open($arc_name, ZIPARCHIVE::CREATE);
 $zip->extractTo($dest);
@@ -13,6 +13,7 @@ if (is_dir($dest . '/test/empty')) {
     echo "Ok\n";
     rmdir($dest . '/test/empty');
     rmdir($dest . '/test');
+    rmdir($dest);
 } else {
     echo "Failed.\n";
 }
diff --git a/ext/zip/tests/bug40228.phpt b/ext/zip/tests/bug40228.phpt
index 49e202c576b..f9cd20f2439 100644
--- a/ext/zip/tests/bug40228.phpt
+++ b/ext/zip/tests/bug40228.phpt
@@ -4,8 +4,8 @@ Bug #40228 (extractTo does not create recursive empty path)
 <?php if (!extension_loaded("zip")) print "skip"; ?>
 --FILE--
 <?php
-$dest = __DIR__;
-$arc_name = $dest . "/bug40228.zip";
+$dest = __DIR__ . "/bug40228";
+$arc_name = __DIR__ . "/bug40228.zip";
 $zip = new ZipArchive;
 $zip->open($arc_name, ZIPARCHIVE::CREATE);
 $zip->extractTo($dest);
@@ -13,6 +13,7 @@ if (is_dir($dest . '/test/empty')) {
     echo "Ok\n";
     rmdir($dest . '/test/empty');
     rmdir($dest . '/test');
+    rmdir($dest);
 } else {
     echo "Failed.\n";
 }