Merge pull request #1467 from rgeraads/master

revert #1405 because it spawned #1451
phpDocumentor · Nov 11, 2014 · 5920dd4 · 5920dd4
2 parents 31bb470 + ace3b81
commit 5920dd4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.9.0
+2.8.1
diff --git a/src/phpDocumentor/Bootstrap.php b/src/phpDocumentor/Bootstrap.php
@@ -141,9 +141,6 @@ public function findVendorPath($baseDir = __DIR__)
         if (file_exists($composerConfigurationPath)) {
             $vendorDir = $rootFolderWhenInstalledWithComposer
                 . $this->getCustomVendorPathFromComposer($composerConfigurationPath);
-        } elseif (file_exists(getcwd() . DIRECTORY_SEPARATOR  . 'composer.json')) {
-            $vendorDir = getcwd() . DIRECTORY_SEPARATOR
-                . $this->getCustomVendorPathFromComposer(getcwd() . DIRECTORY_SEPARATOR  . 'composer.json');
         }
 
         return file_exists($vendorDir) ? $vendorDir : null;