Merge branch '2.4.2-develop' of github.com:magento/magento2ce into MC…

…-39756

app/code/Magento/StoreGraphQl/etc/schema.graphqls

@@ -28,7 +28,7 @@ type StoreConfig @doc(description: "The type contains information about a store
     is_default_store_group : Boolean @doc(description: "Indicates whether the store group has been designated as the default within the website")
     website_id : Int @deprecated(reason: "The field should not be used on the storefront") @doc(description: "The ID number assigned to the website store")
     website_code : ID @doc(description: "The unique ID for the website")
-    website_name : ID @doc(description: "The label assigned to the website")
+    website_name : String @doc(description: "The label assigned to the website")
     locale : String @doc(description: "Store locale")
     base_currency_code : String @doc(description: "Base currency code")
     default_display_currency_code : String @doc(description: "Default display currency code")

composer.json

@@ -10,12 +10,6 @@
         "preferred-install": "dist",
         "sort-packages": true
     },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/magento-commerce/magento-composer-installer"
-        }
-    ],
     "require": {
         "php": "~7.3.0||~7.4.0",
         "ext-bcmath": "*",
@@ -38,8 +32,8 @@
         "colinmollenhour/cache-backend-redis": "1.11.0",
         "colinmollenhour/credis": "1.11.1",
         "colinmollenhour/php-redis-session-abstract": "~1.4.0",
-        "composer/composer": "^1.9 || ^2.0",
-        "magento/magento-composer-installer": "dev-MC-38910",
+        "composer/composer": "^1.9",
+        "magento/magento-composer-installer": ">=0.1.11",
         "elasticsearch/elasticsearch": "~7.7.0",
         "guzzlehttp/guzzle": "^6.3.3",
         "laminas/laminas-captcha": "^2.7.1",

lib/internal/Magento/Framework/composer.json

@@ -23,7 +23,7 @@
         "ext-xsl": "*",
         "lib-libxml": "*",
         "colinmollenhour/php-redis-session-abstract": "~1.4.0",
-        "composer/composer": "^1.9 || ^2.0",
+        "composer/composer": "^1.9",
         "guzzlehttp/guzzle": "^6.3.3",
         "laminas/laminas-code": "~3.4.1",
         "laminas/laminas-crypt": "^2.6.0",