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

Merge branch 'master' into 2.0

pull/8561/head
Jordi Boggiano 2020-01-28 14:22:25 +01:00
parent 8584d15e8c fb93036a70
commit 7e6fe585bc
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/Composer/Test/EventDispatcher/EventDispatcherTest.php
View File

@ -308,7 +308,7 @@ class EventDispatcherTest extends TestCase
rmdir(__DIR__ . sprintf('%svendor', DIRECTORY_SEPARATOR)); rmdir(__DIR__ . sprintf('%svendor', DIRECTORY_SEPARATOR));
chdir($currentDirectoryBkp); chdir($currentDirectoryBkp);
putenv('COMPOSER_BIN_DIR=' . $composerBinDirBkp); putenv('COMPOSER_BIN_DIR' . ($composerBinDirBkp === false ? '' : '=' . $composerBinDirBkp));
} }
static public function createsVendorBinFolderChecksEnvDoesNotContainsBin() static public function createsVendorBinFolderChecksEnvDoesNotContainsBin()
@ -316,7 +316,7 @@ class EventDispatcherTest extends TestCase
mkdir(__DIR__ . sprintf('%svendor%sbin', DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR), 0700, true); mkdir(__DIR__ . sprintf('%svendor%sbin', DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR), 0700, true);
$val = getenv('PATH'); $val = getenv('PATH');
if ( ! $val ) { if (!$val) {
$val = getenv('Path'); $val = getenv('Path');
} }
@ -327,7 +327,7 @@ class EventDispatcherTest extends TestCase
{ {
$val = getenv('PATH'); $val = getenv('PATH');
if ( ! $val ) { if (!$val) {
$val = getenv('Path'); $val = getenv('Path');
} }