From 7529ac10ebae416762fb63f98d71190fc6abe8d0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 24 Nov 2017 10:35:02 +0100
Subject: switch to fedora/autoloader

---
 glpi-fedora-autoloader.php | 58 +++++++++++++++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 21 deletions(-)

(limited to 'glpi-fedora-autoloader.php')

diff --git a/glpi-fedora-autoloader.php b/glpi-fedora-autoloader.php
index 808881d..49ea0de 100644
--- a/glpi-fedora-autoloader.php
+++ b/glpi-fedora-autoloader.php
@@ -1,26 +1,42 @@
 <?php
 $vendor = '##DATADIR##/php';
 
+require_once "$vendor/Fedora/Autoloader/autoload.php";
+
 // Dependencies from composer.json
-//        "jasig/phpcas": "~1.3.0",
-require_once '##DATADIR##/pear/CAS/Autoload.php';
-//        "iamcal/lib_autolink": "~1.7",
-require_once $vendor . '/php-iamcal-lib-autolink/autoload.php';
-//        "phpmailer/phpmailer": "~5.2",
-require_once $vendor . '/PHPMailer/PHPMailerAutoload.php';
-//        "sabre/vobject": "~4.1",
-require_once $vendor . '/Sabre/VObject4/autoload.php';
-//        "simplepie/simplepie": "^1.5",
-require_once $vendor . '/php-simplepie/autoloader.php';
-//        "tecnickcom/tcpdf": "~6.2",
-require_once $vendor . '/tcpdf/autoload.php';
-//        "zendframework/zend-cache": "^2.7",
-//        "zendframework/zend-i18n": "^2.7",
-//        "zendframework/zend-serializer": "^2.7",
-require_once $vendor . '/Zend/autoload.php';
-//        "michelf/php-markdown": "^1.6",
-require_once $vendor . '/Michelf/markdown-autoload.php';
-//        "true/punycode": "^2.1",
-require_once $vendor . '/TrueBV/autoload.php';
+\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",
+    //        "sabre/vobject": "~4.1",
+    "$vendor/Sabre/VObject4/autoload.php",
+    //        "simplepie/simplepie": "^1.5",
+    "$vendor/php-simplepie/autoloader.php",
+    //        "tecnickcom/tcpdf": "~6.2",
+    "$vendor/tcpdf/autoload.php",
+    //        "zendframework/zend-cache": "^2.7",
+    [
+        "$vendor/Zend/Cache/autoload.php",
+        "$vendor/Zend/autoload.php",
+    ],
+    //        "zendframework/zend-i18n": "^2.7",
+    [
+        "$vendor/Zend/I18n/autoload.php",
+        "$vendor/Zend/autoload.php",
+    ],
+    //        "zendframework/zend-serializer": "^2.7",
+    [
+        "$vendor/Zend/Serializer/autoload.php",
+        "$vendor/Zend/autoload.php",
+    ],
+    //        "michelf/php-markdown": "^1.6",
+    "$vendor/Michelf/markdown-autoload.php",
+    //        "true/punycode": "^2.1",
+    "$vendor/TrueBV/autoload.php",
 //         "paragonie/random_compat": "^2.0"
-require_once $vendor . '/random_compat/autoload.php';
+    "$vendor/random_compat/autoload.php",
+]);
+
-- 
cgit