From 82c1170fa109098e70ee1e38d931e1f8838adf03 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Thu, 3 Nov 2011 19:41:04 +0100 Subject: [PATCH] Allow any package type to be installed by the default installer, fixes #86 --- bin/composer | 3 +-- src/Composer/Installer/LibraryInstaller.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/composer b/bin/composer index a12fe3ea3..41ac07b53 100755 --- a/bin/composer +++ b/bin/composer @@ -28,8 +28,7 @@ $dm->setDownloader('zip', new Downloader\ZipDownloader()); // initialize installation manager $im = new Installer\InstallationManager(); -$im->addInstaller(new Installer\LibraryInstaller($vendorPath, $dm, $rm->getLocalRepository())); -$im->addInstaller(new Installer\LibraryInstaller($vendorPath.'/bundles', $dm, $rm->getLocalRepository(), 'symfony-bundle')); +$im->addInstaller(new Installer\LibraryInstaller($vendorPath, $dm, $rm->getLocalRepository(), null)); // load package $loader = new Package\Loader\ArrayLoader($rm); diff --git a/src/Composer/Installer/LibraryInstaller.php b/src/Composer/Installer/LibraryInstaller.php index f7525777a..dc28a095d 100644 --- a/src/Composer/Installer/LibraryInstaller.php +++ b/src/Composer/Installer/LibraryInstaller.php @@ -65,7 +65,7 @@ class LibraryInstaller implements InstallerInterface */ public function supports($packageType) { - return $packageType === $this->type; + return $packageType === $this->type || null === $this->type; } /**