Prep for composer changes (#8075)

* Prep for composer changes

* Update composer.json, composer.lock and a small update to phpmailer and Yaml

* Prevent accidental `composer update` runs

* Add  --no-interaction to daily.sh
This commit is contained in:
Tony Murray
2018-01-22 08:16:37 -06:00
committed by GitHub
parent fbca432296
commit 6878df8c12
27 changed files with 3976 additions and 3281 deletions

View File

@@ -35,8 +35,14 @@ $install_dir = realpath(__DIR__ . '/..');
$config['install_dir'] = $install_dir;
chdir($install_dir);
require_once $install_dir . '/includes/common.php';
# composer autoload
if (!is_file($install_dir . '/vendor/autoload.php')) {
c_echo("%RError: Missing dependencies%n, run: %Bcomposer install --no-dev%n\n\n");
}
require $install_dir . '/vendor/autoload.php';
if (version_compare(PHP_VERSION, '5.4', '>=')) {
require_once $install_dir . '/lib/influxdb-php/vendor/autoload.php';
}
@@ -49,7 +55,6 @@ if (!function_exists('module_selected')) {
}
// function only files
require_once $install_dir . '/includes/common.php';
require_once $install_dir . '/includes/dbFacile.php';
require_once $install_dir . '/includes/rrdtool.inc.php';
require_once $install_dir . '/includes/influxdb.inc.php';