Skip to content

Commit 71cf26f

Browse files
author
Sergii Kovalenko
committed
MAGETWO-71231: Remove AR code from 2.2.0 --fix merge conflict
2 parents 644dd7b + e2f7eec commit 71cf26f

File tree

8,250 files changed

+2277
-62894
lines changed

Some content is hidden

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

8,250 files changed

+2277
-62894
lines changed

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,18 @@
1111
/**
1212
* Class \Magento\AdminNotification\Block\Grid\Renderer\Actions
1313
*
14-
* @since 2.0.0
1514
*/
1615
class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
1716
{
1817
/**
1918
* @var \Magento\Framework\Url\Helper\Data
20-
* @since 2.0.0
2119
*/
2220
protected $_urlHelper;
2321

2422
/**
2523
* @param \Magento\Backend\Block\Context $context
2624
* @param \Magento\Framework\Url\Helper\Data $urlHelper
2725
* @param array $data
28-
* @since 2.0.0
2926
*/
3027
public function __construct(
3128
\Magento\Backend\Block\Context $context,
@@ -41,7 +38,6 @@ public function __construct(
4138
*
4239
* @param \Magento\Framework\DataObject $row
4340
* @return string
44-
* @since 2.0.0
4541
*/
4642
public function render(\Magento\Framework\DataObject $row)
4743
{

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Notice.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
/**
1111
* Class \Magento\AdminNotification\Block\Grid\Renderer\Notice
1212
*
13-
* @since 2.0.0
1413
*/
1514
class Notice extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
1615
{
@@ -19,7 +18,6 @@ class Notice extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
1918
*
2019
* @param \Magento\Framework\DataObject $row
2120
* @return string
22-
* @since 2.0.0
2321
*/
2422
public function render(\Magento\Framework\DataObject $row)
2523
{

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Severity.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,18 @@
1212
/**
1313
* Class \Magento\AdminNotification\Block\Grid\Renderer\Severity
1414
*
15-
* @since 2.0.0
1615
*/
1716
class Severity extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
1817
{
1918
/**
2019
* @var \Magento\AdminNotification\Model\Inbox
21-
* @since 2.0.0
2220
*/
2321
protected $_notice;
2422

2523
/**
2624
* @param \Magento\Backend\Block\Context $context
2725
* @param \Magento\AdminNotification\Model\Inbox $notice
2826
* @param array $data
29-
* @since 2.0.0
3027
*/
3128
public function __construct(
3229
\Magento\Backend\Block\Context $context,
@@ -42,7 +39,6 @@ public function __construct(
4239
*
4340
* @param \Magento\Framework\DataObject $row
4441
* @return string
45-
* @since 2.0.0
4642
*/
4743
public function render(\Magento\Framework\DataObject $row)
4844
{

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@
99

1010
/**
1111
* @api
12-
* @since 2.0.0
1312
*/
1413
class Inbox extends \Magento\Backend\Block\Widget\Grid\Container
1514
{
1615
/**
1716
* @return void
18-
* @since 2.0.0
1917
*/
2018
protected function _construct()
2119
{

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,18 @@
88
/**
99
* Class \Magento\AdminNotification\Block\System\Messages
1010
*
11-
* @since 2.0.0
1211
*/
1312
class Messages extends \Magento\Backend\Block\Template
1413
{
1514
/**
1615
* Message list
1716
*
1817
* @var \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized
19-
* @since 2.0.0
2018
*/
2119
protected $_messages;
2220

2321
/**
2422
* @var \Magento\Framework\Json\Helper\Data
25-
* @since 2.0.0
2623
*/
2724
protected $jsonHelper;
2825

@@ -31,7 +28,6 @@ class Messages extends \Magento\Backend\Block\Template
3128
* @param \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized $messages
3229
* @param \Magento\Framework\Json\Helper\Data $jsonHelper
3330
* @param array $data
34-
* @since 2.0.0
3531
*/
3632
public function __construct(
3733
\Magento\Backend\Block\Template\Context $context,
@@ -48,7 +44,6 @@ public function __construct(
4844
* Prepare html output
4945
*
5046
* @return string
51-
* @since 2.0.0
5247
*/
5348
protected function _toHtml()
5449
{
@@ -62,7 +57,6 @@ protected function _toHtml()
6257
* Retrieve message list
6358
*
6459
* @return \Magento\Framework\Notification\MessageInterface[]
65-
* @since 2.0.0
6660
*/
6761
public function getLastCritical()
6862
{
@@ -80,7 +74,6 @@ public function getLastCritical()
8074
* Retrieve number of critical messages
8175
*
8276
* @return int
83-
* @since 2.0.0
8477
*/
8578
public function getCriticalCount()
8679
{
@@ -93,7 +86,6 @@ public function getCriticalCount()
9386
* Retrieve number of major messages
9487
*
9588
* @return int
96-
* @since 2.0.0
9789
*/
9890
public function getMajorCount()
9991
{
@@ -106,7 +98,6 @@ public function getMajorCount()
10698
* Check whether system messages are present
10799
*
108100
* @return bool
109-
* @since 2.0.0
110101
*/
111102
public function hasMessages()
112103
{
@@ -117,7 +108,6 @@ public function hasMessages()
117108
* Retrieve message list url
118109
*
119110
* @return string
120-
* @since 2.0.0
121111
*/
122112
protected function _getMessagesUrl()
123113
{
@@ -128,7 +118,6 @@ protected function _getMessagesUrl()
128118
* Initialize system message dialog widget
129119
*
130120
* @return string
131-
* @since 2.0.0
132121
*/
133122
public function getSystemMessageDialogJson()
134123
{

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@
99

1010
/**
1111
* @api
12-
* @since 2.0.0
1312
*/
1413
class UnreadMessagePopup extends \Magento\Backend\Block\Template
1514
{
1615
/**
1716
* List of item classes per severity
1817
*
1918
* @var array
20-
* @since 2.0.0
2119
*/
2220
protected $_itemClasses = [
2321
MessageInterface::SEVERITY_CRITICAL => 'error',
@@ -28,15 +26,13 @@ class UnreadMessagePopup extends \Magento\Backend\Block\Template
2826
* System Message list
2927
*
3028
* @var \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection
31-
* @since 2.0.0
3229
*/
3330
protected $_messages;
3431

3532
/**
3633
* @param \Magento\Backend\Block\Template\Context $context
3734
* @param \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized $messages
3835
* @param array $data
39-
* @since 2.0.0
4036
*/
4137
public function __construct(
4238
\Magento\Backend\Block\Template\Context $context,
@@ -51,7 +47,6 @@ public function __construct(
5147
* Render block
5248
*
5349
* @return string
54-
* @since 2.0.0
5550
*/
5651
protected function _toHtml()
5752
{
@@ -65,7 +60,6 @@ protected function _toHtml()
6560
* Retrieve list of unread messages
6661
*
6762
* @return MessageInterface[]
68-
* @since 2.0.0
6963
*/
7064
public function getUnreadMessages()
7165
{
@@ -76,7 +70,6 @@ public function getUnreadMessages()
7670
* Retrieve popup title
7771
*
7872
* @return \Magento\Framework\Phrase
79-
* @since 2.0.0
8073
*/
8174
public function getPopupTitle()
8275
{
@@ -93,7 +86,6 @@ public function getPopupTitle()
9386
*
9487
* @param MessageInterface $message
9588
* @return string
96-
* @since 2.0.0
9789
*/
9890
public function getItemClass(MessageInterface $message)
9991
{

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
*
1212
* @api
1313
* @author Magento Core Team <core@magentocommerce.com>
14-
* @since 2.0.0
1514
*/
1615
class ToolbarEntry extends \Magento\Backend\Block\Template
1716
{
@@ -34,15 +33,13 @@ class ToolbarEntry extends \Magento\Backend\Block\Template
3433
* Collection of latest unread notifications
3534
*
3635
* @var \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
37-
* @since 2.0.0
3836
*/
3937
protected $_notificationList;
4038

4139
/**
4240
* @param \Magento\Backend\Block\Template\Context $context
4341
* @param \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Unread $notificationList
4442
* @param array $data
45-
* @since 2.0.0
4643
*/
4744
public function __construct(
4845
\Magento\Backend\Block\Template\Context $context,
@@ -57,7 +54,6 @@ public function __construct(
5754
* Retrieve notification description start length
5855
*
5956
* @return int
60-
* @since 2.0.0
6157
*/
6258
public function getNotificationDescriptionLength()
6359
{
@@ -68,7 +64,6 @@ public function getNotificationDescriptionLength()
6864
* Retrieve notification counter max value
6965
*
7066
* @return int
71-
* @since 2.0.0
7267
*/
7368
public function getNotificationCounterMax()
7469
{
@@ -79,7 +74,6 @@ public function getNotificationCounterMax()
7974
* Retrieve number of unread notifications
8075
*
8176
* @return int
82-
* @since 2.0.0
8377
*/
8478
public function getUnreadNotificationCount()
8579
{
@@ -90,7 +84,6 @@ public function getUnreadNotificationCount()
9084
* Retrieve the list of latest unread notifications
9185
*
9286
* @return \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
93-
* @since 2.0.0
9487
*/
9588
public function getLatestUnreadNotifications()
9689
{
@@ -102,7 +95,6 @@ public function getLatestUnreadNotifications()
10295
*
10396
* @param string $dateString
10497
* @return string
105-
* @since 2.0.0
10698
*/
10799
public function formatNotificationDate($dateString)
108100
{

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
/**
1111
* @api
12-
* @since 2.0.0
1312
*/
1413
class Window extends \Magento\Backend\Block\Template
1514
{
@@ -22,29 +21,25 @@ class Window extends \Magento\Backend\Block\Template
2221
* Severity icons url
2322
*
2423
* @var string
25-
* @since 2.0.0
2624
*/
2725
protected $_severityIconsUrl;
2826

2927
/**
3028
* Authentication
3129
*
3230
* @var \Magento\Backend\Model\Auth\Session
33-
* @since 2.0.0
3431
*/
3532
protected $_authSession;
3633

3734
/**
3835
* Critical messages collection
3936
*
4037
* @var \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
41-
* @since 2.0.0
4238
*/
4339
protected $_criticalCollection;
4440

4541
/**
4642
* @var \Magento\Adminnotification\Model\Inbox
47-
* @since 2.0.0
4843
*/
4944
protected $_latestItem;
5045

@@ -53,7 +48,6 @@ class Window extends \Magento\Backend\Block\Template
5348
* If it isn't defined then application considers it as false.
5449
*
5550
* @var bool
56-
* @since 2.0.0
5751
*/
5852
protected $_isScopePrivate;
5953

@@ -62,7 +56,6 @@ class Window extends \Magento\Backend\Block\Template
6256
* @param \Magento\Backend\Model\Auth\Session $authSession
6357
* @param \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Critical $criticalCollection
6458
* @param array $data
65-
* @since 2.0.0
6659
*/
6760
public function __construct(
6861
\Magento\Backend\Block\Template\Context $context,
@@ -80,7 +73,6 @@ public function __construct(
8073
* Render block
8174
*
8275
* @return string
83-
* @since 2.0.0
8476
*/
8577
protected function _toHtml()
8678
{
@@ -100,7 +92,6 @@ protected function _toHtml()
10092
* Retrieve latest critical item
10193
*
10294
* @return bool|\Magento\Adminnotification\Model\Inbox
103-
* @since 2.0.0
10495
*/
10596
protected function _getLatestItem()
10697
{
@@ -119,7 +110,6 @@ protected function _getLatestItem()
119110
* Check whether block should be displayed
120111
*
121112
* @return bool
122-
* @since 2.0.0
123113
*/
124114
public function canShow()
125115
{

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
/**
1111
* @api
12-
* @since 2.0.0
1312
*/
1413
abstract class Notification extends \Magento\Backend\App\AbstractAction
1514
{

0 commit comments

Comments
 (0)