Skip to content

Commit edfa14b

Browse files
author
Natalia Momotenko
committed
Merge remote-tracking branch 'origin/develop' into UI
2 parents e408dec + 3e8e126 commit edfa14b

File tree

2,295 files changed

+25117
-16341
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,295 files changed

+25117
-16341
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
2222
protected $_countBySeverity = [];
2323

2424
/**
25-
* @param \Magento\Core\Model\EntityFactory $entityFactory
25+
* @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
2626
* @param \Psr\Log\LoggerInterface $logger
2727
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
2828
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -31,7 +31,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
3131
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
3232
*/
3333
public function __construct(
34-
\Magento\Core\Model\EntityFactory $entityFactory,
34+
\Magento\Framework\Data\Collection\EntityFactory $entityFactory,
3535
\Psr\Log\LoggerInterface $logger,
3636
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
3737
\Magento\Framework\Event\ManagerInterface $eventManager,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Baseurl implements \Magento\Framework\Notification\MessageInterface
2121
protected $_config;
2222

2323
/**
24-
* @var \Magento\Store\Model\StoreManagerInterface
24+
* @var \Magento\Framework\Store\StoreManagerInterface
2525
*/
2626
protected $_storeManager;
2727

@@ -32,13 +32,13 @@ class Baseurl implements \Magento\Framework\Notification\MessageInterface
3232

3333
/**
3434
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
35-
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
35+
* @param \Magento\Framework\Store\StoreManagerInterface $storeManager
3636
* @param \Magento\Framework\UrlInterface $urlBuilder
3737
* @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
3838
*/
3939
public function __construct(
4040
\Magento\Framework\App\Config\ScopeConfigInterface $config,
41-
\Magento\Store\Model\StoreManagerInterface $storeManager,
41+
\Magento\Framework\Store\StoreManagerInterface $storeManager,
4242
\Magento\Framework\UrlInterface $urlBuilder,
4343
\Magento\Framework\App\Config\ValueFactory $configValueFactory
4444
) {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
*/
1414
?>
1515
<div data-mage-init='{"modalPopup": {}}' class="fade critical-notification">
16-
<div class="popup popup-<?php echo preg_replace('#[^a-z0-9]+#', '-', strtolower($this->getSeverityText())) ?>">
16+
<div class="popup popup-<?php echo preg_replace('#[^a-z0-9]+#', '-', strtolower($block->getSeverityText())) ?>">
1717
<div class="popup-inner">
1818
<header class="popup-header">
19-
<h2 class="popup-title"><?php echo $this->getHeaderText(); ?></h2>
19+
<h2 class="popup-title"><?php echo $block->getHeaderText(); ?></h2>
2020
</header>
2121
<div class="popup-content">
22-
<span><?php echo $this->getSeverityText();?></span>
23-
<p class="message-text"><?php echo $this->getNoticeMessageText(); ?></p>
22+
<span><?php echo $block->getSeverityText();?></span>
23+
<p class="message-text"><?php echo $block->getNoticeMessageText(); ?></p>
2424

25-
<a href="<?php echo $this->getNoticeMessageUrl(); ?>"><?php echo $this->getReadDetailsText(); ?></a>
25+
<a href="<?php echo $block->getNoticeMessageUrl(); ?>"><?php echo $block->getReadDetailsText(); ?></a>
2626
</div>
2727
<span class="close" data-dismiss="popup" title="<?php echo __('Close popup'); ?>"><?php echo __('Close'); ?></span>
2828
</div>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
// @codingStandardsIgnoreFile
88

99
?>
10-
<?php /** @var $this \Magento\AdminNotification\Block\System\Messages */ ?>
10+
<?php /** @var $block \Magento\AdminNotification\Block\System\Messages */ ?>
1111

12-
<?php $lastCritical = $this->getLastCritical();?>
12+
<?php $lastCritical = $block->getLastCritical();?>
1313
<div id="system_messages" class="message-system<?php if ($lastCritical): ?> message-system-unread<?php endif; ?>">
1414
<div class="message-system-inner">
1515
<?php if ($lastCritical): ?>
@@ -21,13 +21,13 @@
2121
<?php endif; ?>
2222
<div class="message-system-short">
2323
System Messages:
24-
<?php if ($this->getCriticalCount()): ?>
25-
<span class="error"><a href="#" title="<?php echo $this->escapeHtml(__('Critical System Messages'));?>"><?php echo $this->getCriticalCount();?></a></span>
24+
<?php if ($block->getCriticalCount()): ?>
25+
<span class="error"><a href="#" title="<?php echo $block->escapeHtml(__('Critical System Messages'));?>"><?php echo $block->getCriticalCount();?></a></span>
2626
<?php endif;?>
27-
<?php if ($this->getMajorCount()): ?>
28-
<span class="warning"><a href="#" title="<?php echo $this->escapeHtml(__('Major System Messages'));?>"><?php echo $this->getMajorCount();?></a></span>
27+
<?php if ($block->getMajorCount()): ?>
28+
<span class="warning"><a href="#" title="<?php echo $block->escapeHtml(__('Major System Messages'));?>"><?php echo $block->getMajorCount();?></a></span>
2929
<?php endif;?>
3030
</div>
31-
<div id="message-system-all" title="<?php echo $this->escapeHtml(__('System messages'));?>" data-mage-init='<?php echo $this->escapeHtml($this->getSystemMessageDialogJson());?>'></div>
31+
<div id="message-system-all" title="<?php echo $block->escapeHtml(__('System messages'));?>" data-mage-init='<?php echo $block->escapeHtml($block->getSystemMessageDialogJson());?>'></div>
3232
</div>
3333
</div>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
// @codingStandardsIgnoreFile
88

99
?>
10-
<?php /** @var $this \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */ ?>
11-
<div id="system_messages_list" title="<?php echo $this->escapeHtml($this->getPopupTitle()); ?>">
10+
<?php /** @var $block \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */ ?>
11+
<div id="system_messages_list" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
1212
<ul class="message-system-list">
13-
<?php foreach ($this->getUnreadMessages() as $message): ?>
14-
<li class="<?php echo $this->getItemClass($message);?>">
13+
<?php foreach ($block->getUnreadMessages() as $message): ?>
14+
<li class="<?php echo $block->getItemClass($message);?>">
1515
<?php echo $message->getText();?>
1616
</li>
1717
<?php endforeach;?>

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,39 @@
88

99
?>
1010
<?php /** @var $this \Magento\AdminNotification\Block\ToolbarEntry */ ?>
11-
<?php $notificationCount = $this->getUnreadNotificationCount(); ?>
12-
<div data-mage-init='{"toolbarEntry": {}}' class="notifications-summary" data-notification-count="<?php echo $this->escapeHtml($notificationCount); ?>">
11+
<?php $notificationCount = $block->getUnreadNotificationCount(); ?>
12+
<div data-mage-init='{"toolbarEntry": {}}' class="notifications-summary" data-notification-count="<?php echo $block->escapeHtml($notificationCount); ?>">
1313
<?php if ($notificationCount > 0) : ?>
14-
<a href="<?php echo $this->getUrl('adminhtml/notification/index'); ?>" class="action notifications-action" data-mage-init='{"dropdown":{}}' title="<?php echo __('Notifications'); ?>" data-toggle="dropdown">
14+
<a href="<?php echo $block->getUrl('adminhtml/notification/index'); ?>" class="action notifications-action" data-mage-init='{"dropdown":{}}' title="<?php echo __('Notifications'); ?>" data-toggle="dropdown">
1515
<span class="text"><?php echo __('Notifications'); ?></span>
16-
<span class="counter qty"><?php echo $this->escapeHtml($notificationCount); ?></span>
16+
<span class="counter qty"><?php echo $block->escapeHtml($notificationCount); ?></span>
1717
</a>
18-
<ul class="dropdown-menu notifications-list" data-mark-as-read-url="<?php echo $this->getUrl('adminhtml/notification/ajaxMarkAsRead'); ?>">
19-
<?php foreach ($this->getLatestUnreadNotifications() as $notification) : ?>
18+
<ul class="dropdown-menu notifications-list" data-mark-as-read-url="<?php echo $block->getUrl('adminhtml/notification/ajaxMarkAsRead'); ?>">
19+
<?php foreach ($block->getLatestUnreadNotifications() as $notification) : ?>
2020
<?php /** @var $notification \Magento\AdminNotification\Model\Inbox*/ ?>
2121
<li class="notifications-entry<?php if ($notification->getSeverity() == 1): ?> notifications-critical<?php endif; ?>"
22-
data-notification-id="<?php echo $this->escapeHtml($notification->getId()); ?>"
22+
data-notification-id="<?php echo $block->escapeHtml($notification->getId()); ?>"
2323
data-notification-severity="<?php if ($notification->getSeverity() == 1): ?>1<?php endif; ?>">
24-
<strong class="notifications-entry-title"><?php echo $this->escapeHtml($notification->getTitle()); ?></strong>
25-
<span class="notifications-entry-description"><?php echo $this->escapeHtml($notification->getDescription()); ?></span>
26-
<time class="notifications-entry-time"><?php echo $this->escapeHtml($this->formatNotificationDate($notification->getDateAdded())); ?></time>
24+
<strong class="notifications-entry-title"><?php echo $block->escapeHtml($notification->getTitle()); ?></strong>
25+
<span class="notifications-entry-description"><?php echo $block->escapeHtml($notification->getDescription()); ?></span>
26+
<time class="notifications-entry-time"><?php echo $block->escapeHtml($block->formatNotificationDate($notification->getDateAdded())); ?></time>
2727
<button class="action close notifications-close"><span><?php echo __('Close'); ?></span></button>
2828
<div class="notifications-dialog-content" data-title="<?php echo __('Notification'); ?>" data-cancel-caption="<?php echo __('Cancel'); ?>" data-acknowledge-caption="<?php echo __('Acknowledge'); ?>">
29-
<strong class="notifications-entry-title"><?php echo $this->escapeHtml($notification->getTitle()); ?></strong>
30-
<span class="notifications-entry-description"><?php echo $this->escapeHtml($notification->getDescription()); ?></span>
29+
<strong class="notifications-entry-title"><?php echo $block->escapeHtml($notification->getTitle()); ?></strong>
30+
<span class="notifications-entry-description"><?php echo $block->escapeHtml($notification->getDescription()); ?></span>
3131
<div class="actions notifications-entry-actions">
32-
<a class="notifications-url" href="<?php echo $this->escapeUrl($notification->getUrl()); ?>" target="_blank"><?php echo __('Read Details'); ?></a>
32+
<a class="notifications-url" href="<?php echo $block->escapeUrl($notification->getUrl()); ?>" target="_blank"><?php echo __('Read Details'); ?></a>
3333
</div>
34-
<time class="notifications-entry-time"><?php echo $this->escapeHtml($this->formatNotificationDate($notification->getDateAdded())); ?></time>
34+
<time class="notifications-entry-time"><?php echo $block->escapeHtml($block->formatNotificationDate($notification->getDateAdded())); ?></time>
3535
</div>
3636
</li>
3737
<?php endforeach; ?>
3838
<li class="last">
39-
<a href="<?php echo $this->getUrl('adminhtml/notification/index'); ?>" class="action more notification-more"><?php echo __('See All (%1 unread)', $notificationCount); ?></a>
39+
<a href="<?php echo $block->getUrl('adminhtml/notification/index'); ?>" class="action more notification-more"><?php echo __('See All (%1 unread)', $notificationCount); ?></a>
4040
</li>
4141
</ul>
4242
<?php else : ?>
43-
<a href="<?php echo $this->getUrl('adminhtml/notification/index'); ?>" class="action notifications-action empty" title="<?php echo __('Notifications'); ?>">
43+
<a href="<?php echo $block->getUrl('adminhtml/notification/index'); ?>" class="action notifications-action empty" title="<?php echo __('Notifications'); ?>">
4444
<span class="text"><?php echo __('Notifications'); ?></span>
4545
</a>
4646
<?php endif; ?>

‎app/code/Magento/Backend/App/Router.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class Router extends \Magento\Core\App\Router\Base
5353
* @param \Magento\Framework\App\ResponseFactory $responseFactory
5454
* @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
5555
* @param \Magento\Framework\UrlInterface $url
56-
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
56+
* @param \Magento\Framework\Store\StoreManagerInterface $storeManager
5757
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
5858
* @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
5959
* @param string $routerId
@@ -70,7 +70,7 @@ public function __construct(
7070
\Magento\Framework\App\ResponseFactory $responseFactory,
7171
\Magento\Framework\App\Route\ConfigInterface $routeConfig,
7272
\Magento\Framework\UrlInterface $url,
73-
\Magento\Store\Model\StoreManagerInterface $storeManager,
73+
\Magento\Framework\Store\StoreManagerInterface $storeManager,
7474
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
7575
\Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
7676
$routerId,

‎app/code/Magento/Backend/Block/Dashboard.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected function _prepareLayout()
3131

3232
$this->addChild('sales', 'Magento\Backend\Block\Dashboard\Sales');
3333

34-
if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
34+
if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
3535
$block = $this->getLayout()->createBlock('Magento\Backend\Block\Dashboard\Diagrams');
3636
} else {
3737
$block = $this->getLayout()->createBlock(

‎app/code/Magento/Backend/Block/Dashboard/Graph.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ public function getChartUrl($directUrl = true)
210210

211211
$timezoneLocal = $this->_scopeConfig->getValue(
212212
$this->_localeDate->getDefaultTimezonePath(),
213-
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
213+
\Magento\Framework\Store\ScopeInterface::SCOPE_STORE
214214
);
215215

216216
list($dateStart, $dateEnd) = $this->_collectionFactory->create()->getDateRange(

‎app/code/Magento/Backend/Block/Page/Header.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,6 @@ public function getLogoutLink()
8080
*/
8181
public function displayNoscriptNotice()
8282
{
83-
return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
83+
return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
8484
}
8585
}

0 commit comments

Comments
 (0)