Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/2.3-develop' into issue/822
Browse files Browse the repository at this point in the history
  • Loading branch information
pmclain committed Sep 21, 2019
2 parents b2a21ed + 50a085d commit 16e8358
Show file tree
Hide file tree
Showing 885 changed files with 27,295 additions and 14,181 deletions.
206 changes: 206 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,206 @@
/app/code/Magento/AdminNotification/ @paliarush
/app/code/Magento/Backend/ @paliarush
/app/code/Magento/User/ @paliarush
/lib/internal/Magento/Framework/App/ @buskamuza
/lib/internal/Magento/Framework/Controller/ @buskamuza
/lib/internal/Magento/Framework/Flag/ @buskamuza
/lib/internal/Magento/Framework/HTTP/ @buskamuza
/lib/internal/Magento/Framework/Logger/ @buskamuza
/lib/internal/Magento/Framework/Message/ @buskamuza
/lib/internal/Magento/Framework/Notification/ @buskamuza
/lib/internal/Magento/Framework/Session/ @buskamuza
/lib/internal/Magento/Framework/Url/ @buskamuza
/app/code/Magento/Cms/ @melnikovi
/app/code/Magento/CmsUrlRewrite/ @melnikovi
/app/code/Magento/Contact/ @melnikovi
/app/code/Magento/Email/ @melnikovi
/app/code/Magento/Variable/ @melnikovi
/app/code/Magento/Widget/ @melnikovi
/lib/internal/Magento/Framework/Cache/ @kokoc
/app/code/Magento/CacheInvalidate/ @kokoc
/app/code/Magento/CatalogInventory/ @tariqjawed83 @maghamed
/app/code/Magento/Bundle/ @akaplya
/app/code/Magento/BundleImportExport/ @akaplya
/app/code/Magento/Catalog/ @akaplya
/app/code/Magento/CatalogAnalytics/ @akaplya
/app/code/Magento/CatalogImportExport/ @akaplya
/app/code/Magento/CatalogSearch/ @kokoc
/app/code/Magento/CatalogUrlRewrite/ @akaplya
/app/code/Magento/ConfigurableImportExport/ @akaplya
/app/code/Magento/ConfigurableProduct/ @akaplya
/app/code/Magento/Downloadable/ @akaplya
/app/code/Magento/DownloadableImportExport/ @akaplya
/app/code/Magento/GroupedImportExport/ @akaplya
/app/code/Magento/GroupedProduct/ @akaplya
/app/code/Magento/LayeredNavigation/ @kokoc
/app/code/Magento/ProductVideo/ @akaplya
/app/code/Magento/Review/ @akaplya
/app/code/Magento/Swatches/ @akaplya
/app/code/Magento/SwatchesLayeredNavigation/ @kokoc
/app/code/Magento/Checkout/ @paliarush
/app/code/Magento/CheckoutAgreements/ @paliarush
/app/code/Magento/GiftMessage/ @paliarush
/app/code/Magento/InstantPurchase/ @paliarush
/app/code/Magento/Multishipping/ @joni-jones
/app/code/Magento/Quote/ @paliarush
/app/code/Magento/QuoteAnalytics/ @paliarush
/lib/internal/Magento/Framework/Code/ @joni-jones
/lib/internal/Magento/Framework/Reflection/ @joni-jones
/lib/internal/Magento/Framework/Component/ @buskamuza
/app/code/Magento/Version/ @buskamuza
/lib/internal/Magento/Framework/Config/ @paliarush
/app/code/Magento/Config/ @paliarush
/lib/internal/Magento/Framework/Console/ @joni-jones
/lib/internal/Magento/Framework/Process/ @joni-jones
/lib/internal/Magento/Framework/Shell/ @joni-jones
/app/code/Magento/Cookie/ @kokoc
/lib/internal/Magento/Framework/Crontab/ @tariqjawed83 @buskamuza
/app/code/Magento/Cron/ @tariqjawed83 @buskamuza
/app/code/Magento/Customer/ @paliarush
/app/code/Magento/CustomerAnalytics/ @paliarush
/app/code/Magento/CustomerImportExport/ @paliarush
/app/code/Magento/Persistent/ @paliarush
/app/code/Magento/Wishlist/ @paliarush
/lib/internal/Magento/Framework/DB/ @akaplya
/lib/internal/Magento/Framework/EntityManager/ @akaplya
/lib/internal/Magento/Framework/Indexer/ @akaplya
/lib/internal/Magento/Framework/Model/ @akaplya
/lib/internal/Magento/Framework/Mview/ @akaplya
/app/code/Magento/Eav/ @akaplya
/app/code/Magento/Indexer/ @akaplya
/lib/internal/Magento/Framework/Archive/ @joni-jones
/lib/internal/Magento/Framework/Convert/ @joni-jones
/lib/internal/Magento/Framework/Data/ @joni-jones
/lib/internal/Magento/Framework/DomDocument/ @joni-jones
/lib/internal/Magento/Framework/Json/ @joni-jones
/lib/internal/Magento/Framework/Math/ @joni-jones
/lib/internal/Magento/Framework/Parse/ @joni-jones
/lib/internal/Magento/Framework/Serialize/ @joni-jones
/lib/internal/Magento/Framework/Simplexml/ @joni-jones
/lib/internal/Magento/Framework/Stdlib/ @joni-jones
/lib/internal/Magento/Framework/Unserialize/ @joni-jones
/lib/internal/Magento/Framework/Xml/ @joni-jones
/lib/internal/Magento/Framework/XsltProcessor/ @joni-jones
/app/code/Magento/Deploy/ @kandy @buskamuza
/lib/internal/Magento/Framework/Profiler/ @kandy
/app/code/Magento/Developer/ @buskamuza
/app/code/Magento/Directory/ @buskamuza
/lib/internal/Magento/Framework/Exception/ @paliarush
/lib/internal/Magento/Framework/File/ @buskamuza
/lib/internal/Magento/Framework/Filesystem/ @buskamuza
/lib/internal/Magento/Framework/System/ @buskamuza
/lib/internal/Magento/Framework/Css/ @DrewML
/lib/internal/Magento/Framework/Option/ @DrewML
/lib/internal/Magento/Framework/RequireJs/ @DrewML
/lib/internal/Magento/Framework/View/ @melnikovi
/dev/tests/js/ @DrewML
/app/code/Magento/RequireJs/ @DrewML
/app/code/Magento/Theme/ @melnikovi
/app/code/Magento/Ui/ @melnikovi
/lib/internal/Magento/Framework/Intl/ @melnikovi
/lib/internal/Magento/Framework/Locale/ @melnikovi
/lib/internal/Magento/Framework/Phrase/ @melnikovi
/lib/internal/Magento/Framework/Translate/ @melnikovi
/app/code/Magento/Translation/ @melnikovi
/app/code/Magento/ImportExport/ @akaplya
/app/code/Magento/GoogleAdwords/ @buskamuza @melnikovi
/app/code/Magento/Newsletter/ @buskamuza @melnikovi
/app/code/Magento/ProductAlert/ @buskamuza @melnikovi
/app/code/Magento/Rss/ @buskamuza @melnikovi
/app/code/Magento/SendFriend/ @buskamuza @melnikovi
/app/code/Magento/Marketplace/ @buskamuza
/app/code/Magento/MediaStorage/ @buskamuza
/lib/internal/Magento/Framework/Amqp/ @tariqjawed83 @paliarush
/lib/internal/Magento/Framework/Bulk/ @tariqjawed83 @paliarush
/lib/internal/Magento/Framework/Communication/ @tariqjawed83 @paliarush
/app/code/Magento/Amqp/ @tariqjawed83 @paliarush
/app/code/Magento/AsynchronousOperations/ @tariqjawed83 @paliarush
/app/code/Magento/MessageQueue/ @tariqjawed83 @paliarush
/app/code/Magento/MysqlMq/ @tariqjawed83 @paliarush
/app/code/Magento/Sales/ @joni-jones
/app/code/Magento/SalesInventory/ @joni-jones
/app/code/Magento/SalesSequence/ @joni-jones
/lib/internal/Magento/Framework/Event/ @buskamuza @kandy
/lib/internal/Magento/Framework/Interception/ @buskamuza @kandy
/lib/internal/Magento/Framework/ObjectManager/ @buskamuza @kandy
/app/code/Magento/PageCache/ @Andrey @kokoc @paliarush
/app/code/Magento/Authorizenet/ @joni-jones
/app/code/Magento/Braintree/ @joni-jones
/app/code/Magento/OfflinePayments/ @joni-jones
/app/code/Magento/Payment/ @joni-jones
/app/code/Magento/Paypal/ @joni-jones
/app/code/Magento/Signifyd/ @joni-jones
/app/code/Magento/Vault/ @joni-jones
/lib/internal/Magento/Framework/Pricing/ @akaplya
/app/code/Magento/AdvancedPricingImportExport/ @akaplya
/app/code/Magento/CurrencySymbol/ @akaplya
/app/code/Magento/Msrp/ @akaplya
/app/code/Magento/Tax/ @akaplya
/app/code/Magento/TaxImportExport/ @akaplya
/app/code/Magento/Weee/ @akaplya
/app/code/Magento/CatalogRule/ @kokoc
/app/code/Magento/CatalogRuleConfigurable/ @kokoc
/app/code/Magento/CatalogWidget/ @kokoc
/app/code/Magento/Rule/ @kokoc
/app/code/Magento/SalesRule/ @akaplya
/app/code/Magento/ReleaseNotification/ @paliarush
/app/code/Magento/Analytics/ @tariqjawed83 @buskamuza
/app/code/Magento/GoogleAnalytics/ @tariqjawed83 @buskamuza
/app/code/Magento/NewRelicReporting/ @tariqjawed83 @buskamuza
/app/code/Magento/Reports/ @tariqjawed83 @buskamuza
/app/code/Magento/ReviewAnalytics/ @tariqjawed83 @buskamuza
/app/code/Magento/SalesAnalytics/ @tariqjawed83 @buskamuza
/app/code/Magento/WishlistAnalytics/ @tariqjawed83 @buskamuza
/app/code/Magento/GoogleOptimizer/ @paliarush
/app/code/Magento/Robots/ @paliarush
/app/code/Magento/Sitemap/ @paliarush
/lib/internal/Magento/Framework/Search/ @kokoc
/app/code/Magento/AdvancedSearch/ @kokoc
/app/code/Magento/Elasticsearch/ @kokoc
/app/code/Magento/Search/ @kokoc
/lib/internal/Magento/Framework/Acl/ @kokoc
/lib/internal/Magento/Framework/Authorization/ @kokoc
/lib/internal/Magento/Framework/Encryption/ @kokoc
/app/code/Magento/Authorization/ @kokoc
/app/code/Magento/Captcha/ @kokoc
/app/code/Magento/EncryptionKey/ @kokoc
/app/code/Magento/Security/ @kokoc
/lib/internal/Magento/Framework/Autoload/ @buskamuza
/lib/internal/Magento/Framework/Backup/ @buskamuza
/lib/internal/Magento/Framework/Composer/ @buskamuza
/lib/internal/Magento/Framework/Setup/ @buskamuza
/app/code/Magento/Backup/ @buskamuza
/setup/ @buskamuza
/app/code/Magento/Dhl/ @joni-jones
/app/code/Magento/Fedex/ @joni-jones
/app/code/Magento/OfflineShipping/ @joni-jones
/app/code/Magento/Shipping/ @joni-jones
/app/code/Magento/Ups/ @joni-jones
/app/code/Magento/Usps/ @joni-jones
/app/code/Magento/Store/ @akaplya
/lib/internal/Magento/Framework/TestFramework/ @paliarush
/dev/tests/integration/framework/ @buskamuza
/dev/tests/setup-integration/framework/ @paliarush
/dev/tests/static/framework/ @paliarush
/dev/tests/unit/ @paliarush
/dev/tests/api-functional/ @paliarush
/app/code/Magento/UrlRewrite/ @kokoc
/lib/internal/Magento/Framework/Image/ @buskamuza
/lib/internal/Magento/Framework/Mail/ @melnikovi
/lib/internal/Magento/Framework/Filter/ @melnikovi
/lib/internal/Magento/Framework/Validation/ @melnikovi
/lib/internal/Magento/Framework/Validator/ @melnikovi
/lib/internal/Magento/Framework/Api/ @paliarush
/lib/internal/Magento/Framework/GraphQL/ @paliarush
/lib/internal/Magento/Framework/Oauth/ @paliarush
/lib/internal/Magento/Framework/Webapi/ @paliarush
/app/code/Magento/GraphQL/ @paliarush
/app/code/Magento/Integration/ @paliarush
/app/code/Magento/Swagger/ @paliarush
/app/code/Magento/Webapi/ @paliarush
/app/code/Magento/WebapiSecurity/ @paliarush

composer.json @buskamuza
*.js @DrewML
.htaccess* @akaplya
nginx.conf* @akaplya
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,13 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract

const VALIDATOR_WEBSITE = 'validator_website';

const VALIDATOR_TEAR_PRICE = 'validator_tear_price';
/**
* @deprecated
* @see VALIDATOR_TIER_PRICE
*/
private const VALIDATOR_TEAR_PRICE = 'validator_tier_price';

private const VALIDATOR_TIER_PRICE = 'validator_tier_price';

/**
* Validation failure message template definitions.
Expand Down Expand Up @@ -221,7 +227,7 @@ public function __construct(
$this->_catalogProductEntity = $this->_resourceFactory->create()->getTable('catalog_product_entity');
$this->_oldSkus = $this->retrieveOldSkus();
$this->_validators[self::VALIDATOR_WEBSITE] = $websiteValidator;
$this->_validators[self::VALIDATOR_TEAR_PRICE] = $tierPriceValidator;
$this->_validators[self::VALIDATOR_TIER_PRICE] = $tierPriceValidator;
$this->errorAggregator = $errorAggregator;

foreach (array_merge($this->errorMessageTemplates, $this->_messageTemplates) as $errorCode => $message) {
Expand Down Expand Up @@ -536,7 +542,7 @@ protected function getWebSiteId($websiteCode)
*/
protected function getCustomerGroupId($customerGroup)
{
$customerGroups = $this->_getValidator(self::VALIDATOR_TEAR_PRICE)->getCustomerGroups();
$customerGroups = $this->_getValidator(self::VALIDATOR_TIER_PRICE)->getCustomerGroups();
return $customerGroup == self::VALUE_ALL_GROUPS ? 0 : $customerGroups[$customerGroup];
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
*/
class AdvancedPricingTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractImportTestCase
{
/**
* DB Table data
*/
const TABLE_NAME = 'tableName';
const LINK_FIELD = 'linkField';

Expand Down Expand Up @@ -54,7 +57,7 @@ class AdvancedPricingTest extends \Magento\ImportExport\Test\Unit\Model\Import\A
protected $websiteValidator;

/**
* @var AdvancedPricing\Validator\TearPrice |\PHPUnit_Framework_MockObject_MockObject
* @var AdvancedPricing\Validator\TierPrice |\PHPUnit_Framework_MockObject_MockObject
*/
protected $tierPriceValidator;

Expand Down
39 changes: 38 additions & 1 deletion app/code/Magento/AdvancedSearch/README.md
Original file line number Diff line number Diff line change
@@ -1 +1,38 @@
AdvancedSearch module introduces advanced search functionality and provides interfaces that allow to implement this functionality by 3rd party search engines
# Magento_AdvancedSearch module
The Magento_AdvancedSearch module introduces advanced search functionality and provides interfaces that allow third-party search engines to implement this functionality.

## Installation details

Before disabling or uninstalling this module, note that the following modules depends on this module:
- Magento_Elasticsearch
- Magento_Elasticsearch6

For information about module installation in Magento 2, see [Enable or disable modules](https://devdocs.magento.com/guides/v2.3/install-gde/install/cli/install-cli-subcommands-enable.html).

## Extensibility

Extension developers can interact with the Magento_AdvancedSearch module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).

[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_AdvancedSearch module.

### Events

This module observes the following event:

- `catalogsearch_query_save_after` in the `Magento\AdvancedSearch\Model\Recommendations\SaveSearchQueryRelationsObserver` file.

For information about an event in Magento 2, see [Events and observers](http://devdocs.magento.com/guides/v2.3/extension-dev-guide/events-and-observers.html#events).

### Layouts

The module interacts with the following layout handles in the `view/adminhtml/layout` directory:

- `catalog_search_block`
- `catalog_search_edit`
- `catalog_search_relatedgrid`

The module interacts with the following layout handles in the `view/frontend/layout` directory:

- `catalogsearch_result_index`

For more information about layouts in Magento 2, see the [Layout documentation](https://devdocs.magento.com/guides/v2.3/frontend-dev-guide/layouts/layout-overview.html).
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ public function beforeEnqueue(SubjectExchange $subject, $topic, array $envelopes
if ($headers instanceof AMQPTable) {
try {
$headers->set('store_id', $storeId);
// phpcs:ignore Magento2.Exceptions.ThrowCatch
} catch (AMQPInvalidArgumentException $ea) {
$errorMessage = sprintf("Can't set storeId to amqp message. Error %s.", $ea->getMessage());
$this->logger->error($errorMessage);
Expand Down
10 changes: 8 additions & 2 deletions app/code/Magento/AmqpStore/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# Amqp Store
# Magento_AmqpStore module

**AmqpStore** provides ability to specify store before publish messages with Amqp.
The Magento_AmqpStore module provides the ability to specify a store before publishing messages with the Advanced Message Queuing Protocol (AMQP).

## Extensibility

Extension developers can interact with the Magento_AmqpStore module using plugins. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).

[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_AmqpStore module.
41 changes: 25 additions & 16 deletions app/code/Magento/Analytics/README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,27 @@
# Magento_Analytics Module
# Magento_Analytics module

The Magento_Analytics module integrates your Magento instance with the [Magento Business Intelligence (MBI)](https://magento.com/products/business-intelligence) to use [Advanced Reporting](https://devdocs.magento.com/guides/v2.3/advanced-reporting/modules.html) functionality.

The module implements the following functionality:

* enabling subscription to the MBI and automatic re-subscription
* changing the base URL with the same MBI account remained
* declaring the configuration schemas for report data collection
* collecting the Magento instance data as reports for the MBI
* introducing API that provides the collected data
* extending Magento configuration with the module parameters:
* subscription status (enabled/disabled)
* industry (a business area in which the instance website works)
* time of data collection (time of the day when the module collects data)
- Enabling subscription to Magento Business Intelligence (MBI) and automatic re-subscription
- Declaring the configuration schemas for report data collection
- Collecting the Magento instance data as reports for MBI
- Introducing API that provides the collected data
- Extending Magento configuration with the module parameters:
- Subscription status (enabled/disabled)
- Industry (a business area in which the instance website works)
- Time of data collection (time of the day when the module collects data)

## Installation details

Before disabling or uninstalling this module, note that the following modules depends on this module:
- Magento_CatalogAnalytics
- Magento_CustomerAnalytics
- Magento_QuoteAnalytics
- Magento_ReviewAnalytics
- Magento_SalesAnalytics
- Magento_WishlistAnalytics

## Structure

Expand All @@ -29,12 +38,12 @@ The subscription to the MBI service is enabled during the installation process o
Configuration settings for the Analytics module can be modified in the Admin Panel on the Stores > Configuration page under the General > Advanced Reporting tab.

The following options can be adjusted:
* Advanced Reporting Service (Enabled/Disabled)
* Alters the status of the Advanced Reporting subscription
* Time of day to send data (Hour/Minute/Second in the store's time zone)
* Defines when the data collection process for the Advanced Reporting service occurs
* Industry
* Defines the industry of the store in order to create a personalized Advanced Reporting experience
- Advanced Reporting Service (Enabled/Disabled)
- Alters the status of the Advanced Reporting subscription
- Time of day to send data (Hour/Minute/Second in the store's time zone)
- Defines when the data collection process for the Advanced Reporting service occurs
- Industry
- Defines the industry of the store in order to create a personalized Advanced Reporting experience

## Extensibility

Expand Down
Loading

0 comments on commit 16e8358

Please sign in to comment.