Restore vendor contents even if composer is not available (#8223)

* Restore vendor contents even if composer is not available
Leave the code in both places for safety.

* Instruct users to use the wrapper instead of straight up composer...
This commit is contained in:
Tony Murray
2018-02-07 20:45:18 -06:00
committed by GitHub
parent 547451974d
commit f43e23e15a
3 changed files with 9 additions and 3 deletions

View File

@@ -103,13 +103,13 @@ if (!str_contains(shell_exec('php scripts/composer_wrapper.php --version'), 'Com
$dep_check = shell_exec('php scripts/composer_wrapper.php install --no-dev --dry-run');
preg_match_all('/Installing ([^ ]+\/[^ ]+) \(/', $dep_check, $dep_missing);
if (!empty($dep_missing[0])) {
print_fail("Missing dependencies!", "composer install --no-dev");
print_fail("Missing dependencies!", "./scripts/composer_wrapper.php install --no-dev");
$pre_checks_failed = true;
print_list($dep_missing[1], "\t %s\n");
}
preg_match_all('/Updating ([^ ]+\/[^ ]+) \(/', $dep_check, $dep_outdated);
if (!empty($dep_outdated[0])) {
print_fail("Outdated dependencies", "composer install --no-dev");
print_fail("Outdated dependencies", "./scripts/composer_wrapper.php install --no-dev");
print_list($dep_outdated[1], "\t %s\n");
}