Merge pull request #8650 from sminnee/nested-vendor

FIX: Manifest should ignore vendor folders within packages contained in vendor
This commit is contained in:
Robbie Averill 2018-12-12 19:52:03 +00:00 committed by GitHub
commit 470093de2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions

View File

@ -41,6 +41,11 @@ class ManifestFileFinder extends FileFinder
// Keep searching inside vendor
$inVendor = $this->isInsideVendor($basename, $pathname, $depth);
if ($inVendor) {
// Skip nested vendor folders (e.g. vendor/silverstripe/framework/vendor)
if ($depth == 4 && basename($pathname) === self::VENDOR_DIR) {
return false;
}
// Keep searching if we could have a subdir module
if ($depth < 3) {
return true;