Merge branch '1.7'

2018-10-31 18:32:39 +01:00 · 2018-10-31 18:32:39 +01:00 · ceb3a7a8e8
parent 2528654c53 42dca2aff5
commit ceb3a7a8e8
2 changed files with 1 additions and 0 deletions
--- a/src/Composer/Package/Comparer/Comparer.php
+++ b/src/Composer/Package/Comparer/Comparer.php
@ -70,6 +70,7 @@ class Comparer
        if (!is_array($source)) {
            return;
        }
+        chdir($currentDirectory);
        chdir($this->update);
        $destination = $this->doTree('.', $destination);
        if (!is_array($destination)) {
--- 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