Skip to content

Commit 9b22e89

Browse files
ishakhsuvarovishakhsuvarov
committed
MAGETWO-69895: Merge branch 'develop' of github.com:magento/magento2 into MAGETWO-69895-PR-9955
2 parents 1df66a7 + f215f3d commit 9b22e89

File tree

2,785 files changed

+52247
-16157
lines changed

Some content is hidden

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

2,785 files changed

+52247
-16157
lines changed

‎.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
sudo: required
22
dist: trusty
3+
group: edge
34
addons:
45
apt:
56
packages:

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
*/
88
namespace Magento\AdminNotification\Controller\Adminhtml;
99

10+
/**
11+
* @api
12+
*/
1013
abstract class Notification extends \Magento\Backend\App\AbstractAction
1114
{
1215
/**

‎app/code/Magento/AdminNotification/Model/Config/Source/Frequency.php

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* AdminNotification update frequency source
1010
*
1111
* @codeCoverageIgnore
12+
* @api
1213
*/
1314
class Frequency implements \Magento\Framework\Option\ArrayInterface
1415
{

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

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
*
1313
* @author Magento Core Team <[email protected]>
1414
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
15+
* @api
1516
*/
1617
class Feed extends \Magento\Framework\Model\AbstractModel
1718
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* @method int getIsRemove()
3030
* @method \Magento\AdminNotification\Model\Inbox setIsRemove(int $value)
3131
*
32-
* @author Magento Core Team <[email protected]>
32+
* @api
3333
*/
3434
class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierInterface, InboxInterface
3535
{

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

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* AdminNotification Inbox interface
1010
*
1111
* @author Magento Core Team <[email protected]>
12+
* @api
1213
*/
1314
interface InboxInterface
1415
{

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

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* Notification service model
1010
*
1111
* @author Magento Core Team <[email protected]>
12+
* @api
1213
*/
1314
class NotificationService
1415
{

‎app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
*/
1212
namespace Magento\AdminNotification\Model\ResourceModel\Grid;
1313

14+
/**
15+
* @api
16+
*/
1417
class Collection extends \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
1518
{
1619
/**

‎app/code/Magento/AdminNotification/Model/ResourceModel/Inbox.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
namespace Magento\AdminNotification\Model\ResourceModel;
77

88
/**
9-
* AdminNotification Inbox model
10-
*
11-
* @author Magento Core Team <[email protected]>
9+
* @api
1210
*/
1311
class Inbox extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
1412
{

‎app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*
1111
* @api
1212
* @author Magento Core Team <[email protected]>
13+
* @api
1314
*/
1415
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
1516
{

‎app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Critical.php

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
*/
88
namespace Magento\AdminNotification\Model\ResourceModel\Inbox\Collection;
99

10+
/**
11+
* @api
12+
*/
1013
class Critical extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
1114
{
1215
/**

‎app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Unread.php

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
*/
1212
namespace Magento\AdminNotification\Model\ResourceModel\Inbox\Collection;
1313

14+
/**
15+
* @api
16+
*/
1417
class Unread extends \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
1518
{
1619
/**

‎app/code/Magento/AdminNotification/Model/ResourceModel/System/Message.php

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\AdminNotification\Model\ResourceModel\System;
77

8+
/**
9+
* @api
10+
*/
811
class Message extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
912
{
1013
/**

‎app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection.php

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\AdminNotification\Model\ResourceModel\System\Message;
77

8+
/**
9+
* @api
10+
*/
811
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
912
{
1013
/**

‎app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection/Synchronized.php

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\AdminNotification\Model\ResourceModel\System\Message\Collection;
77

8+
/**
9+
* @api
10+
*/
811
class Synchronized extends \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection
912
{
1013
/**

‎app/code/Magento/AdminNotification/Model/System/Message.php

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
/**
99
* @codeCoverageIgnore
10+
* @api
1011
*/
1112
class Message extends \Magento\Framework\Model\AbstractModel implements \Magento\Framework\Notification\MessageInterface
1213
{

‎app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\AdminNotification\Model\System\Message;
77

8+
/**
9+
* @api
10+
*/
811
class CacheOutdated implements \Magento\Framework\Notification\MessageInterface
912
{
1013
/**

‎app/code/Magento/AdminNotification/Model/System/Message/Media/AbstractSynchronization.php

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\AdminNotification\Model\System\Message\Media;
77

8+
/**
9+
* @api
10+
*/
811
abstract class AbstractSynchronization implements \Magento\Framework\Notification\MessageInterface
912
{
1013
/**

‎app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66

77
namespace Magento\AdminNotification\Model\System\Message\Media\Synchronization;
88

9+
/**
10+
* @api
11+
*/
912
class Error extends \Magento\AdminNotification\Model\System\Message\Media\AbstractSynchronization
1013
{
1114
/**

‎app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\AdminNotification\Model\System\Message\Media\Synchronization;
77

8+
/**
9+
* @api
10+
*/
811
class Success extends \Magento\AdminNotification\Model\System\Message\Media\AbstractSynchronization
912
{
1013
/**

‎app/code/Magento/AdminNotification/Model/System/Message/Security.php

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88

99
use Magento\Store\Model\Store;
1010

11+
/**
12+
* @api
13+
*/
1114
class Security implements \Magento\Framework\Notification\MessageInterface
1215
{
1316
/**

‎app/code/Magento/AdminNotification/Ui/Component/DataProvider/DataProvider.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\SynchronizedFactory;
1010

1111
/**
12-
* Class DataProvider
12+
* @api
1313
*/
1414
class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
1515
{

‎app/code/Magento/AdminNotification/registration.php

+3-5
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_AdminNotification',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AdminNotification', __DIR__);

‎app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
"autoOpen": true,
2020
"buttons": false,
2121
"modalClass": "modal-system-messages",
22-
"title": "<?php /* @escapeNotVerified */ echo $block->getHeaderText(); ?>"
22+
"title": "<?= /* @escapeNotVerified */ $block->getHeaderText() ?>"
2323
}
2424
}'>
2525
<li class="message message-warning warning">
26-
<?php /* @escapeNotVerified */ echo $block->getNoticeMessageText(); ?><br/>
27-
<a href="<?php /* @escapeNotVerified */ echo $block->getNoticeMessageUrl(); ?>"><?php /* @escapeNotVerified */ echo $block->getReadDetailsText(); ?></a>
26+
<?= /* @escapeNotVerified */ $block->getNoticeMessageText() ?><br/>
27+
<a href="<?= /* @escapeNotVerified */ $block->getNoticeMessageUrl() ?>"><?= /* @escapeNotVerified */ $block->getReadDetailsText() ?></a>
2828
</li>
2929
</ul>

‎app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml

+7-7
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,31 @@
1515
<?php if ($lastCritical): ?>
1616
<ul class="message-system-list">
1717
<li class="message message-warning error">
18-
<?php /* @escapeNotVerified */ echo $lastCritical->getText();?>
18+
<?= /* @escapeNotVerified */ $lastCritical->getText() ?>
1919
</li>
2020
</ul>
2121
<?php endif; ?>
2222
<div class="message-system-short">
2323
<span class="message-system-short-label">
24-
<?php /* @escapeNotVerified */ echo __('System Messages:')?>
24+
<?= /* @escapeNotVerified */ __('System Messages:') ?>
2525
</span>
2626

2727
<?php if ($block->getCriticalCount()): ?>
2828
<div class="message message-warning error">
29-
<a class="message-link" href="#" title="<?php echo $block->escapeHtml(__('Critical System Messages'));?>">
30-
<?php /* @escapeNotVerified */ echo $block->getCriticalCount();?>
29+
<a class="message-link" href="#" title="<?= $block->escapeHtml(__('Critical System Messages')) ?>">
30+
<?= /* @escapeNotVerified */ $block->getCriticalCount() ?>
3131
</a>
3232
</div>
3333
<?php endif;?>
3434

3535
<?php if ($block->getMajorCount()): ?>
3636
<div class="message message-warning warning">
37-
<a class="message-link" href="#" title="<?php echo $block->escapeHtml(__('Major System Messages'));?>">
38-
<?php /* @escapeNotVerified */ echo $block->getMajorCount();?>
37+
<a class="message-link" href="#" title="<?= $block->escapeHtml(__('Major System Messages')) ?>">
38+
<?= /* @escapeNotVerified */ $block->getMajorCount() ?>
3939
</a>
4040
</div>
4141
<?php endif;?>
4242
</div>
43-
<div id="message-system-all" title="<?php echo $block->escapeHtml(__('System messages'));?>" data-mage-init='<?php echo $block->escapeHtml($block->getSystemMessageDialogJson());?>'></div>
43+
<div id="message-system-all" title="<?= $block->escapeHtml(__('System messages')) ?>" data-mage-init='<?= $block->escapeHtml($block->getSystemMessageDialogJson()) ?>'></div>
4444
</div>
4545
</div>

‎app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
?>
1010
<?php /** @var $block \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */ ?>
1111

12-
<div style="display:none" id="system_messages_list" data-role="system_messages_list" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
12+
<div style="display:none" id="system_messages_list" data-role="system_messages_list" title="<?= $block->escapeHtml($block->getPopupTitle()) ?>">
1313
<ul class="message-system-list messages">
1414
<?php foreach ($block->getUnreadMessages() as $message): ?>
15-
<li class="message message-warning <?php /* @escapeNotVerified */ echo $block->getItemClass($message);?>">
16-
<?php /* @escapeNotVerified */ echo $message->getText();?>
15+
<li class="message message-warning <?= /* @escapeNotVerified */ $block->getItemClass($message) ?>">
16+
<?= /* @escapeNotVerified */ $message->getText() ?>
1717
</li>
1818
<?php endforeach;?>
1919
</ul>

‎app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml

+16-16
Original file line numberDiff line numberDiff line change
@@ -15,70 +15,70 @@
1515
<div
1616
data-mage-init='{"toolbarEntry": {}}'
1717
class="notifications-wrapper admin__action-dropdown-wrap"
18-
data-notification-count="<?php /* @escapeNotVerified */ echo $notificationCount; ?>">
18+
data-notification-count="<?= /* @escapeNotVerified */ $notificationCount ?>">
1919
<?php if ($notificationCount > 0) : ?>
2020
<a
21-
href="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml/notification/index'); ?>"
21+
href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/notification/index') ?>"
2222
class="notifications-action admin__action-dropdown"
2323
data-mage-init='{"dropdown":{}}'
24-
title="<?php /* @escapeNotVerified */ echo __('Notifications'); ?>"
24+
title="<?= /* @escapeNotVerified */ __('Notifications') ?>"
2525
data-toggle="dropdown">
2626
<span class="notifications-counter">
27-
<?php /* @escapeNotVerified */ echo ($notificationCount > $notificationCounterMax) ? $notificationCounterMax . '+' : $notificationCount; ?>
27+
<?= /* @escapeNotVerified */ ($notificationCount > $notificationCounterMax) ? $notificationCounterMax . '+' : $notificationCount ?>
2828
</span>
2929
</a>
3030
<ul
3131
class="admin__action-dropdown-menu"
32-
data-mark-as-read-url="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml/notification/ajaxMarkAsRead'); ?>">
32+
data-mark-as-read-url="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/notification/ajaxMarkAsRead') ?>">
3333
<?php foreach ($block->getLatestUnreadNotifications() as $notification) : ?>
3434
<?php /** @var $notification \Magento\AdminNotification\Model\Inbox*/ ?>
3535
<li class="notifications-entry<?php if ($notification->getSeverity() == 1): ?> notifications-critical<?php endif; ?>"
36-
data-notification-id="<?php /* @escapeNotVerified */ echo $notification->getId(); ?>"
36+
data-notification-id="<?= /* @escapeNotVerified */ $notification->getId() ?>"
3737
data-notification-severity="<?php if ($notification->getSeverity() == 1): ?>1<?php endif; ?>">
3838
<?php
3939
$notificationDescription = $block->escapeHtml($notification->getDescription());
4040
$notificationDescriptionLength = $block->getNotificationDescriptionLength();
4141
?>
4242
<strong class="notifications-entry-title">
43-
<?php echo $block->escapeHtml($notification->getTitle()); ?>
43+
<?= $block->escapeHtml($notification->getTitle()) ?>
4444
</strong>
4545
<?php if (strlen($notificationDescription) > $notificationDescriptionLength) : ?>
4646
<p class="notifications-entry-description _cutted">
4747
<span class="notifications-entry-description-start">
48-
<?php /* @escapeNotVerified */ echo substr($notificationDescription, 0, $notificationDescriptionLength); ?>
48+
<?= /* @escapeNotVerified */ substr($notificationDescription, 0, $notificationDescriptionLength) ?>
4949
</span>
5050
<span class="notifications-entry-description-end">
51-
<?php /* @escapeNotVerified */ echo substr($notificationDescription, $notificationDescriptionLength); ?>
51+
<?= /* @escapeNotVerified */ substr($notificationDescription, $notificationDescriptionLength) ?>
5252
</span>
5353
</p>
5454
<?php else : ?>
5555
<p class="notifications-entry-description">
56-
<?php /* @escapeNotVerified */ echo $notificationDescription; ?>
56+
<?= /* @escapeNotVerified */ $notificationDescription ?>
5757
</p>
5858
<?php endif; ?>
5959
<time class="notifications-entry-time">
60-
<?php /* @escapeNotVerified */ echo $block->formatNotificationDate($notification->getDateAdded()); ?>
60+
<?= /* @escapeNotVerified */ $block->formatNotificationDate($notification->getDateAdded()) ?>
6161
</time>
6262
<button
6363
type="button"
6464
class="notifications-close"
65-
title="<?php /* @escapeNotVerified */ echo __('Close'); ?>"
65+
title="<?= /* @escapeNotVerified */ __('Close') ?>"
6666
></button>
6767
</li>
6868
<?php endforeach; ?>
6969
<li class="notifications-entry notifications-entry-last">
7070
<a
71-
href="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml/notification/index'); ?>"
71+
href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/notification/index') ?>"
7272
class="action-tertiary action-more">
73-
<?php /* @escapeNotVerified */ echo __('See All (') ?><span class="notifications-counter"><?php /* @escapeNotVerified */ echo $notificationCount ?></span><?php /* @escapeNotVerified */ echo __(' unread)'); ?>
73+
<?= /* @escapeNotVerified */ __('See All (') ?><span class="notifications-counter"><?= /* @escapeNotVerified */ $notificationCount ?></span><?= /* @escapeNotVerified */ __(' unread)') ?>
7474
</a>
7575
</li>
7676
</ul>
7777
<?php else : ?>
7878
<a
7979
class="notifications-action admin__action-dropdown"
80-
href="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml/notification/index'); ?>"
81-
title="<?php /* @escapeNotVerified */ echo __('Notifications'); ?>">
80+
href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/notification/index') ?>"
81+
title="<?= /* @escapeNotVerified */ __('Notifications') ?>">
8282
</a>
8383
<?php endif; ?>
8484
</div>

‎app/code/Magento/AdminNotification/view/adminhtml/web/js/grid/columns/message.js

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
6+
/**
7+
* @api
8+
*/
59
define([
610
'Magento_Ui/js/grid/columns/column',
711
'underscore'

‎app/code/Magento/AdminNotification/view/adminhtml/web/js/grid/listing.js

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* See COPYING.txt for license details.
44
*/
55

6+
/**
7+
* @api
8+
*/
69
define([
710
'Magento_Ui/js/grid/listing',
811
'Magento_Ui/js/lib/spinner',

0 commit comments

Comments
 (0)