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

Merge branch '1.4'

pull/6545/head
Jordi Boggiano 2017-07-06 09:56:17 +02:00
parent 020805dd6f 81f65b7a2a
commit 17b7387c37
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -433,9 +433,14 @@ EOF;
} }
if (isset($autoloads['classmap'])) { if (isset($autoloads['classmap'])) {
$blacklist = null;
if (!empty($autoloads['exclude-from-classmap'])) {
$blacklist = '{(' . implode('|', $autoloads['exclude-from-classmap']) . ')}';
}
foreach ($autoloads['classmap'] as $dir) { foreach ($autoloads['classmap'] as $dir) {
try { try {
$loader->addClassMap($this->generateClassMap($dir, null, null, false)); $loader->addClassMap($this->generateClassMap($dir, $blacklist, null, false));
} catch (\RuntimeException $e) { } catch (\RuntimeException $e) {
$this->io->writeError('<warning>'.$e->getMessage().'</warning>'); $this->io->writeError('<warning>'.$e->getMessage().'</warning>');
} }

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

@ -75,7 +75,7 @@ class ClassMapGenerator
$map = array(); $map = array();
$filesystem = new Filesystem(); $filesystem = new Filesystem();
$cwd = getcwd(); $cwd = realpath(getcwd());
foreach ($path as $file) { foreach ($path as $file) {
$filePath = $file->getPathname(); $filePath = $file->getPathname();