From 1e0710b32f0795c628441585f7bb0539227c1108 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Sat, 29 Oct 2011 18:13:11 +0200 Subject: [PATCH] Move .composer into vendor (hardcoded for now) --- bin/composer | 8 +++++--- src/Composer/Command/InstallCommand.php | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bin/composer b/bin/composer index 7b2ee8da8..72eda90a4 100755 --- a/bin/composer +++ b/bin/composer @@ -11,9 +11,11 @@ use Composer\Package; use Composer\Json\JsonFile; use Composer\Console\Application as ComposerApplication; +$vendorPath = 'vendor'; + // initialize repository manager $rm = new Repository\RepositoryManager(); -$rm->setLocalRepository(new Repository\FilesystemRepository(new JsonFile('.composer/installed.json'))); +$rm->setLocalRepository(new Repository\FilesystemRepository(new JsonFile($vendorPath.'/.composer/installed.json'))); $rm->setRepositoryClass('composer', 'Composer\Repository\ComposerRepository'); $rm->setRepositoryClass('pear', 'Composer\Repository\PearRepository'); $rm->setRepositoryClass('package', 'Composer\Repository\PackageRepository'); @@ -26,8 +28,8 @@ $dm->setDownloader('zip', new Downloader\ZipDownloader()); // initialize installation manager $im = new Installer\InstallationManager(); -$im->addInstaller(new Installer\LibraryInstaller('vendor', $dm, $rm->getLocalRepository())); -$im->addInstaller(new Installer\LibraryInstaller('vendor/bundles', $dm, $rm->getLocalRepository(), 'symfony-bundle')); +$im->addInstaller(new Installer\LibraryInstaller($vendorPath, $dm, $rm->getLocalRepository())); +$im->addInstaller(new Installer\LibraryInstaller($vendorPath.'/bundles', $dm, $rm->getLocalRepository(), 'symfony-bundle')); // load package $loader = new Package\Loader\ArrayLoader($rm); diff --git a/src/Composer/Command/InstallCommand.php b/src/Composer/Command/InstallCommand.php index f200dd81f..96d8f63f9 100644 --- a/src/Composer/Command/InstallCommand.php +++ b/src/Composer/Command/InstallCommand.php @@ -117,7 +117,7 @@ EOT $output->writeln('> Generating autoload.php'); $generator = new AutoloadGenerator($localRepo, $composer->getPackage(), $installationManager); - $generator->dump('.composer/autoload.php'); + $generator->dump('vendor/.composer/autoload.php'); $output->writeln('> Done'); }