Consistently use arrays as paths for a given namespace prefix

src/Composer/Autoload/AutoloadGenerator.php

@@ -76,11 +76,7 @@ EOF;
             }
             $exportedPrefix = var_export($namespace, true);
             $namespacesFile .= "    $exportedPrefix => ";
-            if (count($exportedPaths) > 1) {
-                $namespacesFile .= "array(".implode(', ', $exportedPaths)."),\n";
-            } else {
-                $namespacesFile .= $exportedPaths[0].",\n";
-            }
+            $namespacesFile .= "array(".implode(', ', $exportedPaths)."),\n";
         }
         $namespacesFile .= ");\n";
 

tests/Composer/Test/Autoload/AutoloadGeneratorTest.php

@@ -478,9 +478,9 @@ class AutoloadGeneratorTest extends TestCase
 \$baseDir = dirname(\$vendorDir);
 
 return array(
-    'B\\\\Sub\\\\Name' => \$vendorDir . '/b/b/src',
+    'B\\\\Sub\\\\Name' => array(\$vendorDir . '/b/b/src'),
     'A\\\\B' => array(\$baseDir . '/lib', \$vendorDir . '/a/a/lib'),
-    'A' => \$vendorDir . '/a/a/src',
+    'A' => array(\$vendorDir . '/a/a/src'),
 );
 
 EOF;
@@ -721,8 +721,8 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir).'/working-dir';
 
 return array(
-    'Foo' => $baseDir . '/src',
-    'Bar' => $vendorDir . '/b/b/lib',
+    'Foo' => array($baseDir . '/src'),
+    'Bar' => array($vendorDir . '/b/b/lib'),
 );
 
 EOF;
@@ -784,7 +784,7 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir).'/working-dir';
 
 return array(
-    'Foo' => $baseDir . '/../src',
+    'Foo' => array($baseDir . '/../src'),
 );
 
 EOF;
@@ -836,7 +836,7 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
-    'Foo' => $baseDir . '/',
+    'Foo' => array($baseDir . '/'),
 );
 
 EOF;

tests/Composer/Test/Autoload/Fixtures/autoload_main.php

@@ -6,6 +6,6 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
-    'Main' => $baseDir . '/src',
+    'Main' => array($baseDir . '/src'),
     'Lala' => array($baseDir . '/src', $baseDir . '/lib'),
 );

tests/Composer/Test/Autoload/Fixtures/autoload_main2.php

@@ -6,6 +6,6 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname(dirname($vendorDir));
 
 return array(
-    'Main' => $baseDir . '/src',
-    'Lala' => $baseDir . '/src',
+    'Main' => array($baseDir . '/src'),
+    'Lala' => array($baseDir . '/src'),
 );

tests/Composer/Test/Autoload/Fixtures/autoload_main3.php

@@ -6,6 +6,6 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = $vendorDir;
 
 return array(
-    'Main' => $vendorDir . '/src',
-    'Lala' => $vendorDir . '/src',
+    'Main' => array($vendorDir . '/src'),
+    'Lala' => array($vendorDir . '/src'),
 );

tests/Composer/Test/Autoload/Fixtures/autoload_vendors.php

@@ -6,7 +6,7 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
-    'B\\Sub\\Name' => $vendorDir . '/b/b/src',
-    'A\\B' => $vendorDir . '/a/a/lib',
-    'A' => $vendorDir . '/a/a/src',
+    'B\\Sub\\Name' => array($vendorDir . '/b/b/src'),
+    'A\\B' => array($vendorDir . '/a/a/lib'),
+    'A' => array($vendorDir . '/a/a/src'),
 );