Merge pull request #14 from nevvermind/crazy-vendor

Fixes wrong value returned when getting the vendor dir through PluginConfig
Cotya · May 3, 2015 · 6a4d087 · 6a4d087
2 parents 2b66b39 + c1d88a1
commit 6a4d087
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/MagentoHackathon/Composer/Magento/ProjectConfig.php b/src/MagentoHackathon/Composer/Magento/ProjectConfig.php
@@ -437,7 +437,11 @@ public function getComposerRepositories()
      */
     public function getVendorDir()
     {
-        return $this->fetchVarFromConfigArray($this->composerConfig, 'vendor-dir', 'vendor');
+        return $this->fetchVarFromConfigArray(
+            $this->composerConfig['config'],
+            'vendor-dir',
+            getcwd() . '/vendor'
+        );
     }
 
     /**

diff --git a/tests/MagentoHackathon/Composer/Magento/ModuleManagerTest.php b/tests/MagentoHackathon/Composer/Magento/ModuleManagerTest.php
@@ -30,7 +30,7 @@ public function setUp()
             new InstalledPackageDumper()
         );
 
-        $config = new ProjectConfig(array(), array('vendor-dir' => 'vendor'));
+        $config = new ProjectConfig(array(), array('config' => array('vendor-dir' => 'vendor')));
         $this->unInstallStrategy =
             $this->getMock('MagentoHackathon\Composer\Magento\UnInstallStrategy\UnInstallStrategyInterface');