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

composer.lock

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

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",

src/Composer/Command/AboutCommand.php

@@ -37,7 +37,7 @@ EOT
         $output->writeln(<<<EOT
 <info>Composer - Package Management for PHP</info>
 <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
         );
 

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);
         }
 

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);
         }