mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge pull request #8650 from sminnee/nested-vendor
FIX: Manifest should ignore vendor folders within packages contained in vendor
This commit is contained in:
commit
470093de2f
@ -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;
|
||||
|
@ -0,0 +1 @@
|
||||
nestedvendor.txt
|
Loading…
Reference in New Issue
Block a user