diff --git a/app/code/Magento/StoreGraphQl/etc/schema.graphqls b/app/code/Magento/StoreGraphQl/etc/schema.graphqls index ab30e8331a947..9efdb5a210403 100644 --- a/app/code/Magento/StoreGraphQl/etc/schema.graphqls +++ b/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") diff --git a/composer.json b/composer.json index 5ab261280769e..7a5e65c521e20 100644 --- a/composer.json +++ b/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", diff --git a/composer.lock b/composer.lock index 94ec3535e3180..780871db1f59f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c0426c3e069020674952e9aca78ab98b", + "content-hash": "fa3e1239b260ac9d83e0893dfde0c7e3", "packages": [ { "name": "aws/aws-sdk-php", - "version": "3.166.2", + "version": "3.169.0", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "fe0ec9235d07b0f51ec4396dce0dd639020ae1a7" + "reference": "d15a231355e4435fc33bab83df075ec31edd0a9b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/fe0ec9235d07b0f51ec4396dce0dd639020ae1a7", - "reference": "fe0ec9235d07b0f51ec4396dce0dd639020ae1a7", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d15a231355e4435fc33bab83df075ec31edd0a9b", + "reference": "d15a231355e4435fc33bab83df075ec31edd0a9b", "shasum": "" }, "require": { @@ -89,7 +89,7 @@ "s3", "sdk" ], - "time": "2020-12-04T19:12:30+00:00" + "time": "2020-12-14T19:12:33+00:00" }, { "name": "colinmollenhour/cache-backend-file", @@ -3725,33 +3725,27 @@ }, { "name": "magento/magento-composer-installer", - "version": "dev-MC-38910", + "version": "0.1.13", "source": { "type": "git", - "url": "git@github.com:magento-commerce/magento-composer-installer.git", - "reference": "bc3423f0aa9d090f1c3cc55c3f7030375e28220b" + "url": "https://github.com/magento/magento-composer-installer.git", + "reference": "8b6c32f53b4944a5d6656e86344cd0f9784709a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento-commerce/magento-composer-installer/zipball/bc3423f0aa9d090f1c3cc55c3f7030375e28220b", - "reference": "bc3423f0aa9d090f1c3cc55c3f7030375e28220b", + "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/8b6c32f53b4944a5d6656e86344cd0f9784709a1", + "reference": "8b6c32f53b4944a5d6656e86344cd0f9784709a1", "shasum": "" }, - "archive": { - "exclude": [ - "vendor", - "/tests/FullStackTest/" - ] - }, "require": { - "composer-plugin-api": "^1.0|^2.0" + "composer-plugin-api": "^1.0" }, "replace": { "magento-hackathon/magento-composer-installer": "*" }, "require-dev": { - "composer/composer": "^1.0|^2.0", - "firegento/phpcs": "^1.0.1", + "composer/composer": "*@dev", + "firegento/phpcs": "dev-patch-1", "mikey179/vfsstream": "*", "phpunit/phpunit": "*", "phpunit/phpunit-mock-objects": "dev-master", @@ -3770,10 +3764,15 @@ "MagentoHackathon\\Composer\\Magento": "src/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "OSL-3.0" ], "authors": [ + { + "name": "Vinai Kopp", + "email": "vinai@netzarbeiter.com" + }, { "name": "Daniel Fahlke aka Flyingmana", "email": "flyingmana@googlemail.com" @@ -3793,10 +3792,6 @@ { "name": "David Fuhr", "email": "fuhr@flagbit.de" - }, - { - "name": "Vinai Kopp", - "email": "vinai@netzarbeiter.com" } ], "description": "Composer installer for Magento modules", @@ -3805,11 +3800,7 @@ "composer-installer", "magento" ], - "support": { - "source": "https://github.com/magento-commerce/magento-composer-installer/tree/MC-38910", - "issues": "https://github.com/magento-commerce/magento-composer-installer/issues" - }, - "time": "2020-12-01T16:59:52+00:00" + "time": "2017-12-29T16:45:24+00:00" }, { "name": "magento/zendframework1", @@ -3860,16 +3851,16 @@ }, { "name": "monolog/monolog", - "version": "1.25.5", + "version": "1.26.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "1817faadd1846cd08be9a49e905dc68823bc38c0" + "reference": "2209ddd84e7ef1256b7af205d0717fb62cfc9c33" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1817faadd1846cd08be9a49e905dc68823bc38c0", - "reference": "1817faadd1846cd08be9a49e905dc68823bc38c0", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/2209ddd84e7ef1256b7af205d0717fb62cfc9c33", + "reference": "2209ddd84e7ef1256b7af205d0717fb62cfc9c33", "shasum": "" }, "require": { @@ -3885,7 +3876,7 @@ "graylog2/gelf-php": "~1.0", "php-amqplib/php-amqplib": "~2.4", "php-console/php-console": "^3.1.3", - "php-parallel-lint/php-parallel-lint": "^1.0", + "phpstan/phpstan": "^0.12.59", "phpunit/phpunit": "~4.5", "ruflin/elastica": ">=0.90 <3.0", "sentry/sentry": "^0.13", @@ -3905,11 +3896,6 @@ "sentry/sentry": "Allow sending log messages to a Sentry server" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, "autoload": { "psr-4": { "Monolog\\": "src/Monolog" @@ -3943,7 +3929,7 @@ "type": "tidelift" } ], - "time": "2020-07-23T08:35:51+00:00" + "time": "2020-12-14T12:56:38+00:00" }, { "name": "mtdowling/jmespath.php", @@ -7131,22 +7117,22 @@ }, { "name": "dealerdirect/phpcodesniffer-composer-installer", - "version": "v0.7.0", + "version": "v0.7.1", "source": { "type": "git", "url": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer.git", - "reference": "e8d808670b8f882188368faaf1144448c169c0b7" + "reference": "fe390591e0241955f22eb9ba327d137e501c771c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/e8d808670b8f882188368faaf1144448c169c0b7", - "reference": "e8d808670b8f882188368faaf1144448c169c0b7", + "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/fe390591e0241955f22eb9ba327d137e501c771c", + "reference": "fe390591e0241955f22eb9ba327d137e501c771c", "shasum": "" }, "require": { "composer-plugin-api": "^1.0 || ^2.0", "php": ">=5.3", - "squizlabs/php_codesniffer": "^2 || ^3 || 4.0.x-dev" + "squizlabs/php_codesniffer": "^2.0 || ^3.0 || ^4.0" }, "require-dev": { "composer/composer": "*", @@ -7193,7 +7179,7 @@ "stylecheck", "tests" ], - "time": "2020-06-25T14:57:39+00:00" + "time": "2020-12-07T18:04:37+00:00" }, { "name": "doctrine/annotations", @@ -7572,16 +7558,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.16.7", + "version": "v2.16.9", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "4e35806a6d7d8510d6842ae932e8832363d22c87" + "reference": "3d0f843b8abe1b966156774bf4093ebbb77f92cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/4e35806a6d7d8510d6842ae932e8832363d22c87", - "reference": "4e35806a6d7d8510d6842ae932e8832363d22c87", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/3d0f843b8abe1b966156774bf4093ebbb77f92cc", + "reference": "3d0f843b8abe1b966156774bf4093ebbb77f92cc", "shasum": "" }, "require": { @@ -7590,7 +7576,7 @@ "doctrine/annotations": "^1.2", "ext-json": "*", "ext-tokenizer": "*", - "php": "^7.1", + "php": "^5.6 || ^7.0", "php-cs-fixer/diff": "^1.3", "symfony/console": "^3.4.43 || ^4.1.6 || ^5.0", "symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0", @@ -7612,6 +7598,7 @@ "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.1", + "phpunitgoodpractices/polyfill": "^1.5", "phpunitgoodpractices/traits": "^1.9.1", "symfony/phpunit-bridge": "^5.1", "symfony/yaml": "^3.0 || ^4.0 || ^5.0" @@ -7665,7 +7652,7 @@ "type": "github" } ], - "time": "2020-10-27T22:44:27+00:00" + "time": "2020-12-08T13:16:25+00:00" }, { "name": "hoa/consistency", @@ -8498,16 +8485,16 @@ }, { "name": "magento/magento2-functional-testing-framework", - "version": "3.2.0", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/magento/magento2-functional-testing-framework.git", - "reference": "0ec0c87335af996cbf3c0aace375d4e659e7a6dc" + "reference": "2503527cf3ee20e199489d7dcd0e3b242e62d426" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/0ec0c87335af996cbf3c0aace375d4e659e7a6dc", - "reference": "0ec0c87335af996cbf3c0aace375d4e659e7a6dc", + "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/2503527cf3ee20e199489d7dcd0e3b242e62d426", + "reference": "2503527cf3ee20e199489d7dcd0e3b242e62d426", "shasum": "" }, "require": { @@ -8585,7 +8572,7 @@ "magento", "testing" ], - "time": "2020-11-05T15:57:52+00:00" + "time": "2020-12-14T18:10:31+00:00" }, { "name": "mikey179/vfsstream", @@ -8735,24 +8722,24 @@ }, { "name": "paragonie/constant_time_encoding", - "version": "v2.3.0", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/paragonie/constant_time_encoding.git", - "reference": "47a1cedd2e4d52688eb8c96469c05ebc8fd28fa2" + "reference": "f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/47a1cedd2e4d52688eb8c96469c05ebc8fd28fa2", - "reference": "47a1cedd2e4d52688eb8c96469c05ebc8fd28fa2", + "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c", + "reference": "f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c", "shasum": "" }, "require": { "php": "^7|^8" }, "require-dev": { - "phpunit/phpunit": "^6|^7", - "vimeo/psalm": "^1|^2|^3" + "phpunit/phpunit": "^6|^7|^8|^9", + "vimeo/psalm": "^1|^2|^3|^4" }, "type": "library", "autoload": { @@ -8793,7 +8780,7 @@ "hex2bin", "rfc4648" ], - "time": "2019-11-06T19:20:29+00:00" + "time": "2020-12-06T15:14:20+00:00" }, { "name": "pdepend/pdepend", @@ -12041,9 +12028,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "magento/magento-composer-installer": 20 - }, + "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, "platform": { diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index 800d44e1f4e52..dfc81189bf544 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/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",