Skip to content

Generalize product metapackage detection for alternate builds #4

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
rhoerr wants to merge 1 commit into
base: main
Choose a base branch
from
+46 −11
Open

Generalize product metapackage detection for alternate builds #4

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
25 changes: 16 additions & 9 deletions lib/internal/Magento/Framework/App/Test/Unit/ProductMetadataTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,20 +77,27 @@ public function testGetVersionCached()
public static function testGetVersionGitInstallationDataProvider()
{
return [
[
'community edition package' => [
[
0 => [
'name' => 'magento/product-community-edition',
'version' => '123.456.789'
],
1 => [
'name' => 'magento/product-other-edition',
'version' => '987.654.321'
'mage-os/product-community-edition' => [
'name' => 'mage-os/product-community-edition',
'version' => '1.0.0',
'magento_version' => '123.456.789'
],
],
'123.456.789'
],
[
'minimal product package' => [
[
'mage-os/product-minimal' => [
'name' => 'mage-os/product-minimal',
'version' => '2.0.0',
'magento_version' => '234.567.890'
],
],
'234.567.890'
],
'empty packages' => [
[],
'UNKNOWN'
]
Expand Down
5 changes: 3 additions & 2 deletions lib/internal/Magento/Framework/Composer/ComposerInformation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,12 @@ public function getRequiredPhpVersion()
foreach ($packages as $package) {
if ($package instanceof CompletePackageInterface) {
$packageName = $package->getPrettyName();
if ($packageName === 'mage-os/product-community-edition') {
if ($this->isSystemPackage($packageName)) {
$phpRequirementLink = $package->getRequires()['php'];
if ($phpRequirementLink instanceof Link) {
$requiredPhpVersion = $phpRequirementLink->getPrettyConstraint();
}
break;
}
}
}
Expand Down Expand Up @@ -262,7 +263,7 @@ public function getSystemPackages()
*/
public function isSystemPackage($packageName = '')
{
if (preg_match('/mage-os\/product-.*?-edition/', $packageName) == 1) {
if (preg_match('/^mage-os\/product-.+/', $packageName) == 1) {
return true;
}
return false;
Expand Down
27 changes: 27 additions & 0 deletions lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,31 @@ public static function isMagentoRootDataProvider()
['namespace/package', false],
];
}

/**
* @param string $packageName
* @param boolean $expected
* @dataProvider isSystemPackageDataProvider
*/
public function testIsSystemPackage($packageName, $expected)
{
$this->assertEquals($expected, $this->composerInformation->isSystemPackage($packageName));
}

/**
* @return array
*/
public static function isSystemPackageDataProvider()
{
return [
['mage-os/product-community-edition', true],
['mage-os/product-enterprise-edition', true],
['mage-os/product-minimal', true],
['mage-os/product-custom-build', true],
['magento/product-community-edition', false],
['mage-os/module-something', false],
['namespace/package', false],
['mage-os/product-', false],
];
}
}
Loading