Skip to content

Commit a5cc4d1

Browse files
committed
Revert "Try IPv4 resolution on Windows for Composer"
This reverts commit 8534057.
1 parent 7156d96 commit a5cc4d1

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

src/Context/FeatureContext.php

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,12 +1201,12 @@ public function drop_db(): void {
12011201
* @param array<string, string> $extra_env
12021202
* @return Process
12031203
*/
1204-
public function proc( $command, $assoc_args = [], $path = '', $extra_env = [] ): Process {
1204+
public function proc( $command, $assoc_args = [], $path = '' ): Process {
12051205
if ( ! empty( $assoc_args ) ) {
12061206
$command .= Utils\assoc_args_to_str( $assoc_args );
12071207
}
12081208

1209-
$env = array_merge( self::get_process_env_variables(), $extra_env );
1209+
$env = self::get_process_env_variables();
12101210

12111211
if ( isset( $this->variables['SUITE_CACHE_DIR'] ) ) {
12121212
$env['WP_CLI_CACHE_DIR'] = $this->variables['SUITE_CACHE_DIR'];
@@ -1605,11 +1605,7 @@ private function composer_command( $cmd ): void {
16051605
$path = strtok( $path, PHP_EOL );
16061606
$this->variables['COMPOSER_PATH'] = $path;
16071607
}
1608-
$extra_env = [];
1609-
if ( Utils\is_windows() ) {
1610-
$extra_env['COMPOSER_IPRESOLVE'] = '4';
1611-
}
1612-
$this->proc( $this->variables['COMPOSER_PATH'] . ' --no-interaction ' . $cmd, [], '', $extra_env )->run_check();
1608+
$this->proc( $this->variables['COMPOSER_PATH'] . ' --no-interaction ' . $cmd )->run_check();
16131609
}
16141610

16151611
/**

0 commit comments

Comments
 (0)