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

Merge remote-tracking branch 'upstream/master' into svn-auth-reloaded

pull/410/head
till 2012-03-23 15:49:45 +01:00
parent c7dc49fe10 53ede45acc
commit 38a997fc26
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.lock generated
View File

@ -24,7 +24,7 @@
{ {
"package": "symfony/process", "package": "symfony/process",
"version": "dev-master", "version": "dev-master",
"source-reference": "0aad81ae9f884cf7df6387cb52a11b5b4f07b3d6" "source-reference": "d08c4ea1530453ce270fcba78f0bff57a0869a9b"
} }
], ],
"aliases": [ "aliases": [

2
res/composer-schema.json
View File

@ -35,7 +35,7 @@
}, },
"version": { "version": {
"type": "string", "type": "string",
"description": "Package version, see http://packagist.org/about for more info on valid schemes." "description": "Package version, see http://getcomposer.org/doc/04-schema.md#version for more info on valid schemes."
}, },
"time": { "time": {
"type": "string", "type": "string",

2
src/Composer/Command/AboutCommand.php
View File

@ -37,7 +37,7 @@ EOT
$output->writeln(<<<EOT $output->writeln(<<<EOT
<info>Composer - Package Management for PHP</info> <info>Composer - Package Management for PHP</info>
<comment>Composer is a package manager tracking local dependencies of your projects and libraries. <comment>Composer is a package manager tracking local dependencies of your projects and libraries.
See http://packagist.org/about for more information.</comment> See http://getcomposer.org/ for more information.</comment>
EOT EOT
); );

2
src/Composer/Factory.php
View File

@ -46,7 +46,7 @@ class Factory
} else { } else {
$message = 'Composer could not find the config file: '.$composerFile; $message = 'Composer could not find the config file: '.$composerFile;
} }
$instructions = 'To initialize a project, please create a composer.json file as described on the http://packagist.org/ "Getting Started" section'; $instructions = 'To initialize a project, please create a composer.json file as described in the http://getcomposer.org/ "Getting Started" section';
throw new \InvalidArgumentException($message.PHP_EOL.$instructions); throw new \InvalidArgumentException($message.PHP_EOL.$instructions);
} }

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

@ -169,7 +169,14 @@ class LibraryInstaller implements InstallerInterface
} }
file_put_contents($link, $this->generateWindowsProxyCode($bin, $link)); file_put_contents($link, $this->generateWindowsProxyCode($bin, $link));
} else { } else {
try {
// under linux symlinks are not always supported for example
// when using it in smbfs mounted folder
symlink($bin, $link); symlink($bin, $link);
} catch (\ErrorException $e) {
file_put_contents($link, $this->generateUnixyProxyCode($bin, $link));
}
} }
chmod($link, 0755); chmod($link, 0755);
} }