Merge pull request #196 from rhoerr/claude/generalize-product-metadata-YIO0T

mage-os-ci · web-flow · commit 62ae6fe65719 · 2026-02-17T23:03:04.000-05:00
Generalize product metapackage detection for alternate  metapackages
diff --git a/app/etc/di.xml b/app/etc/di.xml
@@ -1880,6 +1880,10 @@
                 <item name="MySQL-5.7" xsi:type="string">^5\.7\.</item>
                 <item name="MariaDB-(10.2-10.6)" xsi:type="string">^10\.[2-6]\.</item>
                 <item name="MariaDB-11.4" xsi:type="string">^11\.4\.</item>
+                <!-- Mage-OS wider compatibility rules to match reessolutions/db-override -->
+                <item name="MySQL-(8.0-8.4)" xsi:type="string">^8\.[0-4]\.</item>
+                <item name="MariaDB-(10.2-10.11)" xsi:type="string">^10\.([2-9]|10|11)\.</item>
+                <item name="MariaDB-11.x" xsi:type="string">^11\.</item>
             </argument>
         </arguments>
     </type>
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ProductMetadataTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ProductMetadataTest.php
@@ -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'
             ]
diff --git a/lib/internal/Magento/Framework/Composer/ComposerInformation.php b/lib/internal/Magento/Framework/Composer/ComposerInformation.php
@@ -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;
                     }
                 }
             }
@@ -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;
diff --git a/lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php b/lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php
@@ -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],
+        ];
+    }
 }
diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
@@ -217,7 +217,10 @@ protected function _loadScopedData()
             }
             $this->_scopePriorityScheme[] = $scope;
 
-            $cacheId = implode('|', $this->_scopePriorityScheme) . "|" . $this->_cacheId;
+            // Normalize cache ID by sorting scopes - ensures consistent ID regardless of processing order
+            $sortedScheme = array_values($this->_scopePriorityScheme);
+            sort($sortedScheme);
+            $cacheId = implode('|', $sortedScheme) . "|" . $this->_cacheId;
             $configData = $this->configLoader->load($cacheId);
 
             if ($configData) {
diff --git a/lib/internal/Magento/Framework/Interception/PluginListGenerator.php b/lib/internal/Magento/Framework/Interception/PluginListGenerator.php
@@ -150,10 +150,17 @@ public function write(array $scopes): void
         foreach ($scopes as $scope) {
             $this->scopeConfig->setCurrentScope($scope);
             if (false === isset($this->loadedScopes[$scope])) {
-                if (false === in_array($scope, $this->scopePriorityScheme, true)) {
-                    $this->scopePriorityScheme[] = $scope;
+                // Match PluginList::_loadScopedData() behavior - move scope to end
+                // This ensures cache IDs match between compile-time and runtime
+                $index = array_search($scope, $this->scopePriorityScheme, true);
+                if ($index !== false) {
+                    unset($this->scopePriorityScheme[$index]);
                 }
-                $cacheId = implode('|', $this->scopePriorityScheme) . "|" . $this->cacheId;
+                $this->scopePriorityScheme[] = $scope;
+                // Normalize cache ID by sorting scopes - ensures consistent ID regardless of processing order
+                $sortedScheme = array_values($this->scopePriorityScheme);
+                sort($sortedScheme);
+                $cacheId = implode('|', $sortedScheme) . "|" . $this->cacheId;
                 [
                     $virtualTypes,
                     $this->scopePriorityScheme,
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php
@@ -44,12 +44,8 @@ public function __construct(
     public function doOperation()
     {
         $scopes = $this->scopeConfig->getAllScopes();
-        // remove primary scope for production mode as it is only called in developer mode
-        $scopes = array_diff($scopes, ['primary']);
-
-        // sort configuration to have it in the same order on every build
-        ksort($scopes);
-
+        // Cache IDs are now normalized (sorted) in PluginListGenerator::write()
+        // so processing order no longer affects cache ID generation
         $this->configWriter->write($scopes);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -116,11 +116,12 @@ public function getRequiredPhpVersion()`
`116`	`116`	`foreach ($packages as $package) {`
`117`	`117`	`if ($package instanceof CompletePackageInterface) {`
`118`	`118`	`$packageName = $package->getPrettyName();`
`119`		`- if ($packageName === 'mage-os/product-community-edition') {`
	`119`	`+ if ($this->isSystemPackage($packageName)) {`
`120`	`120`	`$phpRequirementLink = $package->getRequires()['php'];`
`121`	`121`	`if ($phpRequirementLink instanceof Link) {`
`122`	`122`	`$requiredPhpVersion = $phpRequirementLink->getPrettyConstraint();`
`123`	`123`	`}`
	`124`	`+ break;`
`124`	`125`	`}`
`125`	`126`	`}`
`126`	`127`	`}`
`@@ -262,7 +263,7 @@ public function getSystemPackages()`
`262`	`263`	`*/`
`263`	`264`	`public function isSystemPackage($packageName = '')`
`264`	`265`	`{`
`265`		`- if (preg_match('/mage-os\/product-.*?-edition/', $packageName) == 1) {`
	`266`	`+ if (preg_match('/^mage-os\/product-.+/', $packageName) == 1) {`
`266`	`267`	`return true;`
`267`	`268`	`}`
`268`	`269`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,8 @@ public function __construct(`
`44`	`44`	`public function doOperation()`
`45`	`45`	`{`
`46`	`46`	`$scopes = $this->scopeConfig->getAllScopes();`
`47`		`- // remove primary scope for production mode as it is only called in developer mode`
`48`		`- $scopes = array_diff($scopes, ['primary']);`
`49`		`-`
`50`		`- // sort configuration to have it in the same order on every build`
`51`		`- ksort($scopes);`
`52`		`-`
	`47`	`+ // Cache IDs are now normalized (sorted) in PluginListGenerator::write()`
	`48`	`+ // so processing order no longer affects cache ID generation`
`53`	`49`	`$this->configWriter->write($scopes);`
`54`	`50`	`}`
`55`	`51`