Skip to content

Commit 8493a47

Browse files
author
Gabriel Galvao da Gama
committed
Merge branch '2.4.2-develop' of github.com:magento/magento2ce into MC-39756
2 parents 6469b0b + e6c4e28 commit 8493a47

File tree

4 files changed

+56
-77
lines changed

4 files changed

+56
-77
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ type StoreConfig @doc(description: "The type contains information about a store
2828
is_default_store_group : Boolean @doc(description: "Indicates whether the store group has been designated as the default within the website")
2929
website_id : Int @deprecated(reason: "The field should not be used on the storefront") @doc(description: "The ID number assigned to the website store")
3030
website_code : ID @doc(description: "The unique ID for the website")
31-
website_name : ID @doc(description: "The label assigned to the website")
31+
website_name : String @doc(description: "The label assigned to the website")
3232
locale : String @doc(description: "Store locale")
3333
base_currency_code : String @doc(description: "Base currency code")
3434
default_display_currency_code : String @doc(description: "Default display currency code")

composer.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@
1010
"preferred-install": "dist",
1111
"sort-packages": true
1212
},
13-
"repositories": [
14-
{
15-
"type": "vcs",
16-
"url": "https://github.com/magento-commerce/magento-composer-installer"
17-
}
18-
],
1913
"require": {
2014
"php": "~7.3.0||~7.4.0",
2115
"ext-bcmath": "*",
@@ -38,8 +32,8 @@
3832
"colinmollenhour/cache-backend-redis": "1.11.0",
3933
"colinmollenhour/credis": "1.11.1",
4034
"colinmollenhour/php-redis-session-abstract": "~1.4.0",
41-
"composer/composer": "^1.9 || ^2.0",
42-
"magento/magento-composer-installer": "dev-MC-38910",
35+
"composer/composer": "^1.9",
36+
"magento/magento-composer-installer": ">=0.1.11",
4337
"elasticsearch/elasticsearch": "~7.7.0",
4438
"guzzlehttp/guzzle": "^6.3.3",
4539
"laminas/laminas-captcha": "^2.7.1",

composer.lock

Lines changed: 52 additions & 67 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/internal/Magento/Framework/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"ext-xsl": "*",
2424
"lib-libxml": "*",
2525
"colinmollenhour/php-redis-session-abstract": "~1.4.0",
26-
"composer/composer": "^1.9 || ^2.0",
26+
"composer/composer": "^1.9",
2727
"guzzlehttp/guzzle": "^6.3.3",
2828
"laminas/laminas-code": "~3.4.1",
2929
"laminas/laminas-crypt": "^2.6.0",

0 commit comments

Comments
 (0)