From e99b32734241eaca3fd0f8290dc521cbec385ffd Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Sat, 10 Aug 2013 14:22:11 +0200
Subject: [PATCH] Clarify that composer.json is being read and not downloaded,
 refs #2096

---
 src/Composer/Factory.php               | 4 ++--
 src/Composer/Util/RemoteFilesystem.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Composer/Factory.php b/src/Composer/Factory.php
index a099abcd0..e45c75001 100644
--- a/src/Composer/Factory.php
+++ b/src/Composer/Factory.php
@@ -126,7 +126,7 @@ class Factory
 
     public static function getComposerFile()
     {
-        return trim(getenv('COMPOSER')) ?: 'composer.json';
+        return trim(getenv('COMPOSER')) ?: './composer.json';
     }
 
     public static function createAdditionalStyles()
@@ -191,7 +191,7 @@ class Factory
             $file = new JsonFile($localConfig, new RemoteFilesystem($io));
 
             if (!$file->exists()) {
-                if ($localConfig === 'composer.json') {
+                if ($localConfig === './composer.json' || $localConfig === 'composer.json') {
                     $message = 'Composer could not find a composer.json file in '.getcwd();
                 } else {
                     $message = 'Composer could not find the config file: '.$localConfig;
diff --git a/src/Composer/Util/RemoteFilesystem.php b/src/Composer/Util/RemoteFilesystem.php
index 42eff8421..3db55ab6d 100644
--- a/src/Composer/Util/RemoteFilesystem.php
+++ b/src/Composer/Util/RemoteFilesystem.php
@@ -107,7 +107,7 @@ class RemoteFilesystem
         $options = $this->getOptionsForUrl($originUrl, $additionalOptions);
 
         if ($this->io->isDebug()) {
-            $this->io->write('Downloading '.$fileUrl);
+            $this->io->write((substr($fileUrl, 0, 4) === 'http' ? 'Downloading ' : 'Reading ') . $fileUrl);
         }
         if (isset($options['github-token'])) {
             $fileUrl .= (false === strpos($fileUrl, '?') ? '?' : '&') . 'access_token='.$options['github-token'];