Merge remote-tracking branch 'origin/MC-41784' into 2.4-develop-pr144

Author: zakdma

lib/internal/Magento/Framework/Composer/ComposerInformation.php

@@ -261,7 +261,7 @@ public function getSystemPackages()
      */
     public function isSystemPackage($packageName = '')
     {
-        if (preg_match('/magento\/product-*/', $packageName) == 1) {
+        if (preg_match('/magento\/product-.*?-edition/', $packageName) == 1) {
             return true;
         }
         return false;

lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php

@@ -57,8 +57,8 @@ protected function setUp(): void
         $this->packageMock = $this->getMockForAbstractClass(CompletePackageInterface::class);
         $this->lockerMock->method('getLockedRepository')->willReturn($this->lockerRepositoryMock);
         $this->packageMock->method('getType')->willReturn('metapackage');
-        $this->packageMock->method('getPrettyName')->willReturn('magento/product-test-package-name');
-        $this->packageMock->method('getName')->willReturn('magento/product-test-package-name');
+        $this->packageMock->method('getPrettyName')->willReturn('magento/product-test-package-name-edition');
+        $this->packageMock->method('getName')->willReturn('magento/product-test-package-name-edition');
         $this->packageMock->method('getPrettyVersion')->willReturn('123.456.789');
         $this->lockerRepositoryMock->method('getPackages')->willReturn([$this->packageMock]);
 
@@ -75,8 +75,8 @@ protected function setUp(): void
     public function testGetSystemPackages()
     {
         $expected = [
-            'magento/product-test-package-name' => [
-                'name'    => 'magento/product-test-package-name',
+            'magento/product-test-package-name-edition' => [
+                'name'    => 'magento/product-test-package-name-edition',
                 'type'    => 'metapackage',
                 'version' => '123.456.789'
             ]