Skip to content

Commit

Permalink
fix: Ensure the PHP processes are restarted properly
Browse files Browse the repository at this point in the history
- Use the persistent setting: any sub-process should use the same
  settings.
- Reset `COMPOSER_ORIGINAL_INIS` to avoid the buggy Flex code (see symfony/flex#995).

Closes #1089, #988.
  • Loading branch information
theofidry committed Oct 20, 2023
1 parent 3831987 commit be4fcfe
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/Composer/ComposerProcessFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ private static function retrieveSubProcessVerbosity(IO $io): ?string

private static function getDefaultEnvVars(): array
{
$vars = [];
$vars = ['COMPOSER_ORIGINAL_INIS' => ''];

if ('1' === (string) getenv(BOX_ALLOW_XDEBUG)) {
$vars['COMPOSER_ALLOW_XDEBUG'] = '1';
Expand Down
1 change: 1 addition & 0 deletions src/Console/Php/PhpSettingsHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public function __construct(LoggerInterface $logger)
$this->logger = $logger;

$this->pharReadonly = PharPhpSettings::isReadonly();
$this->setPersistent();
}

public function check(): void
Expand Down

0 comments on commit be4fcfe

Please sign in to comment.