Skip to content

Don't include composer files already required by root package #251

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Don't include composer files already required by root package #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions src/ExtraPackage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,16 @@ public function getMergedRequirements()
return array_keys($this->mergedRequirements);
}

/**
* Get the name of this package
*
* @return string
*/
public function getName()
{
return $this->json['name'];
}

/**
* Read the contents of a composer.json style file into an array.
*
Expand Down
7 changes: 7 additions & 0 deletions src/MergePlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,13 @@ protected function mergeFile(RootPackageInterface $root, $path)

$package = new ExtraPackage($path, $this->composer, $this->logger);

if (isset($root->getRequires()[$package->getName()])) {
$this->logger->info(
"Ignoring composer json already required by root: <comment>{$package->getName()}</comment>"
);
return;
}

if (isset($this->loadedNoDev[$path])) {
$this->logger->info(
"Loading -dev sections of <comment>{$path}</comment>..."
Expand Down