From 47bc2fa51a976423818e073500166784028d2826 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Thu, 6 Jul 2017 09:51:25 +0200 Subject: [PATCH] Fix exclude-from-classmap being ignored when generating on-the-fly class loader, fixes #6503 --- src/Composer/Autoload/AutoloadGenerator.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php index 1953e593a..d6924f4e9 100644 --- a/src/Composer/Autoload/AutoloadGenerator.php +++ b/src/Composer/Autoload/AutoloadGenerator.php @@ -433,9 +433,14 @@ EOF; } if (isset($autoloads['classmap'])) { + $blacklist = null; + if (!empty($autoloads['exclude-from-classmap'])) { + $blacklist = '{(' . implode('|', $autoloads['exclude-from-classmap']) . ')}'; + } + foreach ($autoloads['classmap'] as $dir) { try { - $loader->addClassMap($this->generateClassMap($dir, null, null, false)); + $loader->addClassMap($this->generateClassMap($dir, $blacklist, null, false)); } catch (\RuntimeException $e) { $this->io->writeError(''.$e->getMessage().''); }