Skip to content

Make drupal-finder use the same priority order that composer/installers does when reading installer-paths #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
greg-1-anderson wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make drupal-finder use the same priority order that composer/installers does when reading installer-paths #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e50a9e
Failing test: duplicate installer paths
greg-1-anderson Feb 11, 2022
c67641c
Use first instance of "drupal-core" found in installer-paths.
greg-1-anderson Feb 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/DrupalFinder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ protected function findAndValidateRoots($path)
}
$this->drupalRoot = rtrim($path . '/' . $install_path, '/');
$this->vendorDir = $this->composerRoot . '/vendor';
break;
}
}
}
Expand Down
48 changes: 48 additions & 0 deletions tests/Drupal8FinderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,33 @@ protected function getDrupalComposerStructure()
return $fileStructure;
}

protected function getDrupalComposerStructureWithDuplicateInstallerPaths()
{
$fileStructure = [
'web' => static::$fileStructure,
'composer.json' => [
'require' => [
'drupal/core' => '*',
],
'extra' => [
'installer-paths' => [
'web/core' => [
'type:drupal-core',
],
'core' => [
'type:drupal-core',
],
],
],
],
'vendor' => [],
];
unset($fileStructure['web']['composer.json']);
unset($fileStructure['web']['vendor']);

return $fileStructure;
}

public function testDrupalDefaultStructure()
{
$finder = new DrupalFinder();
Expand Down Expand Up @@ -271,6 +298,27 @@ public function testDrupalComposerStructureWithRealFilesystem()
$this->assertSame($root . '/vendor', $finder->getVendorDir());
}

public function testDrupalComposerStructureWithDuplicateInstallerPaths()
{
$finder = new DrupalFinder();
$root = $this->tempdir(sys_get_temp_dir());
$this->dumpToFileSystem($this->getDrupalComposerStructureWithDuplicateInstallerPaths(), $root);

$this->assertTrue($finder->locateRoot($root));
$this->assertSame($root . '/web', $finder->getDrupalRoot());
$this->assertSame($root, $finder->getComposerRoot());
$this->assertSame($root . '/vendor', $finder->getVendorDir());

// Test symlink implementation
$symlink = $this->tempdir(sys_get_temp_dir());
$this->symlink($root, $symlink . '/foo');

$this->assertTrue($finder->locateRoot($symlink . '/foo'));
$this->assertSame($root . '/web', $finder->getDrupalRoot());
$this->assertSame($root, $finder->getComposerRoot());
$this->assertSame($root . '/vendor', $finder->getVendorDir());
}

public function testDrupalWithLinkedModule()
{
$finder = new DrupalFinder();
Expand Down