Skip to content

Commit b8c92f6

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: [Intl] promote warnings to value errors on PHP 8 Fix CS DateTime validator support for trailing data Remove some leftover for HHVM support Simplify code Fix tests on 5.6 [Debug] Skip a test that was meant for HHVM. [Console] Silence warnings on sapi_windows_cp_set() call guard $argv + $token against null, preventing unnecessary exceptions
2 parents eb9c158 + 37746b2 commit b8c92f6

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

Helper/QuestionHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ private function doAsk(OutputInterface $output, Question $question)
112112

113113
if (\function_exists('sapi_windows_cp_set')) {
114114
// Codepage used by cmd.exe on Windows to allow special characters (éàüñ).
115-
sapi_windows_cp_set(1252);
115+
@sapi_windows_cp_set(1252);
116116
}
117117

118118
if (null === $autocomplete || !self::$stty || !Terminal::hasSttyAvailable()) {

Input/ArgvInput.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ class ArgvInput extends Input
4545

4646
public function __construct(array $argv = null, InputDefinition $definition = null)
4747
{
48-
if (null === $argv) {
49-
$argv = $_SERVER['argv'];
50-
}
48+
$argv = $argv ?? $_SERVER['argv'] ?? [];
5149

5250
// strip the application name
5351
array_shift($argv);

0 commit comments

Comments
 (0)