From 3ae860f4858d520dbf4a381909e4cda1c750718d Mon Sep 17 00:00:00 2001 From: Brikou CARRE Date: Fri, 23 Mar 2012 08:53:32 +0100 Subject: [PATCH 1/3] fixed issue #486 --- src/Composer/Installer/LibraryInstaller.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Composer/Installer/LibraryInstaller.php b/src/Composer/Installer/LibraryInstaller.php index 8eef0d7ed..fb03926b3 100644 --- a/src/Composer/Installer/LibraryInstaller.php +++ b/src/Composer/Installer/LibraryInstaller.php @@ -169,7 +169,14 @@ class LibraryInstaller implements InstallerInterface } file_put_contents($link, $this->generateWindowsProxyCode($bin, $link)); } else { - symlink($bin, $link); + try { + // under linux symlinks are not always supported for example + // when using it in smbfs mounted folder + symlink($bin, $link); + } catch (\ErrorException $e) { + file_put_contents($link, $this->generateUnixyProxyCode($bin, $link)); + } + } chmod($link, 0755); } From 0fe90c5d87265a5a023ab6cdf8e6362d158d0961 Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Fri, 23 Mar 2012 09:07:47 +0100 Subject: [PATCH 2/3] update some links to point to getcomposer.org --- res/composer-schema.json | 2 +- src/Composer/Command/AboutCommand.php | 2 +- src/Composer/Factory.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/res/composer-schema.json b/res/composer-schema.json index d35591a1c..f6ecc1d51 100644 --- a/res/composer-schema.json +++ b/res/composer-schema.json @@ -35,7 +35,7 @@ }, "version": { "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": { "type": "string", diff --git a/src/Composer/Command/AboutCommand.php b/src/Composer/Command/AboutCommand.php index 9c6f27b91..fb56ea3b7 100644 --- a/src/Composer/Command/AboutCommand.php +++ b/src/Composer/Command/AboutCommand.php @@ -37,7 +37,7 @@ EOT $output->writeln(<<Composer - Package Management for PHP Composer is a package manager tracking local dependencies of your projects and libraries. -See http://packagist.org/about for more information. +See http://getcomposer.org/ for more information. EOT ); diff --git a/src/Composer/Factory.php b/src/Composer/Factory.php index 2815f22b7..339bbfad5 100644 --- a/src/Composer/Factory.php +++ b/src/Composer/Factory.php @@ -46,7 +46,7 @@ class Factory } else { $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); } From 53ede45accb9213ad1115f2a3a9b52d4a8748b58 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 23 Mar 2012 13:30:52 +0100 Subject: [PATCH 3/3] Update Process component --- composer.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index 4c921e393..8104bc857 100644 --- a/composer.lock +++ b/composer.lock @@ -24,7 +24,7 @@ { "package": "symfony/process", "version": "dev-master", - "source-reference": "0aad81ae9f884cf7df6387cb52a11b5b4f07b3d6" + "source-reference": "d08c4ea1530453ce270fcba78f0bff57a0869a9b" } ], "aliases": [