Permalink
Browse files

Merge remote-tracking branch 'origin/master'

  • Loading branch information...
2 parents 209d3eb + 43fa5d5 commit 06675259d974224783b1cec7cdae7a5aa729bb07 @Seldaek Seldaek committed Aug 18, 2012
Showing with 8 additions and 5 deletions.
  1. +4 −4 doc/04-schema.md
  2. +4 −1 src/Composer/Downloader/ZipDownloader.php
View
@@ -140,8 +140,8 @@ The recommended notation for the most common licenses is (alphabetical):
GPL-2.0+
GPL-3.0
GPL-3.0+
- LGPL-2.0
- LGPL-2.0+
+ LGPL-2.1
+ LGPL-2.1+
LGPL-3.0
LGPL-3.0+
MIT
@@ -163,15 +163,15 @@ An Example for disjunctive licenses:
{
"license": [
- "LGPL-2.0",
+ "LGPL-2.1",
"GPL-3.0+"
]
}
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"),
@@ -54,7 +54,10 @@ protected function extract($file, $path)
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();
}

0 comments on commit 0667525

Please sign in to comment.