From 4cd557d08db654d833d142b5899a98b3851926e1 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 5 Jun 2015 16:19:24 +0200
Subject: php-phpunit-PHPUnit: 4.7.1

---
 Autoload.php.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'Autoload.php.in')

diff --git a/Autoload.php.in b/Autoload.php.in
index f12fd6e..09be638 100644
--- a/Autoload.php.in
+++ b/Autoload.php.in
@@ -18,15 +18,15 @@ require_once 'Doctrine/Instantiator/autoload.php';
 require_once 'Prophecy/autoload.php';
 
 $vendorDir = '/usr/share/php';
-require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php';
-use Symfony\Component\ClassLoader\UniversalClassLoader;
-
-$loader = new UniversalClassLoader();
-$loader->registerNamespaces(array(
+if (!(isset($sfuloader) && $sfuloader instanceof Symfony\Component\ClassLoader\UniversalClassLoader)) {
+    require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php';
+    $sfuloader = new Symfony\Component\ClassLoader\UniversalClassLoader();
+    $sfuloader->register();
+}
+$sfuloader->registerNamespaces(array(
     'Symfony\\Component\\Yaml'            => $vendorDir,
     'Symfony\\Component\\ClassLoader'     => $vendorDir,
 ));
-$loader->register();
 
 spl_autoload_register(
   function ($class)
-- 
cgit