Parcourir la source

Message tweak, refs #6341

Jordi Boggiano il y a 7 ans
Parent
commit
c917c52f81

+ 2 - 2
src/Composer/Downloader/ZipDownloader.php

@@ -156,8 +156,8 @@ class ZipDownloader extends ArchiveDownloader
             } else {
                 $processError = new \UnexpectedValueException(rtrim($this->getErrorMessage($retval, $file)."\n"), $retval);
             }
-        } catch (\ErrorException $ex) {
-            $processError = new \ErrorException('Archive may contain identical directory or file name with different capitalization (fails on case insensitive filesystems)');
+        } catch (\ErrorException $e) {
+            $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) {
             $processError = $e;
         }

+ 2 - 2
tests/Composer/Test/Downloader/ZipDownloaderTest.php

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