From d97c37f103421a808fec42b00107b7df1643f4ef Mon Sep 17 00:00:00 2001
From: Stephan Vock <stephan.vock@gmail.com>
Date: Thu, 29 Oct 2020 22:18:50 +0000
Subject: [PATCH] Zip: ignore mac osx specific folder when searching for
 composer.json

---
 src/Composer/Util/Zip.php                        |   5 +++++
 .../Util/Fixtures/Zip/multiple_subfolders.zip    | Bin 3724 -> 0 bytes
 tests/Composer/Test/Util/ZipTest.php             |  12 ------------
 3 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 tests/Composer/Test/Util/Fixtures/Zip/multiple_subfolders.zip

diff --git a/src/Composer/Util/Zip.php b/src/Composer/Util/Zip.php
index 82cd34b71..3cb634eab 100644
--- a/src/Composer/Util/Zip.php
+++ b/src/Composer/Util/Zip.php
@@ -82,6 +82,11 @@ class Zip
             $name = $zip->getNameIndex($i);
             $dirname = dirname($name);
 
+            // ignore OSX specific resource fork folder
+            if (strpos($name, '__MACOSX') !== false) {
+                continue;
+            }
+
             // handle archives with proper TOC
             if ($dirname === '.') {
                 $topLevelPaths[$name] = true;
diff --git a/tests/Composer/Test/Util/Fixtures/Zip/multiple_subfolders.zip b/tests/Composer/Test/Util/Fixtures/Zip/multiple_subfolders.zip
deleted file mode 100644
index 5c5bc5adf86e747df57a7e1d2b7218612e3134ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3724
zcmWIWW@h1H0D<-iHv+&6D8b4gz>t=oZ>%30!Nc&j=u2E}<>$Dsj3NvHa4nZ&Z=z`7
zglS1kN``Bz0cwS56Jg*0!bvfx+Jum`>A3{Q2bbg*rGl(gDEtzqQUKBacE(1oLk0qE
z?{D$3PVecfWWBH8RVp6u5E9_Hvb);s{^{_7kA)`B+_|<k=}rArFR<@n(aBQJB2htE
z*>Gk-Wu=`ir#<5)C13G)@W#$$jo}R4(|;d+)#7cr6LM|S#J72|r`=QH#f~P0>&dmo
z+<9VU%fI^K)!8o+Kf8vu2sn9^UtF>0dY)v<1bLM?{9<Jr`ooS0TdaN}apMr*w~Jks
zoO2FZ<|J@i-*A6?A;?6&Yp$qlm(-0z?-u*3J<0c2?6c$l@k=-U3p-i$q#a!&adNZb
z3c+_#)$*USf(|PyblP+Oo>~bq^qF(Rgl#(*1H9Qe4lj+2dku^V76}HV5a*9W4LVSW
z$H)6RI{ODlz(X7qS+Ed?#4WluK4fhukxW=GD7N5Mg7qTDHnM)~u`P>Lzg|4fh)+%s
zO-@fpO8DUG6ZU~WtRtX-X@Uf^x_~s}MrncOAEFLt7=j-v9B5#+Xlr3{oGEG$`vMeX
z>>S)32P{m1L0AFAphOFCPjFC*A2f-BDKVgX;ND2i&n?I=PA$^QD$dUXrNA;^SmwR0
zi2;S@>SsX=OiTA1xf7zQ&AN2UpPIi*jwq?Fi_!zzR-aeAT?%L-2;;U*5r^;bT8ujc
z3T1&IAT80s)TgNE7@+2HoJm2<A^1>-z;v&3=dXI}Xq@o8dfHP*PgB>=*V9wSGn9{m
zO_N9Cmk|4+)>~^U9ZkSa7s=T7I|k_N4Jb~ZgjOJc5)C+@Fk)&7v}AZY!`APxfkfMV
z{j&m{N0k?^zaTwBLx$li(}cG93qyC6sHHy^nbX|M8?(RFqj18EsDr;ft_i;^{bSi(
z&vf8b?RFNK2CkE0@<t&!!d-#v-N`!Puj_W7?k`$)WT$>XyV&cqk5m5nY^%MzW%j<_
zzw__ke|3HK^wov8{!Vx|&uDSkj^obT?kUb(d%R@XJ;k$Egq=7Pk3|HP7T(I_P&_wb
zhh2r$1?NqM`Y(#U^ewiPeW7^s#`*=`yB5j5ed)k|GG<H9bpGV0kDnfudHeFiYJagu
z_cwSH75?8pZ~uR8#eW82W~-MSyWX1MbSL|7`fl5O4DX)JkYnol;{R6Y{?6shwkod`
z6ppO?0S?Xu{cqiv84+0*nh(%|QxYR3V95ipkj0$>NX!F}^56=tf;%NO4PK1YBNZbM
zFHFHzaD%jAqzd)Xf*Vm)qL;v!r6_XHW0s=mL62FAg5v<Q6othC)lv|FQWWG2jKU1m
z2B2*z3h_N&i*bhlElN>FCQ)Ww4J#gCISU33ZyiB2v<BvYH?sn~5!x{uS;*RrVcH>;
zFvJK@a6^oM7Cpdxi`<?NVn7(Nq%jNG2&7!h0dIaGI|n@>b0V4b*KsMZ*n>9?LL(r~
z0i|YqM)08+aR=E5l#n504zjoYI!Z7hIR#$9W4Z|uM9A$0StK_tX^g;X7D{=I9$JWO
zg4{3=LoxOR&{(+3(9$jkyy<})lc2^6a&4`MVqO?CHZSYN6J<20x<{_LkYi;@qaX{^
zsTc_aR7D{>5o8W>NJ^qOF@Y7`iC97rVI;2V3Xy)_I=%rK2@XX_2?|Mbpvnu`RiN?{
zcNS1)Lox!xhoB-9U;0H&cX90KK16mGA`L?l2*_Q?p@o|6=3zApONb$yNKCrZ<3RE*
rM&f`K*2uw!Ki$m%ng`GI@TkC&?hr<^0z;gEK@bS#fzcPv3E}|&bq`N_

diff --git a/tests/Composer/Test/Util/ZipTest.php b/tests/Composer/Test/Util/ZipTest.php
index 282c9b27c..2b0129bc8 100644
--- a/tests/Composer/Test/Util/ZipTest.php
+++ b/tests/Composer/Test/Util/ZipTest.php
@@ -125,16 +125,4 @@ class ZipTest extends TestCase
 
         $this->assertEquals("{\n    \"name\": \"foo/bar\"\n}\n", $result);
     }
-
-    public function testThrowsExceptionIfMultipleComposerInSubFoldersWereFound()
-    {
-        if (!extension_loaded('zip')) {
-            $this->markTestSkipped('The PHP zip extension is not loaded.');
-            return;
-        }
-
-        $this->setExpectedException('\RuntimeException', 'Archive has more than one top level directories, and no composer.json was found on the top level, so it\'s an invalid archive. Top level paths found were: foo3/,__MACOSX/');
-
-        Zip::getComposerJson(__DIR__.'/Fixtures/Zip/multiple_subfolders.zip');
-    }
 }