1 files changed, 58 insertions, 61 deletions

diff --git a/nextcloud-fedora-autoloader.php b/nextcloud-fedora-autoloader.php
index 84f8c1b..a70713d 100644
--- a/nextcloud-fedora-autoloader.php
+++ b/nextcloud-fedora-autoloader.php
@@ -1,68 +1,65 @@
 <?php
 $vendor = '##DATADIR##/php';
 
-if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Component\ClassLoader\ClassLoader)) {
-    if (!class_exists('Symfony\\Component\\ClassLoader\\ClassLoader', false)) {
-        require_once $vendor . '/Symfony/Component/ClassLoader/ClassLoader.php';
-    }
-
-    $fedoraClassLoader = new \Symfony\Component\ClassLoader\ClassLoader();
-    $fedoraClassLoader->register();
-}
+require_once $vendor . '/Fedora/Autoloader/autoload.php';
 
 // For PEAR components
-$fedoraClassLoader->setUseIncludePath(true);
+\Fedora\Autoloader\Autoload::addIncludePath();
 
 // Dependencies from 3rdparty composer.json
-// "guzzlehttp/guzzle"
-require_once $vendor . '/GuzzleHttp/autoload.php';
-// "sabre/dav"
-require_once $vendor . '/Sabre/DAV/autoload.php';
-// "doctrine/dbal"
-require_once $vendor . '/Doctrine/DBAL/autoload.php';
-// mcnetic/zipstreamer"
-require_once $vendor . '/ZipStreamer/autoload.php';
-// "phpeclib/phpseclib"
-require_once $vendor . '/phpseclib/autoload.php';
-// "rackspace/php-opencloud"
-require_once $vendor . '/OpenCloud/autoload.php';
-// "jeremeamia/superclosure"
-require_once $vendor . '/SuperClosure/autoload.php';
-// "bantu/ini-get-wrapper"
-require_once $vendor . '/bantu/IniGetWrapper/IniGetWrapper.php';
-// "natxet/CssMin"
-require_once $vendor . '/natxet/CssMin/autoload.php';
-// "punic/punic"
-require_once $vendor . '/Punic/autoload.php';
-// "patchwork/utf8"
-require_once $vendor . '/Patchwork/autoload.php';
-// "symfony/console"
-require_once $vendor . '/Symfony/Component/Console/autoload.php';
-// "symfony/event-dispatcher"
-require_once $vendor . '/Symfony/Component/EventDispatcher/autoload.php';
-// "symfony/routing"
-require_once $vendor . '/Symfony/Component/Routing/autoload.php';
-// "symfony/process"
-require_once $vendor . '/Symfony/Component/Process/autoload.php';
-// "pimple/pimple"
-require_once $vendor . '/Pimple/autoload.php';
-// "ircmaxell/password-compat"
-require_once $vendor . '/password_compat/password.php';
-// "nikic/php-parser"
-require_once $vendor . '/PhpParser/autoload.php';
-// "icewind/Streams"
-require_once $vendor . '/Icewind/Streams/autoload.php';
-// "swiftmailer/swiftmailer
-require_once $vendor . '/Swift/swift_required.php';
-// "league/flysystem"
-require_once $vendor . '/League/Flysystem/autoload.php';
-// "interfasys/lognormalizer"
-require_once $vendor . '/InterfaSys/LogNormalizer/autoload.php';
-// "deepdiver1975/TarSTreamer"
-require_once $vendor . '/ownCloud/TarStreamer/autoload.php';
-// "patchwork/jsqueeze"
-require_once $vendor . '/Patchwork/JSqueeze.php';
-// "symfony/polyfill-php{55,56,70}"
-require_once $vendor . '/Symfony/Polyfill/autoload.php';
-// "lukasreschke/id3parser": "^0.0.1"
-require_once $vendor . '/ID3Parser/autoload.php';
+\Fedora\Autoloader\Dependencies::required(array(
+	// "guzzlehttp/guzzle"
+	$vendor . '/GuzzleHttp/autoload.php',
+	// To avoid having Aws 3 loaded
+	$vendor . '/Aws/autoload.php',
+	// "sabre/dav"
+	$vendor . '/Sabre/DAV/autoload.php',
+	// "doctrine/dbal"
+	$vendor . '/Doctrine/DBAL/autoload.php',
+	// mcnetic/zipstreamer"
+	$vendor . '/ZipStreamer/autoload.php',
+	// "phpeclib/phpseclib"
+	$vendor . '/phpseclib/autoload.php',
+	// "rackspace/php-opencloud"
+	$vendor . '/OpenCloud/autoload.php',
+	// "jeremeamia/superclosure"
+	$vendor . '/SuperClosure/autoload.php',
+	// "bantu/ini-get-wrapper"
+	$vendor . '/bantu/IniGetWrapper/IniGetWrapper.php',
+	// "natxet/CssMin"
+	$vendor . '/natxet/CssMin/autoload.php',
+	// "punic/punic"
+	$vendor . '/Punic/autoload.php',
+	// "patchwork/utf8"
+	$vendor . '/Patchwork/autoload.php',
+	// "symfony/console"
+	$vendor . '/Symfony/Component/Console/autoload.php',
+	// "symfony/event-dispatcher"
+	$vendor . '/Symfony/Component/EventDispatcher/autoload.php',
+	// "symfony/routing"
+	$vendor . '/Symfony/Component/Routing/autoload.php',
+	// "symfony/process"
+	$vendor . '/Symfony/Component/Process/autoload.php',
+	// "pimple/pimple"
+	$vendor . '/Pimple/autoload.php',
+	// "ircmaxell/password-compat"
+	$vendor . '/password_compat/password.php',
+	// "nikic/php-parser"
+	$vendor . '/PhpParser/autoload.php',
+	// "icewind/Streams"
+	$vendor . '/Icewind/Streams/autoload.php',
+	// "swiftmailer/swiftmailer
+	$vendor . '/Swift/swift_required.php',
+	// "league/flysystem"
+	$vendor . '/League/Flysystem/autoload.php',
+	// "interfasys/lognormalizer"
+	$vendor . '/InterfaSys/LogNormalizer/autoload.php',
+	// "deepdiver1975/TarSTreamer"
+	$vendor . '/ownCloud/TarStreamer/autoload.php',
+	// "patchwork/jsqueeze"
+	$vendor . '/Patchwork/JSqueeze.php',
+	// "symfony/polyfill-php{55,56,70}"
+	$vendor . '/Symfony/Polyfill/autoload.php',
+	// "lukasreschke/id3parser": "^0.0.1"
+	$vendor . '/ID3Parser/autoload.php',
+));