From adee2b6f31f4dc66bceff18a5d5fae0e970ebea5 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Mon, 29 Jun 2015 08:38:53 +0200
Subject: composer: new snapshot + review autloader

---
 composer-autoload.php | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

(limited to 'composer-autoload.php')

diff --git a/composer-autoload.php b/composer-autoload.php
index 11b8043..65c331f 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -1,18 +1,21 @@
 <?php
 $vendorDir = '/usr/share/php';
-require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php';
-use Symfony\Component\ClassLoader\UniversalClassLoader;
+// Use Symfony autoloader
+if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Component\ClassLoader\ClassLoader)) {
+    if (!class_exists('Symfony\\Component\\ClassLoader\\ClassLoader', false)) {
+        require_once $vendorDir . '/Symfony/Component/ClassLoader/ClassLoader.php';
+    }
 
-$loader = new UniversalClassLoader();
-$loader->registerNamespaces(array(
-    'Seld\\JsonLint'                      => $vendorDir,
-    'Seld\\PharUtils'                     => $vendorDir,
-    'Seld\\CliPrompt'                     => $vendorDir,
-    'JsonSchema'                          => $vendorDir,
-    'Symfony\\Component\\Console'         => $vendorDir,
-    'Symfony\\Component\\Finder'          => $vendorDir,
-    'Symfony\\Component\\Process'         => $vendorDir,
-    'Symfony\\Component\\ClassLoader'     => $vendorDir,
-    'Composer'                            => dirname(__DIR__)
+    $fedoraClassLoader = new \Symfony\Component\ClassLoader\ClassLoader();
+    $fedoraClassLoader->register();
+}
+
+$fedoraClassLoader->addPrefixes(array(
+    'Seld\\JsonLint\\'             => $vendorDir,
+    'Seld\\PharUtils\\'            => $vendorDir,
+    'Seld\\CliPrompt\\'            => $vendorDir,
+    'JsonSchema\\'                 => $vendorDir,
+    'Symfony\\Component\\'         => $vendorDir,
+    'Composer\\'                   => dirname(__DIR__)
 ));
-$loader->register();
+$fedoraClassLoader->register();
-- 
cgit