mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 05:28:30 +01:00
Code Issues Projects Releases Wiki Activity

MDL-68445 behat: Bump to 3.6.x

Browse Source 
composer.lock generated with PHP 7.2, following:

https://docs.moodle.org/dev/Composer#How_to_prepare_and_submit_composer_changes

Also, ensure Symfony/Process > 4.0 compatibility
(needed for parallel runs)
This commit is contained in:
Eloy Lafuente (stronk7) 2020-04-17 00:02:20 +02:00
parent 9df4a4de18
commit 98cc4d0445
3 changed files with 600 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -13,7 +13,7 @@
"require-dev": {
"phpunit/phpunit": "7.5.*",
"phpunit/dbunit": "4.0.*",
"moodlehq/behat-extension": "3.39.2",
"moodlehq/behat-extension": "3.39.3",
"mikey179/vfsstream": "^1.6",
"instaclick/php-webdriver": "dev-local as 1.x-dev"
}

926
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

9
lib/behat/lib.php
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);