From 42bcd1e7c56ebbb9ab5d7dc4309c798ab0868171 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= <bburnichon@alchemy.fr>
Date: Wed, 8 Apr 2015 11:41:56 +0200
Subject: [PATCH] Make autoload to return $loader instance

---
 lib/autoload.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/autoload.php b/lib/autoload.php
index 9e323d2a2e..d7e58e7175 100644
--- a/lib/autoload.php
+++ b/lib/autoload.php
@@ -1,6 +1,10 @@
 <?php
 
-require __DIR__ . '/../vendor/autoload.php';
-if (file_exists(__DIR__ . '/../plugins/autoload.php')) {
-    require __DIR__ . '/../plugins/autoload.php';
-}
+return call_user_func(function () {
+    $loader = require __DIR__ . '/../vendor/autoload.php';
+    if (file_exists(__DIR__ . '/../plugins/autoload.php')) {
+        require __DIR__ . '/../plugins/autoload.php';
+    }
+
+    return $loader;
+});