1
0
Fork 0

Fix exclude-from-classmap handling to avoid foo matching foo* directories, fixes #8563, refs #8575

pull/8597/head
Jordi Boggiano 2020-02-12 10:23:03 +01:00
parent c7ba751319
commit 4d74f5ba95
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 3 additions and 3 deletions

View File

@ -901,7 +901,7 @@ INITIALIZER;
} }
$resolvedPath = realpath($installPath . '/' . $updir); $resolvedPath = realpath($installPath . '/' . $updir);
$autoloads[] = preg_quote(strtr($resolvedPath, '\\', '/')) . '/' . $path; $autoloads[] = preg_quote(strtr($resolvedPath, '\\', '/')) . '/' . $path . '($|/)';
continue; continue;
} }

View File

@ -1525,8 +1525,8 @@ EOF;
'/composersrc/ClassToExclude.php', '/composersrc/ClassToExclude.php',
'/composersrc/*/excluded/excsubpath', '/composersrc/*/excluded/excsubpath',
'**/excsubpath', '**/excsubpath',
'composers', // should _not_ cause exclusion of /composersrc/** 'composers', // should _not_ cause exclusion of /composersrc/**, as it is equivalent to /composers/**
'/src-ca/', // should _not_ cause exclusion of /src-cake/** '/src-ca/', // should _not_ cause exclusion of /src-cake/**, as it is equivalent to /src-ca/**
), ),
)); ));