Skip to content

Commit 68e7517

Browse files
omiroshnichenkoomiroshnichenko
committed
Merge branch '2.3-develop' of github.com:magento/magento2ce into MAGETWO-87255
2 parents 1346459 + 1dcb55d commit 68e7517

File tree

965 files changed

+63014
-32039
lines changed

Some content is hidden

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

965 files changed

+63014
-32039
lines changed

‎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/Authorization/Setup/InstallSchema.php

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

0 commit comments

Comments
 (0)