From 38ff4e5917fe067f5eb3ee2066b54cd8c6a0045c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 12 Jun 2018 16:38:38 +0200 Subject: update to 9.3-RC2 drop dependency on jasig/phpcas raise dependency on phpmailer/phpmailer 6.0 raise dependency on zendframework 2.8 allow sebastian/diff 2.0 and 3.0 add dependency on monolog/monolog --- glpi-fedora-autoloader.php | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'glpi-fedora-autoloader.php') diff --git a/glpi-fedora-autoloader.php b/glpi-fedora-autoloader.php index 6224a52..534ac96 100644 --- a/glpi-fedora-autoloader.php +++ b/glpi-fedora-autoloader.php @@ -5,12 +5,10 @@ require_once "$vendor/Fedora/Autoloader/autoload.php"; // Dependencies from composer.json \Fedora\Autoloader\Dependencies::required([ - // "jasig/phpcas": "~1.3.0", - '##DATADIR##/pear/CAS/Autoload.php', // "iamcal/lib_autolink": "~1.7", "$vendor/php-iamcal-lib-autolink/autoload.php", - // "phpmailer/phpmailer": "~5.2", - "$vendor/PHPMailer/PHPMailerAutoload.php", + // "phpmailer/phpmailer": "~6.0", + "$vendor/PHPMailer/PHPMailer6/autoload.php", // "sabre/vobject": "~4.1", "$vendor/Sabre/VObject4/autoload.php", // "simplepie/simplepie": "^1.5", @@ -38,7 +36,17 @@ require_once "$vendor/Fedora/Autoloader/autoload.php"; "$vendor/TrueBV/autoload.php", // "paragonie/random_compat": "^2.0" "$vendor/random_compat/autoload.php", -// "sebastian/diff": "^1.4" - "$vendor/SebastianBergmann/Diff/autoload.php", +// "monolog/monolog": "^1.23", + "$vendor/Monolog/autoload.php", +// "sebastian/diff": "^1.4 || ^2.0 || ^3.0" + [ + "$vendor/SebastianBergmann/Diff3/autoload.php", + "$vendor/SebastianBergmann/Diff2/autoload.php", + "$vendor/SebastianBergmann/Diff/autoload.php", + ] +]); +\Fedora\Autoloader\Dependencies::optional([ + // "jasig/phpcas": "~1.3.0", + '##DATADIR##/pear/CAS/Autoload.php', ]); -- cgit