public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Fix text spacing and remove excess getInstallPath call in LibraryInstaller::update

pull/831/head
Alexey Prilipko 2012-07-02 10:10:23 +11:00
parent 59773dd9f6
commit 9ba3deb91b
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/05-repositories.md
View File

@ -235,7 +235,6 @@ Example:
* BasePackage, requires nothing * BasePackage, requires nothing
* IntermediatePackage, depends on BasePackage * IntermediatePackage, depends on BasePackage
* TopLevelPackage1 and TopLevelPackage2 both dependth on IntermediatePackage. * TopLevelPackage1 and TopLevelPackage2 both dependth on IntermediatePackage.
For composer it looks like: For composer it looks like:
* "pear-pear.foobar.repo/IntermediatePackage" depends on "pear-pear.foobar.repo/BasePackage", * "pear-pear.foobar.repo/IntermediatePackage" depends on "pear-pear.foobar.repo/BasePackage",
* "pear-pear.foobar.repo/TopLevelPackage1" depends on "pear-pear.foobar.repo/IntermediatePackage", * "pear-pear.foobar.repo/TopLevelPackage1" depends on "pear-pear.foobar.repo/IntermediatePackage",
@ -243,10 +242,10 @@ Example:
When you update one of your packages to composer naming scheme or made it When you update one of your packages to composer naming scheme or made it
available through vcs your older dependencies would not see new version cause it would be named available through vcs your older dependencies would not see new version cause it would be named
like "foobar/IntermediatePackage". like "foobar/IntermediatePackage".
Specifying 'vendor-alias' for pear repository you will get all its packages aliased with composer-like names. Specifying 'vendor-alias' for pear repository you will get all its packages aliased with composer-like names.
Following example would take BasePackage, TopLevelPackage1 and TopLevelPackage2 packages from pear repository Following example would take BasePackage, TopLevelPackage1 and TopLevelPackage2 packages from pear repository
and IntermediatePackage from github repository: and IntermediatePackage from github repository:
{ {
"repositories": [ "repositories": [
{ {
@ -265,7 +264,6 @@ Example:
} }
} }
### Package ### Package
If you want to use a project that does not support composer through any of the If you want to use a project that does not support composer through any of the

3
src/Composer/Installer/LibraryInstaller.php
View File

@ -99,10 +99,9 @@ class LibraryInstaller implements InstallerInterface
} }
$this->initializeVendorDir(); $this->initializeVendorDir();
$downloadPath = $this->getInstallPath($initial);
$this->removeBinaries($initial); $this->removeBinaries($initial);
$this->updateCode($initial, $target, $downloadPath); $this->updateCode($initial, $target);
$this->installBinaries($target); $this->installBinaries($target);
$repo->removePackage($initial); $repo->removePackage($initial);
if (!$repo->hasPackage($target)) { if (!$repo->hasPackage($target)) {