Merge pull request #365 from Ocramius/DDC-1860
DDC-1860 - Composer arbitrary for CLI and composer/autoload.php in different paths
This commit is contained in:
commit
7b758493a3
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user