mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refacotr: Use HTTPS to fetch Composer (#8309)

Browse Source 
* use https for composer

* Fixe alternate --version output for composer
This commit is contained in:
Tony Murray
2018-02-28 14:04:44 -06:00
committed by Neil Lathwood
parent 68d42b065e
commit 9459eeb55f
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
LibreNMS/Validations/Dependencies.php
View File

@@ -39,13 +39,13 @@ class Dependencies extends BaseValidation
public function validate(Validator $validator)
{
$composer_output = trim(shell_exec($validator->getBaseDir() . '/scripts/composer_wrapper.php --version'));
$found = preg_match('/Composer version ([.0-9]+)/', $composer_output, $matches);
$found = preg_match('/Composer (version )?([.0-9]+)/', $composer_output, $matches);
if (!$found) {
$validator->fail("No composer available, please install composer", "https://getcomposer.org/");
return;
} else {
$validator->ok("Composer Version: " . $matches[1]);
$validator->ok("Composer Version: " . $matches[2]);
}
$dep_check = shell_exec($validator->getBaseDir() . '/scripts/composer_wrapper.php install --no-dev --dry-run');