1
0
Fork 0

Packages can define include paths.

pull/527/head
Christoph Hochstrasser 2012-04-04 09:46:31 +02:00
parent 1cdae66f8f
commit f369104bb1
6 changed files with 69 additions and 0 deletions

View File

@ -146,6 +146,13 @@
"type": "string" "type": "string"
} }
}, },
"include-paths": {
"type": ["array"],
"description": "A list of directories which should get added to PHP's include path.",
"items": {
"type": "string"
}
},
"scripts": { "scripts": {
"type": ["object"], "type": ["object"],
"description": "Scripts listeners that will be executed before/after some events.", "description": "Scripts listeners that will be executed before/after some events.",

View File

@ -35,6 +35,11 @@ if (!class_exists('Composer\\Autoload\\ClassLoader', false)) {
require __DIR__.'/ClassLoader.php'; require __DIR__.'/ClassLoader.php';
} }
$includePaths = require __DIR__.'/include_paths.php';
array_unshift($includePaths, get_include_path());
set_include_path(join(PATH_SEPARATOR, $includePaths));
return call_user_func(function() { return call_user_func(function() {
$loader = new \Composer\Autoload\ClassLoader(); $loader = new \Composer\Autoload\ClassLoader();
@ -134,6 +139,7 @@ EOF;
file_put_contents($targetDir.'/autoload.php', $autoloadFile); file_put_contents($targetDir.'/autoload.php', $autoloadFile);
file_put_contents($targetDir.'/autoload_namespaces.php', $namespacesFile); file_put_contents($targetDir.'/autoload_namespaces.php', $namespacesFile);
file_put_contents($targetDir.'/autoload_classmap.php', $classmapFile); file_put_contents($targetDir.'/autoload_classmap.php', $classmapFile);
file_put_contents($targetDir.'/include_paths.php', $this->getIncludePathsFile($packageMap));
copy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php'); copy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
} }
@ -205,4 +211,25 @@ EOF;
return $loader; return $loader;
} }
protected function getIncludePathsFile(array $packageMap)
{
$includePaths = array();
foreach ($packageMap as $item) {
list($package, $installPath) = $item;
if (null !== $package->getTargetDir()) {
$installPath = substr($installPath, 0, -strlen('/'.$package->getTargetDir()));
}
foreach ($package->getIncludePaths() as $includePath) {
$includePaths[] = empty($installPath) ? $includePath : $installPath.'/'.$includePath;
}
}
return sprintf(
"<?php\nreturn %s;\n", var_export($includePaths, true)
);
}
} }

View File

@ -238,6 +238,10 @@ class AliasPackage extends BasePackage
{ {
return $this->aliasOf->getAutoload(); return $this->aliasOf->getAutoload();
} }
public function getIncludePaths()
{
return $this->aliasOf->getIncludePaths();
}
public function getRepositories() public function getRepositories()
{ {
return $this->aliasOf->getRepositories(); return $this->aliasOf->getRepositories();

View File

@ -169,6 +169,10 @@ class ArrayLoader
$package->setAutoload($config['autoload']); $package->setAutoload($config['autoload']);
} }
if (isset($config['include-paths'])) {
$package->setIncludePaths($config['include-paths']);
}
return $package; return $package;
} }

View File

@ -56,6 +56,7 @@ class MemoryPackage extends BasePackage
protected $recommends = array(); protected $recommends = array();
protected $suggests = array(); protected $suggests = array();
protected $autoload = array(); protected $autoload = array();
protected $includePaths = array();
/** /**
* Creates a new in memory package. * Creates a new in memory package.
@ -623,4 +624,22 @@ class MemoryPackage extends BasePackage
{ {
return $this->autoload; return $this->autoload;
} }
/**
* Sets the list of paths added to PHP's include path.
*
* @param array $includePaths List of directories.
*/
public function setIncludePaths(array $includePaths)
{
$this->includePaths = $includePaths;
}
/**
* {@inheritDoc}
*/
public function getIncludePaths()
{
return $this->includePaths;
}
} }

View File

@ -249,6 +249,14 @@ interface PackageInterface
*/ */
function getAutoload(); function getAutoload();
/**
* Returns a list of directories which should get added to PHP's
* include path.
*
* @return array
*/
function getIncludePaths();
/** /**
* Returns an array of repositories * Returns an array of repositories
* *