1
0
Fork 0

Add config option to set if the PHP include path should automatically be used when generating the autoloader

pull/1483/head
Pierre du Plessis 2013-01-14 10:32:26 +02:00
parent dea4bdf8f0
commit 84b34b70e0
4 changed files with 29 additions and 3 deletions

View File

@ -30,6 +30,7 @@ class AutoloadGenerator
$filesystem = new Filesystem(); $filesystem = new Filesystem();
$filesystem->ensureDirectoryExists($config->get('vendor-dir')); $filesystem->ensureDirectoryExists($config->get('vendor-dir'));
$vendorPath = strtr(realpath($config->get('vendor-dir')), '\\', '/'); $vendorPath = strtr(realpath($config->get('vendor-dir')), '\\', '/');
$useGlobalIncludePath = (bool) $config->get('use-include-path');
$targetDir = $vendorPath.'/'.$targetDir; $targetDir = $vendorPath.'/'.$targetDir;
$filesystem->ensureDirectoryExists($targetDir); $filesystem->ensureDirectoryExists($targetDir);
@ -171,7 +172,7 @@ EOF;
file_put_contents($targetDir.'/include_paths.php', $includePathFile); file_put_contents($targetDir.'/include_paths.php', $includePathFile);
} }
file_put_contents($vendorPath.'/autoload.php', $this->getAutoloadFile($vendorPathToTargetDirCode, $suffix)); file_put_contents($vendorPath.'/autoload.php', $this->getAutoloadFile($vendorPathToTargetDirCode, $suffix));
file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, true, (bool) $includePathFile, $targetDirLoader, $filesCode, $vendorPathCode, $appBaseDirCode, $suffix)); file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, true, (bool) $includePathFile, $targetDirLoader, $filesCode, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath));
copy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php'); copy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
} }
@ -326,7 +327,7 @@ return ComposerAutoloaderInit$suffix::getLoader();
AUTOLOAD; AUTOLOAD;
} }
protected function getAutoloadRealFile($usePSR0, $useClassMap, $useIncludePath, $targetDirLoader, $filesCode, $vendorPathCode, $appBaseDirCode, $suffix) protected function getAutoloadRealFile($usePSR0, $useClassMap, $useIncludePath, $targetDirLoader, $filesCode, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath)
{ {
// TODO the class ComposerAutoloaderInit should be revert to a closure // TODO the class ComposerAutoloaderInit should be revert to a closure
// when APC has been fixed: // when APC has been fixed:
@ -403,6 +404,13 @@ PSR0;
CLASSMAP; CLASSMAP;
} }
if ($useGlobalIncludePath) {
$file .= <<<'INCLUDEPATH'
$loader->setUseIncludePath(true);
INCLUDEPATH;
}
if ($targetDirLoader) { if ($targetDirLoader) {
$file .= <<<REGISTER_AUTOLOAD $file .= <<<REGISTER_AUTOLOAD
spl_autoload_register(array('ComposerAutoloaderInit$suffix', 'autoload'), true, true); spl_autoload_register(array('ComposerAutoloaderInit$suffix', 'autoload'), true, true);

View File

@ -246,6 +246,10 @@ EOT
function ($val) { return true; }, function ($val) { return true; },
function ($val) { return $val !== 'false' && (bool) $val; } function ($val) { return $val !== 'false' && (bool) $val; }
), ),
'use-include-path' => array(
function ($val) { return true; },
function ($val) { return $val !== 'false' && (bool) $val; }
),
); );
$multiConfigValues = array( $multiConfigValues = array(
'github-protocols' => array( 'github-protocols' => array(

View File

@ -31,6 +31,7 @@ class Config
'cache-files-dir' => '{$cache-dir}/files', 'cache-files-dir' => '{$cache-dir}/files',
'cache-repo-dir' => '{$cache-dir}/repo', 'cache-repo-dir' => '{$cache-dir}/repo',
'cache-vcs-dir' => '{$cache-dir}/vcs', 'cache-vcs-dir' => '{$cache-dir}/vcs',
'use-include-path' => false,
); );
public static $defaultRepositories = array( public static $defaultRepositories = array(

View File

@ -40,13 +40,26 @@ class AutoloadGeneratorTest extends TestCase
$this->ensureDirectoryExistsAndClear($this->vendorDir); $this->ensureDirectoryExistsAndClear($this->vendorDir);
$this->config = $this->getMock('Composer\Config'); $this->config = $this->getMock('Composer\Config');
$this->config->expects($this->any())
$this->config->expects($this->at(0))
->method('get') ->method('get')
->with($this->equalTo('vendor-dir')) ->with($this->equalTo('vendor-dir'))
->will($this->returnCallback(function () use ($that) { ->will($this->returnCallback(function () use ($that) {
return $that->vendorDir; return $that->vendorDir;
})); }));
$this->config->expects($this->at(1))
->method('get')
->with($this->equalTo('vendor-dir'))
->will($this->returnCallback(function () use ($that) {
return $that->vendorDir;
}));
$this->config->expects($this->at(2))
->method('get')
->with($this->equalTo('use-include-path'))
->will($this->returnValue(false));
$this->dir = getcwd(); $this->dir = getcwd();
chdir($this->workingDir); chdir($this->workingDir);