From 92f28cfbbac011c9d75fca710c7b5e872cbf3341 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Sun, 26 Dec 2021 00:54:51 +0100
Subject: [PATCH 1/3] Don't run conflicting bug40228*.phpt in parallel

Both tests use the same directory structure, and as such must not be
run in parallel.  We quick-fix this by explicitly marking the tests as
conflicting.
---
 ext/zip/tests/bug40228-mb.phpt | 2 ++
 ext/zip/tests/bug40228.phpt    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/ext/zip/tests/bug40228-mb.phpt b/ext/zip/tests/bug40228-mb.phpt
index fddfb65f29639..15f210831c806 100644
--- a/ext/zip/tests/bug40228-mb.phpt
+++ b/ext/zip/tests/bug40228-mb.phpt
@@ -2,6 +2,8 @@
 Bug #40228 (extractTo does not create recursive empty path)
 --SKIPIF--
 <?php if (!extension_loaded("zip")) print "skip"; ?>
+--CONFLICTS--
+bug40228
 --FILE--
 <?php
 $dest = __DIR__;
diff --git a/ext/zip/tests/bug40228.phpt b/ext/zip/tests/bug40228.phpt
index 49e202c576baf..2267f39c733d5 100644
--- a/ext/zip/tests/bug40228.phpt
+++ b/ext/zip/tests/bug40228.phpt
@@ -2,6 +2,8 @@
 Bug #40228 (extractTo does not create recursive empty path)
 --SKIPIF--
 <?php if (!extension_loaded("zip")) print "skip"; ?>
+--CONFLICTS--
+bug40228
 --FILE--
 <?php
 $dest = __DIR__;

From 342031ceb55ae311fc4eaf9b551fadb5a5124efb Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Sun, 26 Dec 2021 13:32:02 +0100
Subject: [PATCH 2/3] Proper fix by extracting to subdirectories

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

diff --git a/ext/zip/tests/bug40228-mb.phpt b/ext/zip/tests/bug40228-mb.phpt
index 15f210831c806..749fcd8f1124e 100644
--- a/ext/zip/tests/bug40228-mb.phpt
+++ b/ext/zip/tests/bug40228-mb.phpt
@@ -2,12 +2,10 @@
 Bug #40228 (extractTo does not create recursive empty path)
 --SKIPIF--
 <?php if (!extension_loaded("zip")) print "skip"; ?>
---CONFLICTS--
-bug40228
 --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);
diff --git a/ext/zip/tests/bug40228.phpt b/ext/zip/tests/bug40228.phpt
index 2267f39c733d5..95a1614cda24c 100644
--- a/ext/zip/tests/bug40228.phpt
+++ b/ext/zip/tests/bug40228.phpt
@@ -2,12 +2,10 @@
 Bug #40228 (extractTo does not create recursive empty path)
 --SKIPIF--
 <?php if (!extension_loaded("zip")) print "skip"; ?>
---CONFLICTS--
-bug40228
 --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);

From 06f12bffa56a6a7c4d90256360888856901b13be 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 3/3] Remove temporary directory

---
 ext/zip/tests/bug40228-mb.phpt | 1 +
 ext/zip/tests/bug40228.phpt    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ext/zip/tests/bug40228-mb.phpt b/ext/zip/tests/bug40228-mb.phpt
index 749fcd8f1124e..39715a615a02a 100644
--- a/ext/zip/tests/bug40228-mb.phpt
+++ b/ext/zip/tests/bug40228-mb.phpt
@@ -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 95a1614cda24c..f9cd20f2439d1 100644
--- a/ext/zip/tests/bug40228.phpt
+++ b/ext/zip/tests/bug40228.phpt
@@ -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";
 }