Merge branch '3.4' into 4.4

* 3.4:
  [Console] Do not check for "stty" using "exec" if that function is disabled
This commit is contained in:
Nicolas Grekas 2020-07-01 19:14:21 +02:00
commit 659699b9ce

View File

@ -66,6 +66,11 @@ class Terminal
return self::$stty; return self::$stty;
} }
// skip check if exec function is disabled
if (!\function_exists('exec')) {
return false;
}
exec('stty 2>&1', $output, $exitcode); exec('stty 2>&1', $output, $exitcode);
return self::$stty = 0 === $exitcode; return self::$stty = 0 === $exitcode;