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

Message tweak, refs #6341

pull/4865/merge
Jordi Boggiano 2017-05-16 22:44:25 +02:00
parent 8858b27ced
commit c917c52f81
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,8 +156,8 @@ class ZipDownloader extends ArchiveDownloader
} else { } else {
$processError = new \UnexpectedValueException(rtrim($this->getErrorMessage($retval, $file)."\n"), $retval); $processError = new \UnexpectedValueException(rtrim($this->getErrorMessage($retval, $file)."\n"), $retval);
} }
} catch (\ErrorException $ex) { } catch (\ErrorException $e) {
$processError = new \ErrorException('Archive may contain identical directory or file name with different capitalization (fails on case insensitive filesystems)'); $processError = new \RuntimeException('The archive may contain identical file names with different capitalization (which fails on case insensitive filesystems): '.$e->getMessage(), 0, $e);
} catch (\Exception $e) { } catch (\Exception $e) {
$processError = $e; $processError = $e;
} }

4
tests/Composer/Test/Downloader/ZipDownloaderTest.php
View File

@ -128,8 +128,8 @@ class ZipDownloaderTest extends TestCase
} }
/** /**
* @expectedException \ErrorException * @expectedException \RuntimeException
* @expectedExceptionMessage Archive may contain identical directory or file name with different capitalization (fails on case insensitive filesystems) * @expectedExceptionMessage The archive may contain identical file names with different capitalization (which fails on case insensitive filesystems): Not a directory
*/ */
public function testZipArchiveExtractOnlyFailed() public function testZipArchiveExtractOnlyFailed()
{ {