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

Merge pull request #883 from sylvainfilteau/feature-prepend-include-path 

Change the order of the include paths
pull/893/head
Jordi Boggiano 2012-07-10 02:35:43 -07:00
parent 3eaa05edb9 51404659ef
commit cc063cce94
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -300,7 +300,7 @@ HEADER;
if ($useIncludePath) { if ($useIncludePath) {
$file .= <<<'INCLUDE_PATH' $file .= <<<'INCLUDE_PATH'
$includePaths = require $composerDir . '/include_paths.php'; $includePaths = require $composerDir . '/include_paths.php';
array_unshift($includePaths, get_include_path()); array_push($includePaths, get_include_path());
set_include_path(join(PATH_SEPARATOR, $includePaths)); set_include_path(join(PATH_SEPARATOR, $includePaths));

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

@ -338,7 +338,7 @@ class AutoloadGeneratorTest extends TestCase
); );
} }
public function testIncludePathsAreAppendedInAutoloadFile() public function testIncludePathsArePrependedInAutoloadFile()
{ {
$package = new MemoryPackage('a', '1.0', '1.0'); $package = new MemoryPackage('a', '1.0', '1.0');
$packages = array(); $packages = array();
@ -361,7 +361,7 @@ class AutoloadGeneratorTest extends TestCase
require($this->vendorDir."/autoload.php"); require($this->vendorDir."/autoload.php");
$this->assertEquals( $this->assertEquals(
$oldIncludePath.PATH_SEPARATOR.$this->vendorDir."/a/a/lib", $this->vendorDir."/a/a/lib".PATH_SEPARATOR.$oldIncludePath,
get_include_path() get_include_path()
); );