Merge branch 'MDL-68445_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE

This commit is contained in:
Andrew Nicols
2020-04-28 18:31:11 +08:00
3 changed files with 554 additions and 337 deletions
+1 -1
View File
@@ -13,7 +13,7 @@
"require-dev": {
"phpunit/phpunit": "7.5.*",
"phpunit/dbunit": "4.0.*",
"moodlehq/behat-extension": "3.38.4",
"moodlehq/behat-extension": "3.38.5",
"mikey179/vfsstream": "^1.6",
"instaclick/php-webdriver": "dev-local as 1.x-dev"
}
Generated
+545 -335
View File
File diff suppressed because it is too large Load Diff
+8 -1
View File
@@ -517,7 +517,14 @@ function cli_execute_parallel($cmds, $cwd = null, $delay = 0) {
// Create child process.
foreach ($cmds as $name => $cmd) {
$process = new Symfony\Component\Process\Process($cmd);
if (method_exists('\\Symfony\\Component\\Process\\Process', 'fromShellCommandline')) {
// Process 4.2 and up.
$process = Symfony\Component\Process\Process::fromShellCommandline($cmd);
} else {
// Process 4.1 and older.
$process = new Symfony\Component\Process\Process(null);
$process->setCommandLine($cmd);
}
$process->setWorkingDirectory($cwd);
$process->setTimeout(null);