diff --git a/doc/00-intro.md b/doc/00-intro.md index ab304fb3e..2ff756684 100644 --- a/doc/00-intro.md +++ b/doc/00-intro.md @@ -59,3 +59,5 @@ autoloading: require 'vendor/.composer/autoload.php'; That's all it takes to have a basic setup. + +[Basic Usage](01-basic-usage.md) → diff --git a/doc/01-basic-usage.md b/doc/01-basic-usage.md index b4e9318a8..550e887fe 100644 --- a/doc/01-basic-usage.md +++ b/doc/01-basic-usage.md @@ -177,3 +177,5 @@ This can be useful for autoloading classes in a test suite, for example. > **Note:** Composer provides its own autoloader. If you don't want to use that one, you can just include `vendor/.composer/autoload_namespaces.php`, which returns an associative array mapping namespaces to directories. + +← [Intro](00-intro.md) | [Libraries](02-libraries.md) → \ No newline at end of file diff --git a/doc/02-libraries.md b/doc/02-libraries.md index 1fdb54782..d6951f986 100644 --- a/doc/02-libraries.md +++ b/doc/02-libraries.md @@ -158,3 +158,5 @@ publish it on packagist as well. And this is really easy. You simply hit the big "Submit Package" button and sign up. Then you submit the URL to your VCS repository, at which point packagist will start crawling it. Once it is done, your package will be available to anyone. + +← [Basic usage](01-basic-usage.md) | [Command-line interface](03-cli.md) → \ No newline at end of file diff --git a/doc/03-cli.md b/doc/03-cli.md index 4d6de32b4..5900afb49 100644 --- a/doc/03-cli.md +++ b/doc/03-cli.md @@ -184,3 +184,5 @@ commands) to finish executing. The default value is 60 seconds. If you are using composer from behind an HTTP proxy, you can use the standard `HTTP_PROXY` or `http_proxy` env vars. Simply set it to the URL of your proxy. Many operating systems already set this variable for you. + +← [Libraries](02-libraries.md) | [Schema](04-schema.md) → \ No newline at end of file diff --git a/doc/04-schema.md b/doc/04-schema.md index 76cef57e2..c3c04a8fa 100644 --- a/doc/04-schema.md +++ b/doc/04-schema.md @@ -388,3 +388,5 @@ dir` (from config). See (Vendor Bins)[articles/vendor-bins] for more details. Optional. + +← [Command-line interface](03-cli.md) | [Repositories](05-repositories.md) → \ No newline at end of file diff --git a/doc/05-repositories.md b/doc/05-repositories.md index e26cc49af..9b23e6f4f 100644 --- a/doc/05-repositories.md +++ b/doc/05-repositories.md @@ -262,3 +262,6 @@ You can disable the default packagist repository by adding this to your } ] } + + +← [Schema](04-schema.md) | [Community](06-community.md) → \ No newline at end of file diff --git a/doc/06-community.md b/doc/06-community.md index 575d6ca3b..efd10d17a 100644 --- a/doc/06-community.md +++ b/doc/06-community.md @@ -26,3 +26,5 @@ The developer mailing list is on [google groups](http://groups.google.com/group/ IRC channels are available for discussion as well, on irc.freenode.org [#composer](irc://irc.freenode.org/composer) for users and [#composer-dev](irc://irc.freenode.org/composer-dev) for development. + +← [Repositories](05-repositories.md) \ No newline at end of file diff --git a/src/Composer/Compiler.php b/src/Composer/Compiler.php index 5e77bbf9e..86c6ffb44 100644 --- a/src/Composer/Compiler.php +++ b/src/Composer/Compiler.php @@ -35,9 +35,9 @@ class Compiler unlink($pharFile); } - $process = new Process('git log --pretty="%h" -n1 HEAD'); + $process = new Process('git log --pretty="%h" -n1 HEAD', __DIR__); if ($process->run() != 0) { - throw new \RuntimeException('The git binary cannot be found.'); + throw new \RuntimeException('Can\'t run git log. You must ensure to run compile from composer git repository clone and that git binary is available.'); } $this->version = trim($process->getOutput()); diff --git a/src/Composer/Downloader/GitDownloader.php b/src/Composer/Downloader/GitDownloader.php index 14cf453b2..0aa043c31 100644 --- a/src/Composer/Downloader/GitDownloader.php +++ b/src/Composer/Downloader/GitDownloader.php @@ -74,7 +74,7 @@ class GitDownloader extends VcsDownloader } if (trim($output)) { - throw new \RuntimeException('Source directory has uncommitted changes'); + throw new \RuntimeException('Source directory ' . $path . ' has uncommitted changes'); } } } diff --git a/src/Composer/Downloader/HgDownloader.php b/src/Composer/Downloader/HgDownloader.php index 768280845..629883dc8 100644 --- a/src/Composer/Downloader/HgDownloader.php +++ b/src/Composer/Downloader/HgDownloader.php @@ -50,7 +50,7 @@ class HgDownloader extends VcsDownloader { $this->process->execute(sprintf('cd %s && hg st', escapeshellarg($path)), $output); if (trim($output)) { - throw new \RuntimeException('Source directory has uncommitted changes'); + throw new \RuntimeException('Source directory ' . $path . ' has uncommitted changes'); } } } diff --git a/src/Composer/Downloader/SvnDownloader.php b/src/Composer/Downloader/SvnDownloader.php index e0bb915f6..28d3e2101 100644 --- a/src/Composer/Downloader/SvnDownloader.php +++ b/src/Composer/Downloader/SvnDownloader.php @@ -51,7 +51,7 @@ class SvnDownloader extends VcsDownloader { $this->process->execute(sprintf('cd %s && svn status', escapeshellarg($path)), $output); if (trim($output)) { - throw new \RuntimeException('Source directory has uncommitted changes'); + throw new \RuntimeException('Source directory ' . $path . ' has uncommitted changes'); } } } \ No newline at end of file