public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge remote-tracking branch 'origin/master'

pull/1002/merge
Jordi Boggiano 2012-08-18 14:36:06 +02:00
parent 209d3ebfc4 43fa5d5c40
commit 06675259d9
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/04-schema.md
View File

@ -140,8 +140,8 @@ The recommended notation for the most common licenses is (alphabetical):
GPL-2.0+ GPL-2.0+
GPL-3.0 GPL-3.0
GPL-3.0+ GPL-3.0+
LGPL-2.0 LGPL-2.1
LGPL-2.0+ LGPL-2.1+
LGPL-3.0 LGPL-3.0
LGPL-3.0+ LGPL-3.0+
MIT MIT
@ -163,7 +163,7 @@ An Example for disjunctive licenses:
{ {
"license": [ "license": [
"LGPL-2.0", "LGPL-2.1",
"GPL-3.0+" "GPL-3.0+"
] ]
} }
@ -171,7 +171,7 @@ An Example for disjunctive licenses:
Alternatively they can be separated with "or" and enclosed in parenthesis; Alternatively they can be separated with "or" and enclosed in parenthesis;
{ {
"license": "(LGPL-2.0 or GPL-3.0+)" "license": "(LGPL-2.1 or GPL-3.0+)"
} }
Similarly when multiple licenses need to be applied ("conjunctive license"), Similarly when multiple licenses need to be applied ("conjunctive license"),

5
src/Composer/Downloader/ZipDownloader.php
View File

@ -54,7 +54,10 @@ class ZipDownloader extends ArchiveDownloader
throw new \UnexpectedValueException($this->getErrorMessage($retval, $file)); throw new \UnexpectedValueException($this->getErrorMessage($retval, $file));
} }
$zipArchive->extractTo($path); if (true !== $zipArchive->extractTo($path)) {
throw new \RuntimeException("There was an error extracting the ZIP file. Corrupt file?");
}
$zipArchive->close(); $zipArchive->close();
} }