Skip to content

Commit e7b699f

Browse files
author
Robert He
committed
Merge branch 'develop' into FearlessKiwis-MAGETWO-43908-rename_weee_functions
2 parents e6e90c8 + fa9c569 commit e7b699f

File tree

3,486 files changed

+89785
-84266
lines changed

Some content is hidden

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

3,486 files changed

+89785
-84266
lines changed

‎app/code/Magento/AdminNotification/Block/System/Messages.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class Messages extends \Magento\Backend\Block\Template
1010
/**
1111
* Message list
1212
*
13-
* @var \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized
13+
* @var \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized
1414
*/
1515
protected $_messages;
1616

@@ -21,13 +21,13 @@ class Messages extends \Magento\Backend\Block\Template
2121

2222
/**
2323
* @param \Magento\Backend\Block\Template\Context $context
24-
* @param \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages
24+
* @param \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized $messages
2525
* @param \Magento\Framework\Json\Helper\Data $jsonHelper
2626
* @param array $data
2727
*/
2828
public function __construct(
2929
\Magento\Backend\Block\Template\Context $context,
30-
\Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages,
30+
\Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized $messages,
3131
\Magento\Framework\Json\Helper\Data $jsonHelper,
3232
array $data = []
3333
) {

‎app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ class UnreadMessagePopup extends \Magento\Backend\Block\Template
2222
/**
2323
* System Message list
2424
*
25-
* @var \Magento\AdminNotification\Model\Resource\System\Message\Collection
25+
* @var \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection
2626
*/
2727
protected $_messages;
2828

2929
/**
3030
* @param \Magento\Backend\Block\Template\Context $context
31-
* @param \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages
31+
* @param \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized $messages
3232
* @param array $data
3333
*/
3434
public function __construct(
3535
\Magento\Backend\Block\Template\Context $context,
36-
\Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages,
36+
\Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized $messages,
3737
array $data = []
3838
) {
3939
parent::__construct($context, $data);

‎app/code/Magento/AdminNotification/Block/ToolbarEntry.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ class ToolbarEntry extends \Magento\Backend\Block\Template
3333
/**
3434
* Collection of latest unread notifications
3535
*
36-
* @var \Magento\AdminNotification\Model\Resource\Inbox\Collection
36+
* @var \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
3737
*/
3838
protected $_notificationList;
3939

4040
/**
4141
* @param \Magento\Backend\Block\Template\Context $context
42-
* @param \Magento\AdminNotification\Model\Resource\Inbox\Collection\Unread $notificationList
42+
* @param \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Unread $notificationList
4343
* @param array $data
4444
*/
4545
public function __construct(
4646
\Magento\Backend\Block\Template\Context $context,
47-
\Magento\AdminNotification\Model\Resource\Inbox\Collection\Unread $notificationList,
47+
\Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Unread $notificationList,
4848
array $data = []
4949
) {
5050
parent::__construct($context, $data);
@@ -84,7 +84,7 @@ public function getUnreadNotificationCount()
8484
/**
8585
* Retrieve the list of latest unread notifications
8686
*
87-
* @return \Magento\AdminNotification\Model\Resource\Inbox\Collection
87+
* @return \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
8888
*/
8989
public function getLatestUnreadNotifications()
9090
{

‎app/code/Magento/AdminNotification/Block/Window.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class Window extends \Magento\Backend\Block\Template
3131
/**
3232
* Critical messages collection
3333
*
34-
* @var \Magento\AdminNotification\Model\Resource\Inbox\Collection
34+
* @var \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
3535
*/
3636
protected $_criticalCollection;
3737

@@ -51,13 +51,13 @@ class Window extends \Magento\Backend\Block\Template
5151
/**
5252
* @param \Magento\Backend\Block\Template\Context $context
5353
* @param \Magento\Backend\Model\Auth\Session $authSession
54-
* @param \Magento\AdminNotification\Model\Resource\Inbox\Collection\Critical $criticalCollection
54+
* @param \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Critical $criticalCollection
5555
* @param array $data
5656
*/
5757
public function __construct(
5858
\Magento\Backend\Block\Template\Context $context,
5959
\Magento\Backend\Model\Auth\Session $authSession,
60-
\Magento\AdminNotification\Model\Resource\Inbox\Collection\Critical $criticalCollection,
60+
\Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Critical $criticalCollection,
6161
array $data = []
6262
) {
6363
parent::__construct($context, $data);

‎app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class ListAction extends \Magento\Backend\App\AbstractAction
1414
protected $jsonHelper;
1515

1616
/**
17-
* @var \Magento\AdminNotification\Model\Resource\System\Message\Collection
17+
* @var \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection
1818
*/
1919
protected $messageCollection;
2020

@@ -23,12 +23,12 @@ class ListAction extends \Magento\Backend\App\AbstractAction
2323
*
2424
* @param \Magento\Backend\App\Action\Context $context
2525
* @param \Magento\Framework\Json\Helper\Data $jsonHelper
26-
* @param \Magento\AdminNotification\Model\Resource\System\Message\Collection $messageCollection
26+
* @param \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection $messageCollection
2727
*/
2828
public function __construct(
2929
\Magento\Backend\App\Action\Context $context,
3030
\Magento\Framework\Json\Helper\Data $jsonHelper,
31-
\Magento\AdminNotification\Model\Resource\System\Message\Collection $messageCollection
31+
\Magento\AdminNotification\Model\ResourceModel\System\Message\Collection $messageCollection
3232
) {
3333
$this->jsonHelper = $jsonHelper;
3434
$this->messageCollection = $messageCollection;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class Feed extends \Magento\Framework\Model\AbstractModel
7272
* @param \Magento\Framework\App\DeploymentConfig $deploymentConfig
7373
* @param \Magento\Framework\App\ProductMetadataInterface $productMetadata
7474
* @param \Magento\Framework\UrlInterface $urlBuilder
75-
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
75+
* @param \Magento\Framework\Model\ModelResource\AbstractResource $resource
7676
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
7777
* @param array $data
7878
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -86,7 +86,7 @@ public function __construct(
8686
\Magento\Framework\App\DeploymentConfig $deploymentConfig,
8787
\Magento\Framework\App\ProductMetadataInterface $productMetadata,
8888
\Magento\Framework\UrlInterface $urlBuilder,
89-
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
89+
\Magento\Framework\Model\ModelResource\AbstractResource $resource = null,
9090
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
9191
array $data = []
9292
) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
/**
1313
* AdminNotification Inbox model
1414
*
15-
* @method \Magento\AdminNotification\Model\Resource\Inbox _getResource()
16-
* @method \Magento\AdminNotification\Model\Resource\Inbox getResource()
15+
* @method \Magento\AdminNotification\Model\ResourceModel\Inbox _getResource()
16+
* @method \Magento\AdminNotification\Model\ResourceModel\Inbox getResource()
1717
* @method int getSeverity()
1818
* @method \Magento\AdminNotification\Model\Inbox setSeverity(int $value)
1919
* @method string getDateAdded()
@@ -38,7 +38,7 @@ class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierIn
3838
*/
3939
protected function _construct()
4040
{
41-
$this->_init('Magento\AdminNotification\Model\Resource\Inbox');
41+
$this->_init('Magento\AdminNotification\Model\ResourceModel\Inbox');
4242
}
4343

4444
/**

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

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

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

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

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

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

0 commit comments

Comments
 (0)