Skip to content

Commit f15b503

Browse files
Stepa4manStepa4man
committed
Merge branch '2.3-develop' into MC-13951-Declarative-upgrade-leads-to-the-re-creation-of-indexes
2 parents 137f963 + 71b0142 commit f15b503

File tree

86 files changed

+2179
-1285
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+2179
-1285
lines changed

‎app/code/Magento/AdminNotification/etc/db_schema.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
1010
<table name="adminnotification_inbox" resource="default" engine="innodb" comment="Adminnotification Inbox">
1111
<column xsi:type="int" name="notification_id" padding="10" unsigned="true" nullable="false" identity="true"
12-
comment="Notification id"/>
12+
comment="Notification ID"/>
1313
<column xsi:type="smallint" name="severity" padding="5" unsigned="true" nullable="false" identity="false"
1414
default="0" comment="Problem type"/>
1515
<column xsi:type="timestamp" name="date_added" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
@@ -35,7 +35,7 @@
3535
</index>
3636
</table>
3737
<table name="admin_system_messages" resource="default" engine="innodb" comment="Admin System Messages">
38-
<column xsi:type="varchar" name="identity" nullable="false" length="100" comment="Message id"/>
38+
<column xsi:type="varchar" name="identity" nullable="false" length="100" comment="Message ID"/>
3939
<column xsi:type="smallint" name="severity" padding="5" unsigned="true" nullable="false" identity="false"
4040
default="0" comment="Problem type"/>
4141
<column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"

‎app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
*/
66
namespace Magento\AdvancedPricingImportExport\Model\Export;
77

8-
use Magento\ImportExport\Model\Export;
9-
use Magento\Store\Model\Store;
10-
use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
118
use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as ImportAdvancedPricing;
129
use Magento\Catalog\Model\Product as CatalogProduct;
10+
use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
11+
use Magento\ImportExport\Model\Export;
12+
use Magento\Store\Model\Store;
1313

1414
/**
1515
* Export Advanced Pricing
@@ -150,6 +150,8 @@ public function __construct(
150150
}
151151

152152
/**
153+
* Init type models
154+
*
153155
* @return $this
154156
* @throws \Magento\Framework\Exception\LocalizedException
155157
*/
@@ -172,7 +174,9 @@ protected function initTypeModels()
172174
}
173175
if ($model->isSuitable()) {
174176
$this->_productTypeModels[$productTypeName] = $model;
177+
// phpcs:ignore Magento2.Performance.ForeachArrayMerge
175178
$this->_disabledAttrs = array_merge($this->_disabledAttrs, $model->getDisabledAttrs());
179+
// phpcs:ignore Magento2.Performance.ForeachArrayMerge
176180
$this->_indexValueAttributes = array_merge(
177181
$this->_indexValueAttributes,
178182
$model->getIndexValueAttributes()
@@ -197,6 +201,7 @@ protected function initTypeModels()
197201
public function export()
198202
{
199203
//Execution time may be very long
204+
// phpcs:ignore Magento2.Functions.DiscouragedFunction
200205
set_time_limit(0);
201206

202207
$writer = $this->getWriter();
@@ -234,16 +239,6 @@ public function filterAttributeCollection(\Magento\Eav\Model\ResourceModel\Entit
234239

235240
foreach ($collection as $attribute) {
236241
if (in_array($attribute->getAttributeCode(), $this->_disabledAttrs)) {
237-
if (isset($this->_parameters[\Magento\ImportExport\Model\Export::FILTER_ELEMENT_SKIP])) {
238-
if ($attribute->getAttributeCode() == ImportAdvancedPricing::COL_TIER_PRICE
239-
&& in_array(
240-
$attribute->getId(),
241-
$this->_parameters[\Magento\ImportExport\Model\Export::FILTER_ELEMENT_SKIP]
242-
)
243-
) {
244-
$this->_passTierPrice = 1;
245-
}
246-
}
247242
$collection->removeItemByKey($attribute->getId());
248243
}
249244
}
@@ -363,6 +358,7 @@ private function prepareExportData(
363358
$linkedTierPricesData = [];
364359
foreach ($tierPricesData as $tierPriceData) {
365360
$sku = $productLinkIdToSkuMap[$tierPriceData['product_link_id']];
361+
// phpcs:ignore Magento2.Performance.ForeachArrayMerge
366362
$linkedTierPricesData[] = array_merge(
367363
$tierPriceData,
368364
[ImportAdvancedPricing::COL_SKU => $sku]
@@ -471,7 +467,7 @@ private function fetchTierPrices(array $productIds): array
471467
ImportAdvancedPricing::COL_TIER_PRICE_QTY => 'ap.qty',
472468
ImportAdvancedPricing::COL_TIER_PRICE => 'ap.value',
473469
ImportAdvancedPricing::COL_TIER_PRICE_PERCENTAGE_VALUE => 'ap.percentage_value',
474-
'product_link_id' => 'ap.' .$productEntityLinkField,
470+
'product_link_id' => 'ap.' . $productEntityLinkField,
475471
];
476472
if ($exportFilter && array_key_exists('tier_price', $exportFilter)) {
477473
if (!empty($exportFilter['tier_price'][0])) {
@@ -488,7 +484,7 @@ private function fetchTierPrices(array $productIds): array
488484
$selectFields
489485
)
490486
->where(
491-
'ap.'.$productEntityLinkField.' IN (?)',
487+
'ap.' . $productEntityLinkField . ' IN (?)',
492488
$productIds
493489
);
494490

@@ -602,7 +598,7 @@ protected function _getWebsiteCode(int $websiteId): string
602598
}
603599

604600
if ($storeName && $currencyCode) {
605-
$code = $storeName.' ['.$currencyCode.']';
601+
$code = $storeName . ' [' . $currencyCode . ']';
606602
} else {
607603
$code = $storeName;
608604
}

‎app/code/Magento/AdvancedSearch/etc/db_schema.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
1010
<table name="catalogsearch_recommendations" resource="default" engine="innodb"
1111
comment="Advanced Search Recommendations">
12-
<column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
12+
<column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="ID"/>
1313
<column xsi:type="int" name="query_id" padding="10" unsigned="true" nullable="false" identity="false"
14-
default="0" comment="Query Id"/>
14+
default="0" comment="Query ID"/>
1515
<column xsi:type="int" name="relation_id" padding="10" unsigned="true" nullable="false" identity="false"
16-
default="0" comment="Relation Id"/>
16+
default="0" comment="Relation ID"/>
1717
<constraint xsi:type="primary" referenceId="PRIMARY">
1818
<column name="id"/>
1919
</constraint>

‎app/code/Magento/Braintree/README.md

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,47 @@
1-
Module Magento\Braintree implements integration with the Braintree payment system.
1+
# Magento_Braintree module
2+
3+
The Magento_Braintree module implements integration with the Braintree payment system.
4+
5+
## Extensibility
6+
7+
Extension developers can interact with the Magento_Braintree 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).
8+
9+
[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_Braintree module.
10+
11+
### Events
12+
13+
This module observes the following events:
14+
15+
- `payment_method_assign_data_braintree` event in `Magento\Braintree\Observer\DataAssignObserver` file.
16+
- `payment_method_assign_data_braintree_paypal` event in `Magento\Braintree\Observer\DataAssignObserver` file.
17+
- `shortcut_buttons_container` event in `Magento\Braintree\Observer\AddPaypalShortcuts` file.
18+
19+
For information about an event in Magento 2, see [Events and observers](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/events-and-observers.html#events).
20+
21+
### Layouts
22+
23+
This module interacts with the following layouts and layout handles in the `view/adminhtml/layout` directory:
24+
25+
- `braintree_paypal_review`
26+
- `checkout_index_index`
27+
- `multishipping_checkout_billing`
28+
- `vault_cards_listaction`
29+
30+
This module interacts with the following layout handles in the `view/frontend/layout` directory:
31+
32+
- `adminhtml_system_config_edit`
33+
- `braintree_report_index`
34+
- `sales_order_create_index`
35+
- `sales_order_create_load_block_billing_method`
36+
37+
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).
38+
39+
### UI components
40+
41+
You can extend admin notifications using the `view/adminhtml/ui_component/braintree_report.xml` configuration file.
42+
43+
For information about UI components in Magento 2, see [Overview of UI components](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/bk-ui_comps.html).
44+
45+
## Additional information
46+
47+
For information about significant changes in patch releases, see [2.3.x Release information](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html).

‎app/code/Magento/BraintreeGraphQl/etc/schema.graphqls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# See COPYING.txt for license details.
33

44
type Mutation {
5-
createBraintreeClientToken: String! @resolver(class: "\\Magento\\BraintreeGraphQl\\Model\\Resolver\\CreateBraintreeClientToken") @doc(description:"Creates Braintree Client Token for creating client-side nonce.")
5+
createBraintreeClientToken: String! @resolver(class: "\\Magento\\BraintreeGraphQl\\Model\\Resolver\\CreateBraintreeClientToken") @doc(description:"Creates Client Token for Braintree Javascript SDK initialization.")
66
}
77

88
input PaymentMethodInput {

‎app/code/Magento/Bundle/etc/db_schema.xml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<table name="catalog_product_bundle_option" resource="default" engine="innodb"
1111
comment="Catalog Product Bundle Option">
1212
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="true"
13-
comment="Option Id"/>
13+
comment="Option ID"/>
1414
<column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
15-
comment="Parent Id"/>
15+
comment="Parent ID"/>
1616
<column xsi:type="smallint" name="required" padding="5" unsigned="true" nullable="false" identity="false"
1717
default="0" comment="Required"/>
1818
<column xsi:type="int" name="position" padding="10" unsigned="true" nullable="false" identity="false"
@@ -31,14 +31,14 @@
3131
<table name="catalog_product_bundle_option_value" resource="default" engine="innodb"
3232
comment="Catalog Product Bundle Option Value">
3333
<column xsi:type="int" name="value_id" padding="10" unsigned="true" nullable="false" identity="true"
34-
comment="Value Id"/>
34+
comment="Value ID"/>
3535
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
36-
comment="Option Id"/>
36+
comment="Option ID"/>
3737
<column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
38-
comment="Store Id"/>
38+
comment="Store ID"/>
3939
<column xsi:type="varchar" name="title" nullable="true" length="255" comment="Title"/>
4040
<column xsi:type="int" name="parent_product_id" padding="10" unsigned="true" nullable="false" identity="false"
41-
comment="Parent Product Id"/>
41+
comment="Parent Product ID"/>
4242
<constraint xsi:type="primary" referenceId="PRIMARY">
4343
<column name="value_id"/>
4444
</constraint>
@@ -54,13 +54,13 @@
5454
<table name="catalog_product_bundle_selection" resource="default" engine="innodb"
5555
comment="Catalog Product Bundle Selection">
5656
<column xsi:type="int" name="selection_id" padding="10" unsigned="true" nullable="false" identity="true"
57-
comment="Selection Id"/>
57+
comment="Selection ID"/>
5858
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
59-
comment="Option Id"/>
59+
comment="Option ID"/>
6060
<column xsi:type="int" name="parent_product_id" padding="10" unsigned="true" nullable="false" identity="false"
61-
comment="Parent Product Id"/>
61+
comment="Parent Product ID"/>
6262
<column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
63-
comment="Product Id"/>
63+
comment="Product ID"/>
6464
<column xsi:type="int" name="position" padding="10" unsigned="true" nullable="false" identity="false"
6565
default="0" comment="Position"/>
6666
<column xsi:type="smallint" name="is_default" padding="5" unsigned="true" nullable="false" identity="false"
@@ -92,15 +92,15 @@
9292
<table name="catalog_product_bundle_selection_price" resource="default" engine="innodb"
9393
comment="Catalog Product Bundle Selection Price">
9494
<column xsi:type="int" name="selection_id" padding="10" unsigned="true" nullable="false" identity="false"
95-
comment="Selection Id"/>
95+
comment="Selection ID"/>
9696
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
97-
comment="Website Id"/>
97+
comment="Website ID"/>
9898
<column xsi:type="smallint" name="selection_price_type" padding="5" unsigned="true" nullable="false"
9999
identity="false" default="0" comment="Selection Price Type"/>
100100
<column xsi:type="decimal" name="selection_price_value" scale="6" precision="20" unsigned="false"
101101
nullable="false" default="0" comment="Selection Price Value"/>
102102
<column xsi:type="int" name="parent_product_id" padding="10" unsigned="true" nullable="false" identity="false"
103-
comment="Parent Product Id"/>
103+
comment="Parent Product ID"/>
104104
<constraint xsi:type="primary" referenceId="PK_CATALOG_PRODUCT_BUNDLE_SELECTION_PRICE">
105105
<column name="selection_id"/>
106106
<column name="parent_product_id"/>
@@ -122,7 +122,7 @@
122122
<column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
123123
comment="Entity ID"/>
124124
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
125-
comment="Website Id"/>
125+
comment="Website ID"/>
126126
<column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
127127
comment="Customer Group ID"/>
128128
<column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="false"
@@ -159,7 +159,7 @@
159159
<column xsi:type="smallint" name="stock_id" padding="5" unsigned="true" nullable="false" identity="false"
160160
comment="Stock ID"/>
161161
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
162-
default="0" comment="Option Id"/>
162+
default="0" comment="Option ID"/>
163163
<column xsi:type="smallint" name="stock_status" padding="6" unsigned="false" nullable="true" identity="false"
164164
default="0" comment="Stock Status"/>
165165
<constraint xsi:type="primary" referenceId="PRIMARY">
@@ -246,9 +246,9 @@
246246
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
247247
comment="Website ID"/>
248248
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
249-
default="0" comment="Option Id"/>
249+
default="0" comment="Option ID"/>
250250
<column xsi:type="int" name="selection_id" padding="10" unsigned="true" nullable="false" identity="false"
251-
default="0" comment="Selection Id"/>
251+
default="0" comment="Selection ID"/>
252252
<column xsi:type="smallint" name="group_type" padding="5" unsigned="true" nullable="true" identity="false"
253253
default="0" comment="Group Type"/>
254254
<column xsi:type="smallint" name="is_required" padding="5" unsigned="true" nullable="true" identity="false"
@@ -274,9 +274,9 @@
274274
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
275275
comment="Website ID"/>
276276
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
277-
default="0" comment="Option Id"/>
277+
default="0" comment="Option ID"/>
278278
<column xsi:type="int" name="selection_id" padding="10" unsigned="true" nullable="false" identity="false"
279-
default="0" comment="Selection Id"/>
279+
default="0" comment="Selection ID"/>
280280
<column xsi:type="smallint" name="group_type" padding="5" unsigned="true" nullable="true" identity="false"
281281
default="0" comment="Group Type"/>
282282
<column xsi:type="smallint" name="is_required" padding="5" unsigned="true" nullable="true" identity="false"
@@ -302,7 +302,7 @@
302302
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
303303
comment="Website ID"/>
304304
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
305-
default="0" comment="Option Id"/>
305+
default="0" comment="Option ID"/>
306306
<column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
307307
comment="Min Price"/>
308308
<column xsi:type="decimal" name="alt_price" scale="6" precision="20" unsigned="false" nullable="true"
@@ -329,7 +329,7 @@
329329
<column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
330330
comment="Website ID"/>
331331
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
332-
default="0" comment="Option Id"/>
332+
default="0" comment="Option ID"/>
333333
<column xsi:type="decimal" name="min_price" scale="6" precision="20" unsigned="false" nullable="true"
334334
comment="Min Price"/>
335335
<column xsi:type="decimal" name="alt_price" scale="6" precision="20" unsigned="false" nullable="true"

0 commit comments

Comments
 (0)