From b5e1457470df6b4ff373d10236663fd27599d6fc Mon Sep 17 00:00:00 2001 From: Serge Smertin Date: Sun, 31 Mar 2013 21:44:48 +0200 Subject: [PATCH] set version to dev-master to artifacts without version --- src/Composer/Repository/ArtifactRepository.php | 4 ++++ .../Test/Repository/ArtifactRepositoryTest.php | 6 ++++-- .../Fixtures/artifacts/artifact-no-version.zip | Bin 0 -> 5134 bytes 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 tests/Composer/Test/Repository/Fixtures/artifacts/artifact-no-version.zip diff --git a/src/Composer/Repository/ArtifactRepository.php b/src/Composer/Repository/ArtifactRepository.php index 8442ce9ba..72ef46041 100644 --- a/src/Composer/Repository/ArtifactRepository.php +++ b/src/Composer/Repository/ArtifactRepository.php @@ -94,6 +94,10 @@ class ArtifactRepository extends ArrayRepository 'shasum' => sha1_file($file->getRealPath()) ); + if(empty($package['version'])) { + $package['version'] = 'dev-master'; + } + $package = $this->loader->load($package); return $package; diff --git a/tests/Composer/Test/Repository/ArtifactRepositoryTest.php b/tests/Composer/Test/Repository/ArtifactRepositoryTest.php index abf3eefd3..8c0cf0dbd 100644 --- a/tests/Composer/Test/Repository/ArtifactRepositoryTest.php +++ b/tests/Composer/Test/Repository/ArtifactRepositoryTest.php @@ -15,13 +15,15 @@ namespace Composer\Repository; use Composer\Test\TestCase; use Composer\IO\NullIO; use Composer\Config; -use Composer\Package\Package; +use Composer\Package\BasePackage; class ArtifactRepositoryTest extends TestCase { public function testExtractsConfigsFromZipArchives() { $expectedPackages = array( + 'composer/composer-dev-master', + 'composer/composer-1.0.x-dev', 'composer/composer-1.0.0-alpha6', 'vendor0/package0-0.0.1', 'vendor1/package2-4.3.2', @@ -30,7 +32,7 @@ class ArtifactRepositoryTest extends TestCase $coordinates = array('type' => 'artifact', 'url' => __DIR__ . '/Fixtures/artifacts'); $repo = new ArtifactRepository($coordinates, new NullIO(), new Config()); - $foundPackages = array_map(function(Package $package) { + $foundPackages = array_map(function(BasePackage $package) { return "{$package->getPrettyName()}-{$package->getPrettyVersion()}"; }, $repo->getPackages()); diff --git a/tests/Composer/Test/Repository/Fixtures/artifacts/artifact-no-version.zip b/tests/Composer/Test/Repository/Fixtures/artifacts/artifact-no-version.zip new file mode 100644 index 0000000000000000000000000000000000000000..a60ba1fa92debd4df6471250da69e9e4a879882a GIT binary patch literal 5134 zcma)A2{@G9`yPxiiAk1ZiICmcvxFHk_I0vkDQhH47;9tSvt-|W8nR?7l&wLs6(ZS5 zN+g7=VT#{OebwZv{{MNe_nkBEb)9>j<$lh2?xU+g0t5l@pKE0SieCr+KEMDlz}m&> znv1)wo1l}WJJQw-Vqi=OI2muO2gKc*M6>{1+-zC^IqpK<{&hCvZ)OXfLtH{2UEFN( zFr+vLY|uBDrSwYeR$*G@mBWm|phOk;P0f^T5<~$BiN+4mU@9qHaPesM>R9{yLq(Vx zS>Y+)n>H-UtA4KZvJimdR%H_raUjSUWtDux8romIbX9zGnqnn=+6OaiAFEO3wnplr zur`6(^sT*O*sWE)!8LvgD|0h?(m7YYli2-bUWeb7_=qv}v0*{~$Dv?Fa@U3Q(oAMA zM#V@4)mnvfGX3Qf-p#kVFP?s$pp9IV?B#!-Sn(dJf_tBpm0GzYEI&4iHonD?m7>3- zt3gIy)S~tAGcN4FOcQ%nNy_AbWL>`P z0+{})awF& z#bkBwxL@Q*Fq^;fWrv>SEeKGS7!{KUOi@7#O=`*~#a}%6MP3v|gm+J+=$?Ey&b6*z z-19rYNtWNZ_nl)x4(=|_cn9fm$-pNBpN!b#mbd|7aQKQJh+kz;WEn{Kvesvuvz(3Mm6m*)82A5S#9Fd%cb6@&J*3I-G+!YX)=6@# zCsAjME&S9m_Q=n0S9^%fIeFGnXR@Wv)tH83s@lKPru+3|h+xZt$Y(@|S2@CV%i8U# z8JQnc+U>1hK+2rNHYZG`Z2f-7No?eULTH$^iF52BjefWFy{jg(u_q$*w9Lq-TKy$u zx48!rz0HX|yT+deP{WEenRrS)+dML#&}hFAix_j1TpP7sxo5toF+!$YbkxPnoXK`F z>9Mn|2>S@oi8p#bA>~O(wv>he8ok2e>nUa5O}PLLBBOfLT%`zDRF5=}na|82>jxy) z6zH11%|gdh&fVM<%>CG|=PMeT8v;w`pU;v9`faX-p@bkey)Z0Kn4-HzA3Lp?x_K%$ zyfGv77aUm|6JeSEN`5_GVnLHl0zG`u`@Dhe#wt-Tu#+L9*pJiNBtZYhi#I)|Y67>nW;vp| z(9qX;Oe@a;${qt*uKN35LPT5ukB5|vX~rf7y#%6l=f(!Rc%hb#s6_9x8}i2(p}Qo=>zAT@dZ zzF_^8rGH+uRzYlsR$WBEq|8c+!M8NysTbgF98=q9dkZ7Ve zotc)Mo0ySCrRT*GnZbB`2I}B;EGc@;{g{S+^yUqOyMB^}==ypv&H4)j45Xp)0x4K_ zBvvbi@|mEZW=y%}*D^#WItby*aQv4tJh&kKZnxD}hMm(=7ILz|m!O3I&-Jj}*ePkE z=ICDBrJ#nK(ae8TC)9RZjyp4vHhN!?^AHmr6PHpA40uvQx($A0XP<*(wH@o)KVqE>=>wa+J zQ$Q9hEo6l8(Tb*VTKEy2hdn2&UJdU9O-v=JW$E&^N*RZ8iz`CCFDspQ%6dM#<`mf6 zwwsv-{v^7SGchrIN4?{a{1`L4c$bUwMtjt#`obqEqw~t8TxR0HXTzGr#JudB7qgzh z!^0K!v>sEJo00jn9;&YRthJ@3Fn^eR*>3ISRXPb(ky6ZIsjCIG9W-20+Zu42wSs7% zy7Fg|+>Pr)o6xJlx{qd1$+Al%J~6>%yG;^Y*M&I+!-`EAY>Vj9nR5j0e~8GFK=-Gd zx16>EOZhM$ALg4+NnJQyCWc*8)3pj9)v@$L`pc!O*LExjW92Baz+=26*ObfzF>0Of zAkAw5zLRUaX)WGqxjm%Ut`1vf{(4ex63tRSsXDyBqwHLo$Zmwi5x#>qG{F?&!nksM#naPVkT_ zc~HhN>scxvAM|0Q;%R4bG%#5nVo!L3(W@ymAtQYtZr8~Qq-Mk36<1+98QfQIoxq)b zRDsP*Z2Z~2A^jQJeTD_~z8>?`X{|9NRnHeJb|7^2oLsw{XBVkITsG{k>`ZDE z5MYiGKx3)~!4q46J}P@u7E|QrP0hX1BH`)}mNtxvc@4-&gj^s$!{GA!VsctgQU9LU z`)VHcKm52{a|FIAZ7mP=PNOH1|CnPvCXY>Y{Fr|Fbdmh80Y z;O4Xlt8QH4Z|7Bb8nB?r4hY1qNXP|)KKin8_$oO zTHvP}yaY}EZXEw?Z&O=z^Z|!VLBegb+SDu z(5V$F_oDj#h-}Cx5gm)%tfI2u-1Whd zko4$v?ARp6>>NM0sZaVw)oIV-6>LXx>`Ri!_2cZXpAUXku|7_z?|FOS@g^;mBQhGr zaU1jr;KgO&;Fp%(EoG`j-fES-n@^v^Jw}&Qx_Id7G)%yLv+zQA4We*%g3QV0g*QUh zC`41@$qUHV%-stnGvzx^F)JtFM$==9?icbnO(zerN)A!UUSlk}P$G(EChjXLuDw24 zV|Tw`)wX8S#Pk$sHw5!}(PnE-*0^o!WVC=YXhOUcE56TcK+&IDBK9FvP&#Z`;p60@ zxc`gVk9t7J-dt6FO)uNuhO@om^l-+`ea;WDqo z*S(>{*f9(kas;zg_re}Fd}^S%lFx6)b2r{#_o$#|Ezfy+vr;MMq$h5E%~N(7LoOi5 zy2>>796v{HU4vwoOkzM9-P>9hz3Gy&I#(tW!(E5^vsYqwncCk8!zE@B5$mS?y z45H@xdUKmF-h4j3+Jli6uF$qFe$B-4iUpmh7Hm1focZV^)p4wAnBr6WB>r_C}E#+aPR&Q(P4nsFySP>!6cNxR_MzB literal 0 HcmV?d00001