Skip to content

Commit 04c3a31

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: fix merge drop logger mock in favor of using the BufferingLogger catch ValueError thrown on PHP 8 [Yaml Parser] Fix edge cases when parsing multiple documents fix parsing comments not prefixed by a space [Translator] Make sure a null locale is handled properly deal with errors being thrown on PHP 8 [Cache] Allow cache tags to be objects implementing __toString() [HttpKernel] Do not override max_redirects option in HttpClientKernel remove superfluous cast [HttpClient] Support for CURLOPT_LOCALPORT. Upgrade PHPUnit to 8.5 (php 7.2) and 9.3 (php >= 7.3). Fixed exception message formatting [FrameworkBundle] Fix error in xsd which prevent to register more than one metadata [Console] work around disabled putenv() [PhpUnitBridge] Fix error with ReflectionClass [HttpClient][HttpClientTrait] don't calculate alternatives if option is auth_ntlm Change 'cache_key' to AbstractRendererEngine::CACHE_KEY_VAR Upgrade PHPUnit to 8.5 (php 7.2) and 9.3 (php >= 7.3).
2 parents b8c92f6 + 90933b3 commit 04c3a31

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

Application.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,10 @@ public function setCommandLoader(CommandLoaderInterface $commandLoader)
107107
*/
108108
public function run(InputInterface $input = null, OutputInterface $output = null)
109109
{
110-
putenv('LINES='.$this->terminal->getHeight());
111-
putenv('COLUMNS='.$this->terminal->getWidth());
110+
if (\function_exists('putenv')) {
111+
@putenv('LINES='.$this->terminal->getHeight());
112+
@putenv('COLUMNS='.$this->terminal->getWidth());
113+
}
112114

113115
if (null === $input) {
114116
$input = new ArgvInput();
@@ -891,7 +893,9 @@ protected function configureIO(InputInterface $input, OutputInterface $output)
891893
$input->setInteractive(false);
892894
}
893895

894-
putenv('SHELL_VERBOSITY='.$shellVerbosity);
896+
if (\function_exists('putenv')) {
897+
@putenv('SHELL_VERBOSITY='.$shellVerbosity);
898+
}
895899
$_ENV['SHELL_VERBOSITY'] = $shellVerbosity;
896900
$_SERVER['SHELL_VERBOSITY'] = $shellVerbosity;
897901
}

0 commit comments

Comments
 (0)