Merge pull request #7658 from fooman/fix-non-zip-file-with-zip-ext

Fix regression for artifact repository
6 years ago · 9e6a0bff71
parent bc3854dcaf 2ed573b22d
commit 9e6a0bff71
2 changed files with 3 additions and 1 deletions
--- a/src/Composer/Repository/ArtifactRepository.php
+++ b/src/Composer/Repository/ArtifactRepository.php
@ -126,7 +126,9 @@ class ArtifactRepository extends ArrayRepository implements ConfigurableReposito
    private function getComposerInformation(\SplFileInfo $file)
    {
        $zip = new \ZipArchive();
-        $zip->open($file->getPathname());
+        if ($zip->open($file->getPathname()) !== true) {
+            return false;
+        }

        if (0 == $zip->numFiles) {
            $zip->close();
--- a/tests/Composer/Test/Repository/Fixtures/artifacts/not-a-zip-with-zip-extension.zip
+++ b/tests/Composer/Test/Repository/Fixtures/artifacts/not-a-zip-with-zip-extension.zip