From 30fdf379aa006a6462fbb05e7363a63ce1ab10aa Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Tue, 14 Aug 2012 18:59:36 +0200
Subject: [PATCH] Minor consistency tweaks

---
 src/Composer/Autoload/AutoloadGenerator.php                  | 5 ++---
 tests/Composer/Test/Autoload/Fixtures/autoload_main.php      | 2 +-
 tests/Composer/Test/Autoload/Fixtures/autoload_main2.php     | 2 +-
 tests/Composer/Test/Autoload/Fixtures/autoload_main3.php     | 2 +-
 .../Test/Autoload/Fixtures/autoload_override_vendors.php     | 2 +-
 .../Test/Autoload/Fixtures/autoload_real_functions.php       | 1 +
 .../Test/Autoload/Fixtures/autoload_real_target_dir.php      | 1 +
 tests/Composer/Test/Autoload/Fixtures/autoload_vendors.php   | 2 +-
 8 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php
index e49b16bc3..71f64b377 100644
--- a/src/Composer/Autoload/AutoloadGenerator.php
+++ b/src/Composer/Autoload/AutoloadGenerator.php
@@ -43,7 +43,7 @@ class AutoloadGenerator
         $namespacesFile = <<<EOF
 <?php
 
-// autoload_namespace.php generated by Composer
+// autoload_namespaces.php generated by Composer
 
 \$vendorDir = $vendorPathCode;
 \$baseDir = $appBaseDirCode;
@@ -281,8 +281,6 @@ EOF;
 
     protected function getAutoloadFile($vendorPathToTargetDirCode, $suffix)
     {
-
-
         return <<<AUTOLOAD
 <?php
 
@@ -312,6 +310,7 @@ AUTOLOAD;
 <?php
 
 // autoload_real$suffix.php generated by Composer
+
 if (!class_exists('Composer\\\\Autoload\\\\ClassLoader', false)) {
     require __DIR__ . '/ClassLoader.php';
 }
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_main.php b/tests/Composer/Test/Autoload/Fixtures/autoload_main.php
index cd18304db..613cddbe2 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_main.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_main.php
@@ -1,6 +1,6 @@
 <?php
 
-// autoload_namespace.php generated by Composer
+// autoload_namespaces.php generated by Composer
 
 $vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_main2.php b/tests/Composer/Test/Autoload/Fixtures/autoload_main2.php
index da1c87d88..d857655af 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_main2.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_main2.php
@@ -1,6 +1,6 @@
 <?php
 
-// autoload_namespace.php generated by Composer
+// autoload_namespaces.php generated by Composer
 
 $vendorDir = dirname(__DIR__);
 $baseDir = dirname(dirname($vendorDir));
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_main3.php b/tests/Composer/Test/Autoload/Fixtures/autoload_main3.php
index 2eb74cf44..7fb27d0bd 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_main3.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_main3.php
@@ -1,6 +1,6 @@
 <?php
 
-// autoload_namespace.php generated by Composer
+// autoload_namespaces.php generated by Composer
 
 $vendorDir = dirname(__DIR__);
 $baseDir = $vendorDir;
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_override_vendors.php b/tests/Composer/Test/Autoload/Fixtures/autoload_override_vendors.php
index 0640aceda..934424b5d 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_override_vendors.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_override_vendors.php
@@ -1,6 +1,6 @@
 <?php
 
-// autoload_namespace.php generated by Composer
+// autoload_namespaces.php generated by Composer
 
 $vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php
index e33ff4fc9..49f120ef6 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php
@@ -1,6 +1,7 @@
 <?php
 
 // autoload_realFilesAutoload.php generated by Composer
+
 if (!class_exists('Composer\\Autoload\\ClassLoader', false)) {
     require __DIR__ . '/ClassLoader.php';
 }
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php
index 7ed23490b..2c10eda3a 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php
@@ -1,6 +1,7 @@
 <?php
 
 // autoload_realTargetDir.php generated by Composer
+
 if (!class_exists('Composer\\Autoload\\ClassLoader', false)) {
     require __DIR__ . '/ClassLoader.php';
 }
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_vendors.php b/tests/Composer/Test/Autoload/Fixtures/autoload_vendors.php
index dd076486d..f77821f9a 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_vendors.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_vendors.php
@@ -1,6 +1,6 @@
 <?php
 
-// autoload_namespace.php generated by Composer
+// autoload_namespaces.php generated by Composer
 
 $vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);