Skip to content

Add alternative configurations, add throwing exceptions to Config class #64

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

Merged
merged 11 commits into from
May 29, 2021
Merged

Add alternative configurations, add throwing exceptions to Config class #64

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c99b23b
Add alternative builds to ComposerConfigProcess
devanych May 18, 2021
c0ea3e2
Add alternative builds and throwing exceptions to Config
devanych May 19, 2021
864f7b8
Fix and add test cases
devanych May 19, 2021
f28e7ac
Return actual sorting to builder tests
devanych May 19, 2021
813bfb1
Fix the merge of alternative parameters
devanych May 29, 2021
b1dd572
Fix mocks for ComposerEventHandlerTest
devanych May 29, 2021
d03c685
Rename of alternatives functionality to environments
devanych May 29, 2021
10ad453
Move environment definition to constructor
devanych May 29, 2021
0975d5a
Add ROOT_PACKAGE_NAME constant to Options
devanych May 29, 2021
a66f31e
Change check methods in Config class
devanych May 29, 2021
f88d677
Fix docBlock to Config class
devanych May 29, 2021
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
37 changes: 31 additions & 6 deletions src/ComposerConfigProcess.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use function glob;
use function in_array;
use function is_file;
use function ksort;
use function realpath;
use function str_replace;
use function substr;
Expand All @@ -33,7 +34,7 @@ final class ComposerConfigProcess
private array $configFiles = [];

/**
* @psalm-var array<string, array<string, string|list<string>>>
* @psalm-var array<string, array<string, array<string, list<string>>>>
*/
private array $mergePlan = [];

Expand All @@ -59,6 +60,7 @@ public function __construct(Composer $composer, array $packagesForCheck, ?bool $

$this->process($rootOptions, $packagesForCheck, $forceCheck);
$this->appendRootPackageConfigToMergePlan($rootPackage, $rootOptions);
$this->appendEnvironmentsToMergePlan($rootPackage);
}

/**
Expand All @@ -74,7 +76,7 @@ public function configFiles(): array
/**
* Returns data for changing the merge plan.
*
* @return array Data for changing the merge plan.
* @return array<string, array<string, array<string, list<string>>>> Data for changing the merge plan.
*/
public function mergePlan(): array
{
Expand Down Expand Up @@ -119,7 +121,7 @@ private function process(Options $rootOptions, array $packagesForCheck, bool $fo

// Do not copy variables.
if (Options::isVariable($file)) {
$this->mergePlan[$group][$package->getPrettyName()][] = $file;
$this->mergePlan[Options::DEFAULT_ENVIRONMENT][$group][$package->getPrettyName()][] = $file;
continue;
}

Expand All @@ -140,7 +142,7 @@ private function process(Options $rootOptions, array $packagesForCheck, bool $fo
}
}

$this->mergePlan[$group][$package->getPrettyName()][] = $file;
$this->mergePlan[Options::DEFAULT_ENVIRONMENT][$group][$package->getPrettyName()][] = $file;
continue;
}

Expand All @@ -158,7 +160,7 @@ private function process(Options $rootOptions, array $packagesForCheck, bool $fo
);
}

$this->mergePlan[$group][$package->getPrettyName()][] = $file;
$this->mergePlan[Options::DEFAULT_ENVIRONMENT][$group][$package->getPrettyName()][] = $file;
}
}
}
Expand Down Expand Up @@ -186,8 +188,31 @@ private function appendRootPackageConfigToMergePlan(RootPackageInterface $packag
return $result . $file;
}, (array) $files);

$packageGroups = $this->mergePlan[Options::DEFAULT_ENVIRONMENT][$group] ?? [];
/** @psalm-suppress PropertyTypeCoercion */
$this->mergePlan[$group] = ['/' => $files] + ($this->mergePlan[$group] ?? []);
$this->mergePlan[Options::DEFAULT_ENVIRONMENT][$group] = [Options::DEFAULT_ENVIRONMENT => $files] + $packageGroups;
ksort($this->mergePlan[Options::DEFAULT_ENVIRONMENT]);
}
}

private function appendEnvironmentsToMergePlan(RootPackageInterface $package): void
{
/** @psalm-var array<string, string|array<string, string|list<string>>> $environments */
$environments = (array) ($package->getExtra()['config-plugin-environments'] ?? []);

foreach ($environments as $environment => $groups) {
if ($environment === Options::DEFAULT_ENVIRONMENT) {
continue;
}

foreach ((array) $groups as $group => $files) {
/** @psalm-suppress InvalidPropertyAssignmentValue */
$this->mergePlan[$environment][$group][Options::DEFAULT_ENVIRONMENT] = (array) $files;
}

if (isset($this->mergePlan[$environment])) {
ksort($this->mergePlan[$environment]);
}
}
}

Expand Down
Loading