Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 9573d88

Browse files
RomaKisRomaKis
committed
Merge remote-tracking branch 'magento2/2.3-develop' into msi-core-changes-no-history
# Conflicts: # app/code/Magento/CatalogImportExport/Model/Import/Product.php # app/code/Magento/Store/Setup/InstallSchema.php # app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js # app/etc/di.xml # composer.lock
2 parents 13efce8 + 47267e6 commit 9573d88

File tree

1,822 files changed

+83249
-45273
lines changed

Some content is hidden

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

1,822 files changed

+83249
-45273
lines changed

‎COPYING.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright © 2013-2017 Magento, Inc.
1+
Copyright © 2013-2018 Magento, Inc.
22

33
Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
44

‎README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@ To suggest documentation improvements, click [here][4].
3838
| ![reject](http://devdocs.magento.com/common/images/github_reject.png) | The pull request has been rejected and will not be merged into mainline code. Possible reasons can include but are not limited to: issue has already been fixed in another code contribution, or there is an issue with the code contribution. |
3939
| ![bug report](http://devdocs.magento.com/common/images/github_bug.png) | The Magento Team has confirmed that this issue contains the minimum required information to reproduce. |
4040
| ![acknowledged](http://devdocs.magento.com/common/images/gitHub_acknowledged.png) | The Magento Team has validated the issue and an internal ticket has been created. |
41-
| ![acknowledged](http://devdocs.magento.com/common/images/github_inProgress.png) | The internal ticket is currently in progress, fix is scheduled to be delivered. |
42-
| ![acknowledged](http://devdocs.magento.com/common/images/github_needsUpdate.png) | The Magento Team needs additional information from the reporter to properly prioritize and process the issue or pull request. |
41+
| ![in progress](http://devdocs.magento.com/common/images/github_inProgress.png) | The internal ticket is currently in progress, fix is scheduled to be delivered. |
42+
| ![needs update](http://devdocs.magento.com/common/images/github_needsUpdate.png) | The Magento Team needs additional information from the reporter to properly prioritize and process the issue or pull request. |
43+
44+
To learn more about issue gate labels click [here](https://github.com/magento/magento2/wiki/Magento-Issue-Gates)
4345

4446
<h2>Reporting security issues</h2>
4547

‎app/bootstrap.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,13 @@
4949
unset($_SERVER['ORIG_PATH_INFO']);
5050
}
5151

52-
if (!empty($_SERVER['MAGE_PROFILER'])
52+
if (
53+
(!empty($_SERVER['MAGE_PROFILER']) || file_exists(BP . '/var/profiler.flag'))
5354
&& isset($_SERVER['HTTP_ACCEPT'])
5455
&& strpos($_SERVER['HTTP_ACCEPT'], 'text/html') !== false
5556
) {
5657
\Magento\Framework\Profiler::applyConfig(
57-
$_SERVER['MAGE_PROFILER'],
58+
(isset($_SERVER['MAGE_PROFILER']) && strlen($_SERVER['MAGE_PROFILER'])) ? $_SERVER['MAGE_PROFILER'] : trim(file_get_contents(BP . '/var/profiler.flag')),
5859
BP,
5960
!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest'
6061
);

‎app/code/Magento/AdminNotification/Model/Feed.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,6 @@ public function getFeedData()
214214
);
215215
$curl->write(\Zend_Http_Client::GET, $this->getFeedUrl(), '1.0');
216216
$data = $curl->read();
217-
if ($data === false) {
218-
return false;
219-
}
220217
$data = preg_split('/^\r?$/m', $data, 2);
221218
$data = trim($data[1]);
222219
$curl->close();

‎app/code/Magento/AdminNotification/Setup/InstallSchema.php

Lines changed: 0 additions & 124 deletions
This file was deleted.

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

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
10+
<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"
12+
comment="Notification id"/>
13+
<column xsi:type="smallint" name="severity" padding="5" unsigned="true" nullable="false" identity="false"
14+
default="0" comment="Problem type"/>
15+
<column xsi:type="timestamp" name="date_added" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
16+
comment="Create date"/>
17+
<column xsi:type="varchar" name="title" nullable="false" length="255" comment="Title"/>
18+
<column xsi:type="text" name="description" nullable="true" comment="Description"/>
19+
<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"
21+
default="0" comment="Flag if notification read"/>
22+
<column xsi:type="smallint" name="is_remove" padding="5" unsigned="true" nullable="false" identity="false"
23+
default="0" comment="Flag if notification might be removed"/>
24+
<constraint xsi:type="primary" name="PRIMARY">
25+
<column name="notification_id"/>
26+
</constraint>
27+
<index name="ADMINNOTIFICATION_INBOX_SEVERITY" indexType="btree">
28+
<column name="severity"/>
29+
</index>
30+
<index name="ADMINNOTIFICATION_INBOX_IS_READ" indexType="btree">
31+
<column name="is_read"/>
32+
</index>
33+
<index name="ADMINNOTIFICATION_INBOX_IS_REMOVE" indexType="btree">
34+
<column name="is_remove"/>
35+
</index>
36+
</table>
37+
<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"/>
39+
<column xsi:type="smallint" name="severity" padding="5" unsigned="true" nullable="false" identity="false"
40+
default="0" comment="Problem type"/>
41+
<column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
42+
comment="Create date"/>
43+
<constraint xsi:type="primary" name="PRIMARY">
44+
<column name="identity"/>
45+
</constraint>
46+
</table>
47+
</schema>

‎app/code/Magento/AdminNotification/etc/db_schema_whitelist.json

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"adminnotification_inbox": {
3+
"column": {
4+
"notification_id": true,
5+
"severity": true,
6+
"date_added": true,
7+
"title": true,
8+
"description": true,
9+
"url": true,
10+
"is_read": true,
11+
"is_remove": true
12+
},
13+
"index": {
14+
"ADMINNOTIFICATION_INBOX_SEVERITY": true,
15+
"ADMINNOTIFICATION_INBOX_IS_READ": true,
16+
"ADMINNOTIFICATION_INBOX_IS_REMOVE": true
17+
},
18+
"constraint": {
19+
"PRIMARY": true
20+
}
21+
},
22+
"admin_system_messages": {
23+
"column": {
24+
"identity": true,
25+
"severity": true,
26+
"created_at": true
27+
},
28+
"constraint": {
29+
"PRIMARY": true
30+
}
31+
}
32+
}

‎app/code/Magento/Analytics/Model/Config/Backend/CollectionTime.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ public function afterSave()
6666
$result = preg_match('#(?<hour>\d{2}),(?<min>\d{2}),(?<sec>\d{2})#', $this->getValue(), $time);
6767

6868
if (!$result) {
69-
throw new LocalizedException(__('Time value has an unsupported format'));
69+
throw new LocalizedException(
70+
__('The time value is using an unsupported format. Enter a supported format and try again.')
71+
);
7072
}
7173

7274
$cronExprArray = [

‎app/code/Magento/Analytics/Model/Connector/Http/JsonConverter.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ class JsonConverter implements ConverterInterface
2222
*/
2323
private $serializer;
2424

25+
/**
26+
* @param Json $serializer
27+
*/
2528
public function __construct(Json $serializer)
2629
{
2730
$this->serializer = $serializer;

‎app/code/Magento/Analytics/Model/Cryptographer.php

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,18 @@ public function encode($source)
5656
try {
5757
$source = (string)$source;
5858
} catch (\Exception $e) {
59-
throw new LocalizedException(__('Input data must be string or convertible into string.'));
59+
throw new LocalizedException(
60+
__(
61+
'The data is invalid. '
62+
. 'Enter the data as a string or data that can be converted into a string and try again.'
63+
)
64+
);
6065
}
6166
} elseif (!$source) {
62-
throw new LocalizedException(__('Input data must be non-empty string.'));
67+
throw new LocalizedException(__('The data is invalid. Enter the data as a string and try again.'));
6368
}
6469
if (!$this->validateCipherMethod($this->cipherMethod)) {
65-
throw new LocalizedException(__('Not valid cipher method.'));
70+
throw new LocalizedException(__('The data is invalid. Use a valid cipher method and try again.'));
6671
}
6772
$initializationVector = $this->getInitializationVector();
6873

@@ -90,7 +95,7 @@ private function getKey()
9095
{
9196
$token = $this->analyticsToken->getToken();
9297
if (!$token) {
93-
throw new LocalizedException(__('Encryption key can\'t be empty.'));
98+
throw new LocalizedException(__('Enter the encryption key and try again.'));
9499
}
95100
return hash('sha256', $token);
96101
}

0 commit comments

Comments
 (0)