Skip to content

Commit c1f132b

Browse files
VladimirZaetsVladimirZaets
authored
Merge branch '2.4-develop' into requirejs-resolver-error-handling
2 parents bfdde51 + 63a6786 commit c1f132b

File tree

4,828 files changed

+16193
-310918
lines changed

Some content is hidden

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

4,828 files changed

+16193
-310918
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Fields marked with (*) are required. Please don't remove the template.
1111

1212
### Preconditions (*)
1313
<!---
14-
Provide the exact Magento version (example: 2.3.2) and any important information on the environment where bug is reproducible.
14+
Provide the exact Magento version (example: 2.4.0) and any important information on the environment where bug is reproducible.
1515
-->
1616
1.
1717
2.
@@ -32,3 +32,12 @@ Important: Provide a set of clear steps to reproduce this bug. We can not provid
3232
<!--- Tell us what happened instead. Include error messages and issues. -->
3333
1. [Screenshots, logs or description]
3434
2.
35+
36+
---
37+
Please provide [Severity](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#backlog) assessment for the Issue as Reporter. This information will help during Confirmation and Issue triage processes.
38+
39+
- [ ] Severity: **S0** _- Affects critical data or functionality and leaves users without workaround._
40+
- [ ] Severity: **S1** _- Affects critical data or functionality and forces users to employ a workaround._
41+
- [ ] Severity: **S2** _- Affects non-critical data or functionality and forces users to employ a workaround._
42+
- [ ] Severity: **S3** _- Affects non-critical data or functionality and does not force users to employ a workaround._
43+
- [ ] Severity: **S4** _- Affects aesthetics, professional look and feel, “quality” or “usability”._

‎.github/ISSUE_TEMPLATE/developer-experience-issue.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,12 @@ Fields marked with (*) are required. Please don't remove the template.
1818

1919
### Proposed solution
2020
<!--- Suggest your potential solutions for this issue. -->
21+
22+
---
23+
Please provide [Severity](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#backlog) assessment for the Issue as Reporter. This information will help during Confirmation and Issue triage processes.
24+
25+
- [ ] Severity: **S0** _- Affects critical data or functionality and leaves users with no workaround._
26+
- [ ] Severity: **S1** _- Affects critical data or functionality and forces users to employ a workaround._
27+
- [ ] Severity: **S2** _- Affects non-critical data or functionality and forces users to employ a workaround._
28+
- [ ] Severity: **S3** _- Affects non-critical data or functionality and does not force users to employ a workaround._
29+
- [ ] Severity: **S4** _- Affects aesthetics, professional look and feel, “quality” or “usability”._

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
If relevant, please provide a list of fixed issues in the format magento/magento2#<issue_number>.
2424
There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
2525
-->
26-
1. magento/magento2#<issue_number>: Issue title
26+
1. Fixes magento/magento2#<issue_number>
2727

2828
### Manual testing scenarios (*)
2929
<!---

‎.php_cs.dist

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010

1111
$finder = PhpCsFixer\Finder::create()
1212
->name('*.phtml')
13-
->exclude('dev/tests/functional/generated')
14-
->exclude('dev/tests/functional/var')
15-
->exclude('dev/tests/functional/vendor')
1613
->exclude('dev/tests/integration/tmp')
1714
->exclude('dev/tests/integration/var')
1815
->exclude('lib/internal/Cm')

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

Lines changed: 1 addition & 1 deletion
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="admin_analytics_usage_version_log" resource="default" engine="innodb"
1111
comment="Admin Notification Viewer Log Table">
12-
<column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
12+
<column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true"
1313
comment="Log ID"/>
1414
<column xsi:type="varchar" name="last_viewed_in_version" nullable="false" length="50"
1515
comment="Viewer last viewed on product version"/>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
1010
<table name="adminnotification_inbox" resource="default" engine="innodb" comment="Adminnotification Inbox">
11-
<column xsi:type="int" name="notification_id" padding="10" unsigned="true" nullable="false" identity="true"
11+
<column xsi:type="int" name="notification_id" unsigned="true" nullable="false" identity="true"
1212
comment="Notification ID"/>
13-
<column xsi:type="smallint" name="severity" padding="5" unsigned="true" nullable="false" identity="false"
13+
<column xsi:type="smallint" name="severity" 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"
1616
comment="Create date"/>
1717
<column xsi:type="varchar" name="title" nullable="false" length="255" comment="Title"/>
1818
<column xsi:type="text" name="description" nullable="true" comment="Description"/>
1919
<column xsi:type="varchar" name="url" nullable="true" length="255" comment="Url"/>
20-
<column xsi:type="smallint" name="is_read" padding="5" unsigned="true" nullable="false" identity="false"
20+
<column xsi:type="smallint" name="is_read" unsigned="true" nullable="false" identity="false"
2121
default="0" comment="Flag if notification read"/>
22-
<column xsi:type="smallint" name="is_remove" padding="5" unsigned="true" nullable="false" identity="false"
22+
<column xsi:type="smallint" name="is_remove" unsigned="true" nullable="false" identity="false"
2323
default="0" comment="Flag if notification might be removed"/>
2424
<constraint xsi:type="primary" referenceId="PRIMARY">
2525
<column name="notification_id"/>
@@ -36,7 +36,7 @@
3636
</table>
3737
<table name="admin_system_messages" resource="default" engine="innodb" comment="Admin System Messages">
3838
<column xsi:type="varchar" name="identity" nullable="false" length="100" comment="Message ID"/>
39-
<column xsi:type="smallint" name="severity" padding="5" unsigned="true" nullable="false" identity="false"
39+
<column xsi:type="smallint" name="severity" 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"
4242
comment="Create date"/>

‎app/code/Magento/AdvancedSearch/Model/Client/ClientResolver.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
*/
66
namespace Magento\AdvancedSearch\Model\Client;
77

8-
use \Magento\Framework\ObjectManagerInterface;
8+
use Magento\Framework\ObjectManagerInterface;
99
use Magento\Framework\Search\EngineResolverInterface;
10+
use Magento\Framework\App\Config\ScopeConfigInterface;
1011

1112
/**
1213
* @api
@@ -46,7 +47,7 @@ class ClientResolver
4647
private $clientOptionsPool;
4748

4849
/**
49-
* @var EngineResolver
50+
* @var EngineResolverInterface
5051
*/
5152
private $engineResolver;
5253

‎app/code/Magento/AdvancedSearch/Model/Indexer/Fulltext/Plugin/CustomerGroup.php

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
use Magento\Framework\Model\AbstractModel;
1313
use Magento\Catalog\Model\ResourceModel\Attribute;
1414
use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface;
15-
use Magento\Framework\Search\EngineResolverInterface;
16-
use Magento\Search\Model\EngineResolver;
1715

1816
class CustomerGroup extends AbstractPlugin
1917
{
@@ -22,24 +20,16 @@ class CustomerGroup extends AbstractPlugin
2220
*/
2321
protected $clientOptions;
2422

25-
/**
26-
* @var EngineResolverInterface
27-
*/
28-
protected $engineResolver;
29-
3023
/**
3124
* @param IndexerRegistry $indexerRegistry
3225
* @param ClientOptionsInterface $clientOptions
33-
* @param EngineResolverInterface $engineResolver
3426
*/
3527
public function __construct(
3628
IndexerRegistry $indexerRegistry,
37-
ClientOptionsInterface $clientOptions,
38-
EngineResolverInterface $engineResolver
29+
ClientOptionsInterface $clientOptions
3930
) {
4031
parent::__construct($indexerRegistry);
4132
$this->clientOptions = $clientOptions;
42-
$this->engineResolver = $engineResolver;
4333
}
4434

4535
/**
@@ -56,9 +46,7 @@ public function aroundSave(
5646
\Closure $proceed,
5747
AbstractModel $group
5848
) {
59-
$needInvalidation =
60-
($this->engineResolver->getCurrentSearchEngine() != EngineResolver::CATALOG_SEARCH_MYSQL_ENGINE)
61-
&& ($group->isObjectNew() || $group->dataHasChangedFor('tax_class_id'));
49+
$needInvalidation = $group->isObjectNew() || $group->dataHasChangedFor('tax_class_id');
6250
$result = $proceed($group);
6351
if ($needInvalidation) {
6452
$this->indexerRegistry->get(Fulltext::INDEXER_ID)->invalidate();

‎app/code/Magento/AdvancedSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/CustomerGroupTest.php

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
use Magento\Customer\Model\ResourceModel\Group as CustomerGroupResourceModel;
1515
use Magento\Framework\Indexer\IndexerInterface;
1616
use Magento\Framework\Indexer\IndexerRegistry;
17-
use Magento\Framework\Search\EngineResolverInterface;
1817
use PHPUnit\Framework\TestCase;
18+
use PHPUnit\Framework\MockObject\MockObject;
1919

2020
/**
2121
* @covers \Magento\AdvancedSearch\Model\Indexer\Fulltext\Plugin\CustomerGroup
@@ -35,7 +35,7 @@ class CustomerGroupTest extends TestCase
3535
private $indexerMock;
3636

3737
/**
38-
* @var Group|MockObject
38+
* @var CustomerGroupResourceModel|MockObject
3939
*/
4040
private $subjectMock;
4141

@@ -49,11 +49,6 @@ class CustomerGroupTest extends TestCase
4949
*/
5050
private $indexerRegistryMock;
5151

52-
/**
53-
* @var EngineResolverInterface|MockObject
54-
*/
55-
private $engineResolverMock;
56-
5752
protected function setUp(): void
5853
{
5954
$this->subjectMock = $this->createMock(CustomerGroupResourceModel::class);
@@ -73,35 +68,24 @@ protected function setUp(): void
7368
IndexerRegistry::class,
7469
['get']
7570
);
76-
$this->engineResolverMock = $this->createPartialMock(
77-
EngineResolverInterface::class,
78-
['getCurrentSearchEngine']
79-
);
8071
$this->model = new CustomerGroupPlugin(
8172
$this->indexerRegistryMock,
82-
$this->customerOptionsMock,
83-
$this->engineResolverMock
73+
$this->customerOptionsMock
8474
);
8575
}
8676

8777
/**
88-
* @param string $searchEngine
8978
* @param bool $isObjectNew
9079
* @param bool $isTaxClassIdChanged
9180
* @param int $invalidateCounter
9281
* @return void
9382
* @dataProvider aroundSaveDataProvider
9483
*/
9584
public function testAroundSave(
96-
string $searchEngine,
9785
bool $isObjectNew,
9886
bool $isTaxClassIdChanged,
9987
int $invalidateCounter
10088
): void {
101-
$this->engineResolverMock->expects($this->once())
102-
->method('getCurrentSearchEngine')
103-
->willReturn($searchEngine);
104-
10589
$groupMock = $this->createPartialMock(
10690
CustomerGroupModel::class,
10791
['dataHasChangedFor', 'isObjectNew', '__wakeup']
@@ -137,14 +121,10 @@ public function testAroundSave(
137121
public function aroundSaveDataProvider(): array
138122
{
139123
return [
140-
['mysql', false, false, 0],
141-
['mysql', false, true, 0],
142-
['mysql', true, false, 0],
143-
['mysql', true, true, 0],
144-
['custom', false, false, 0],
145-
['custom', false, true, 1],
146-
['custom', true, false, 1],
147-
['custom', true, true, 1],
124+
[false, false, 0],
125+
[false, true, 1],
126+
[true, false, 1],
127+
[true, true, 1],
148128
];
149129
}
150130
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
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"/>
13-
<column xsi:type="int" name="query_id" padding="10" unsigned="true" nullable="false" identity="false"
12+
<column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true" comment="ID"/>
13+
<column xsi:type="int" name="query_id" unsigned="true" nullable="false" identity="false"
1414
default="0" comment="Query ID"/>
15-
<column xsi:type="int" name="relation_id" padding="10" unsigned="true" nullable="false" identity="false"
15+
<column xsi:type="int" name="relation_id" unsigned="true" nullable="false" identity="false"
1616
default="0" comment="Relation ID"/>
1717
<constraint xsi:type="primary" referenceId="PRIMARY">
1818
<column name="id"/>

‎app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Show extends Action implements HttpGetActionInterface
2727
/**
2828
* @inheritdoc
2929
*/
30-
const ADMIN_RESOURCE = 'Magento_Analytics::analytics_settings';
30+
const ADMIN_RESOURCE = 'Magento_Analytics::advanced_reporting';
3131

3232
/**
3333
* @param Context $context

‎app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@
149149
<item>Magento_Backend::custom</item>
150150
<item>Magento_Backend::tools</item>
151151
<item>Magento_Backend::cache</item>
152-
<item>Magento_Backend::setup_wizard</item>
153152
<item>Magento_Backup::backup</item>
154153
<item>Magento_Backup::rollback</item>
155154
<item>Magento_Indexer::index</item>

‎app/code/Magento/Analytics/etc/di.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,7 @@
163163
<item name="27" xsi:type="string">payment/cashondelivery/active</item>
164164
<item name="28" xsi:type="string">payment/paypal_billing_agreement/title</item>
165165
<item name="29" xsi:type="string">payment/paypal_billing_agreement/active</item>
166-
<item name="30" xsi:type="string">payment/braintree/title</item>
167-
<item name="31" xsi:type="string">payment/braintree/active</item>
168-
<item name="32" xsi:type="string">payment/braintree_paypal/title</item>
169-
<item name="33" xsi:type="string">payment/braintree_paypal/active</item>
170-
<item name="34" xsi:type="string">analytics/general/vertical</item>
166+
<item name="30" xsi:type="string">analytics/general/vertical</item>
171167
</argument>
172168
</arguments>
173169
</type>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
1010
<table name="magento_bulk" resource="default" engine="innodb"
1111
comment="Bulk entity that represents set of related asynchronous operations">
12-
<column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
12+
<column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true"
1313
comment="Bulk Internal ID (must not be exposed)"/>
1414
<column xsi:type="varbinary" name="uuid" nullable="true" length="39"
1515
comment="Bulk UUID (can be exposed to reference bulk entity)"/>
16-
<column xsi:type="int" name="user_id" padding="10" unsigned="true" nullable="true" identity="false"
16+
<column xsi:type="int" name="user_id" unsigned="true" nullable="true" identity="false"
1717
comment="ID of the WebAPI user that performed an action"/>
1818
<column xsi:type="int" name="user_type" nullable="true" comment="Which type of user"/>
1919
<column xsi:type="varchar" name="description" nullable="true" length="255" comment="Bulk Description"/>
20-
<column xsi:type="int" name="operation_count" padding="10" unsigned="true" nullable="false" identity="false"
20+
<column xsi:type="int" name="operation_count" unsigned="true" nullable="false" identity="false"
2121
comment="Total number of operations scheduled within this bulk"/>
2222
<column xsi:type="timestamp" name="start_time" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
2323
comment="Bulk start time"/>
@@ -32,7 +32,7 @@
3232
</index>
3333
</table>
3434
<table name="magento_operation" resource="default" engine="innodb" comment="Operation entity">
35-
<column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
35+
<column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true"
3636
comment="Operation ID"/>
3737
<column xsi:type="varbinary" name="bulk_uuid" nullable="true" length="39" comment="Related Bulk UUID"/>
3838
<column xsi:type="varchar" name="topic_name" nullable="true" length="255"
@@ -41,9 +41,9 @@
4141
comment="Data (serialized) required to perform an operation"/>
4242
<column xsi:type="blob" name="result_serialized_data" nullable="true"
4343
comment="Result data (serialized) after perform an operation"/>
44-
<column xsi:type="smallint" name="status" padding="6" unsigned="false" nullable="true" identity="false"
44+
<column xsi:type="smallint" name="status" unsigned="false" nullable="true" identity="false"
4545
default="0" comment="Operation status (OPEN | COMPLETE | RETRIABLY_FAILED | NOT_RETRIABLY_FAILED)"/>
46-
<column xsi:type="smallint" name="error_code" padding="6" unsigned="false" nullable="true" identity="false"
46+
<column xsi:type="smallint" name="error_code" unsigned="false" nullable="true" identity="false"
4747
comment="Code of the error that appeared during operation execution (used to aggregate related failed operations)"/>
4848
<column xsi:type="varchar" name="result_message" nullable="true" length="255"
4949
comment="Operation result message"/>
@@ -59,7 +59,7 @@
5959
</table>
6060
<table name="magento_acknowledged_bulk" resource="default" engine="innodb"
6161
comment="Bulk that was viewed by user from notification area">
62-
<column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
62+
<column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true"
6363
comment="Internal ID"/>
6464
<column xsi:type="varbinary" name="bulk_uuid" nullable="true" length="39" comment="Related Bulk UUID"/>
6565
<constraint xsi:type="primary" referenceId="PRIMARY">

0 commit comments

Comments
 (0)