Merge pull request #10 from KevinDonaldson/master

Changing to use server variable instead of php function in Autoload.php

Author: mattwellss

src/Autoload.php

@@ -73,8 +73,14 @@ static public function instance()
      */
     public static function getVendorRootDir()
     {
-        if (isset($_SERVER['MAGE_VENDOR_ROOT'])) {
-            return $_SERVER['MAGE_VENDOR_ROOT'];
+        // Checks for variable if done in Vhosts config.
+        if (getenv('MAGE_VENDOR_ROOT')) {
+            return getenv('MAGE_VENDOR_ROOT');
+        }
+
+        // Checks for variable if done in .htaccess file.
+        if (getenv('REDIRECT_MAGE_VENDOR_ROOT')) {
+            return getenv('REDIRECT_MAGE_VENDOR_ROOT');
         }
 
         if (defined('VENDOR_ROOT')) {

tests/AutoloadTest.php

@@ -38,7 +38,8 @@ public function testRegisterStandard()
 
     public function testRegisterWithEnv()
     {
-        $_SERVER['MAGE_VENDOR_ROOT'] = __DIR__ . '/../vendor';
+        $mageVendorRoot = __DIR__ . '/../vendor';
+        putenv("MAGE_VENDOR_ROOT=$mageVendorRoot");
 
         Varien_Autoload::register();