Merge branch 'master' into 2.0

4 years ago · 7e6fe585bc
parent 8584d15e8c fb93036a70
commit 7e6fe585bc
1 changed files with 3 additions and 3 deletions
--- a/tests/Composer/Test/EventDispatcher/EventDispatcherTest.php
+++ b/tests/Composer/Test/EventDispatcher/EventDispatcherTest.php
@ -308,7 +308,7 @@ class EventDispatcherTest extends TestCase
        rmdir(__DIR__ . sprintf('%svendor', DIRECTORY_SEPARATOR));

        chdir($currentDirectoryBkp);
-        putenv('COMPOSER_BIN_DIR=' . $composerBinDirBkp);
+        putenv('COMPOSER_BIN_DIR' . ($composerBinDirBkp === false ? '' : '=' . $composerBinDirBkp));
    }

    static public function createsVendorBinFolderChecksEnvDoesNotContainsBin()