Permalink
Browse files

Merge pull request #365 from Ocramius/DDC-1860

DDC-1860 - Composer arbitrary for CLI and composer/autoload.php in different paths
  • Loading branch information...
2 parents 9445502 + 2f83cf0 commit 7b758493a34150a8b68e0468db0d5abfe4b6e725 @guilhermeblanco guilhermeblanco committed Jun 9, 2012
Showing with 1 addition and 7 deletions.
  1. +1 −7 bin/doctrine.php
View
@@ -17,13 +17,7 @@
* <http://www.doctrine-project.org>.
*/
-if (!@include __DIR__ . '/../../../autoload.php') {
- die(<<<'EOT'
-This command can only be run when Doctrine is installed through Composer.
-EOT
- );
-}
-
+(@include_once __DIR__ . '/../vendor/autoload.php') || @include_once __DIR__ . '/../../../autoload.php';
$configFile = getcwd() . DIRECTORY_SEPARATOR . 'cli-config.php';
$helperSet = null;

0 comments on commit 7b75849

Please sign in to comment.