public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Consistently use arrays as paths for a given namespace prefix

pull/1871/head
Jordi Boggiano 2013-05-05 10:56:46 +02:00
parent b00081f4f4
commit dc71ba557b
6 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Autoload/AutoloadGenerator.php
View File

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

12
tests/Composer/Test/Autoload/AutoloadGeneratorTest.php
View File

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

2
tests/Composer/Test/Autoload/Fixtures/autoload_main.php
View File

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

4
tests/Composer/Test/Autoload/Fixtures/autoload_main2.php
View File

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

4
tests/Composer/Test/Autoload/Fixtures/autoload_main3.php
View File

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

6
tests/Composer/Test/Autoload/Fixtures/autoload_vendors.php
View File

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