Skip to content

Commit 8ad7985

Browse files
okolesnykokolesnyk
committed
Merge branch 'MAGETWO-71259-Fix-FT-ImportDataNegativeTest-2.2' of github.com:magento-pangolin/magento2ce into Mavericks-PR
2 parents 22f3b26 + a0089e0 commit 8ad7985

File tree

9,748 files changed

+89130
-1577
lines changed

Some content is hidden

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

9,748 files changed

+89130
-1577
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,24 @@
88

99
namespace Magento\AdminNotification\Block\Grid\Renderer;
1010

11+
/**
12+
* Class \Magento\AdminNotification\Block\Grid\Renderer\Actions
13+
*
14+
* @since 2.0.0
15+
*/
1116
class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
1217
{
1318
/**
1419
* @var \Magento\Framework\Url\Helper\Data
20+
* @since 2.0.0
1521
*/
1622
protected $_urlHelper;
1723

1824
/**
1925
* @param \Magento\Backend\Block\Context $context
2026
* @param \Magento\Framework\Url\Helper\Data $urlHelper
2127
* @param array $data
28+
* @since 2.0.0
2229
*/
2330
public function __construct(
2431
\Magento\Backend\Block\Context $context,
@@ -34,6 +41,7 @@ public function __construct(
3441
*
3542
* @param \Magento\Framework\DataObject $row
3643
* @return string
44+
* @since 2.0.0
3745
*/
3846
public function render(\Magento\Framework\DataObject $row)
3947
{

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,19 @@
77
*/
88
namespace Magento\AdminNotification\Block\Grid\Renderer;
99

10+
/**
11+
* Class \Magento\AdminNotification\Block\Grid\Renderer\Notice
12+
*
13+
* @since 2.0.0
14+
*/
1015
class Notice extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
1116
{
1217
/**
1318
* Renders grid column
1419
*
1520
* @param \Magento\Framework\DataObject $row
1621
* @return string
22+
* @since 2.0.0
1723
*/
1824
public function render(\Magento\Framework\DataObject $row)
1925
{

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

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

1010
use Magento\Framework\Notification\MessageInterface;
1111

12+
/**
13+
* Class \Magento\AdminNotification\Block\Grid\Renderer\Severity
14+
*
15+
* @since 2.0.0
16+
*/
1217
class Severity extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
1318
{
1419
/**
1520
* @var \Magento\AdminNotification\Model\Inbox
21+
* @since 2.0.0
1622
*/
1723
protected $_notice;
1824

1925
/**
2026
* @param \Magento\Backend\Block\Context $context
2127
* @param \Magento\AdminNotification\Model\Inbox $notice
2228
* @param array $data
29+
* @since 2.0.0
2330
*/
2431
public function __construct(
2532
\Magento\Backend\Block\Context $context,
@@ -35,6 +42,7 @@ public function __construct(
3542
*
3643
* @param \Magento\Framework\DataObject $row
3744
* @return string
45+
* @since 2.0.0
3846
*/
3947
public function render(\Magento\Framework\DataObject $row)
4048
{

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

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

1010
/**
1111
* @api
12+
* @since 2.0.0
1213
*/
1314
class Inbox extends \Magento\Backend\Block\Widget\Grid\Container
1415
{
1516
/**
1617
* @return void
18+
* @since 2.0.0
1719
*/
1820
protected function _construct()
1921
{

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,24 @@
55
*/
66
namespace Magento\AdminNotification\Block\System;
77

8+
/**
9+
* Class \Magento\AdminNotification\Block\System\Messages
10+
*
11+
* @since 2.0.0
12+
*/
813
class Messages extends \Magento\Backend\Block\Template
914
{
1015
/**
1116
* Message list
1217
*
1318
* @var \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized
19+
* @since 2.0.0
1420
*/
1521
protected $_messages;
1622

1723
/**
1824
* @var \Magento\Framework\Json\Helper\Data
25+
* @since 2.0.0
1926
*/
2027
protected $jsonHelper;
2128

@@ -24,6 +31,7 @@ class Messages extends \Magento\Backend\Block\Template
2431
* @param \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized $messages
2532
* @param \Magento\Framework\Json\Helper\Data $jsonHelper
2633
* @param array $data
34+
* @since 2.0.0
2735
*/
2836
public function __construct(
2937
\Magento\Backend\Block\Template\Context $context,
@@ -40,6 +48,7 @@ public function __construct(
4048
* Prepare html output
4149
*
4250
* @return string
51+
* @since 2.0.0
4352
*/
4453
protected function _toHtml()
4554
{
@@ -53,6 +62,7 @@ protected function _toHtml()
5362
* Retrieve message list
5463
*
5564
* @return \Magento\Framework\Notification\MessageInterface[]
65+
* @since 2.0.0
5666
*/
5767
public function getLastCritical()
5868
{
@@ -70,6 +80,7 @@ public function getLastCritical()
7080
* Retrieve number of critical messages
7181
*
7282
* @return int
83+
* @since 2.0.0
7384
*/
7485
public function getCriticalCount()
7586
{
@@ -82,6 +93,7 @@ public function getCriticalCount()
8293
* Retrieve number of major messages
8394
*
8495
* @return int
96+
* @since 2.0.0
8597
*/
8698
public function getMajorCount()
8799
{
@@ -94,6 +106,7 @@ public function getMajorCount()
94106
* Check whether system messages are present
95107
*
96108
* @return bool
109+
* @since 2.0.0
97110
*/
98111
public function hasMessages()
99112
{
@@ -104,6 +117,7 @@ public function hasMessages()
104117
* Retrieve message list url
105118
*
106119
* @return string
120+
* @since 2.0.0
107121
*/
108122
protected function _getMessagesUrl()
109123
{
@@ -114,6 +128,7 @@ protected function _getMessagesUrl()
114128
* Initialize system message dialog widget
115129
*
116130
* @return string
131+
* @since 2.0.0
117132
*/
118133
public function getSystemMessageDialogJson()
119134
{

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

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

1010
/**
1111
* @api
12+
* @since 2.0.0
1213
*/
1314
class UnreadMessagePopup extends \Magento\Backend\Block\Template
1415
{
1516
/**
1617
* List of item classes per severity
1718
*
1819
* @var array
20+
* @since 2.0.0
1921
*/
2022
protected $_itemClasses = [
2123
MessageInterface::SEVERITY_CRITICAL => 'error',
@@ -26,13 +28,15 @@ class UnreadMessagePopup extends \Magento\Backend\Block\Template
2628
* System Message list
2729
*
2830
* @var \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection
31+
* @since 2.0.0
2932
*/
3033
protected $_messages;
3134

3235
/**
3336
* @param \Magento\Backend\Block\Template\Context $context
3437
* @param \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized $messages
3538
* @param array $data
39+
* @since 2.0.0
3640
*/
3741
public function __construct(
3842
\Magento\Backend\Block\Template\Context $context,
@@ -47,6 +51,7 @@ public function __construct(
4751
* Render block
4852
*
4953
* @return string
54+
* @since 2.0.0
5055
*/
5156
protected function _toHtml()
5257
{
@@ -60,6 +65,7 @@ protected function _toHtml()
6065
* Retrieve list of unread messages
6166
*
6267
* @return MessageInterface[]
68+
* @since 2.0.0
6369
*/
6470
public function getUnreadMessages()
6571
{
@@ -70,6 +76,7 @@ public function getUnreadMessages()
7076
* Retrieve popup title
7177
*
7278
* @return \Magento\Framework\Phrase
79+
* @since 2.0.0
7380
*/
7481
public function getPopupTitle()
7582
{
@@ -86,6 +93,7 @@ public function getPopupTitle()
8693
*
8794
* @param MessageInterface $message
8895
* @return string
96+
* @since 2.0.0
8997
*/
9098
public function getItemClass(MessageInterface $message)
9199
{

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
*
1212
* @api
1313
* @author Magento Core Team <core@magentocommerce.com>
14+
* @since 2.0.0
1415
*/
1516
class ToolbarEntry extends \Magento\Backend\Block\Template
1617
{
@@ -33,13 +34,15 @@ class ToolbarEntry extends \Magento\Backend\Block\Template
3334
* Collection of latest unread notifications
3435
*
3536
* @var \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
37+
* @since 2.0.0
3638
*/
3739
protected $_notificationList;
3840

3941
/**
4042
* @param \Magento\Backend\Block\Template\Context $context
4143
* @param \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Unread $notificationList
4244
* @param array $data
45+
* @since 2.0.0
4346
*/
4447
public function __construct(
4548
\Magento\Backend\Block\Template\Context $context,
@@ -54,6 +57,7 @@ public function __construct(
5457
* Retrieve notification description start length
5558
*
5659
* @return int
60+
* @since 2.0.0
5761
*/
5862
public function getNotificationDescriptionLength()
5963
{
@@ -64,6 +68,7 @@ public function getNotificationDescriptionLength()
6468
* Retrieve notification counter max value
6569
*
6670
* @return int
71+
* @since 2.0.0
6772
*/
6873
public function getNotificationCounterMax()
6974
{
@@ -74,6 +79,7 @@ public function getNotificationCounterMax()
7479
* Retrieve number of unread notifications
7580
*
7681
* @return int
82+
* @since 2.0.0
7783
*/
7884
public function getUnreadNotificationCount()
7985
{
@@ -84,6 +90,7 @@ public function getUnreadNotificationCount()
8490
* Retrieve the list of latest unread notifications
8591
*
8692
* @return \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
93+
* @since 2.0.0
8794
*/
8895
public function getLatestUnreadNotifications()
8996
{
@@ -95,6 +102,7 @@ public function getLatestUnreadNotifications()
95102
*
96103
* @param string $dateString
97104
* @return string
105+
* @since 2.0.0
98106
*/
99107
public function formatNotificationDate($dateString)
100108
{

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

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

1010
/**
1111
* @api
12+
* @since 2.0.0
1213
*/
1314
class Window extends \Magento\Backend\Block\Template
1415
{
@@ -21,25 +22,29 @@ class Window extends \Magento\Backend\Block\Template
2122
* Severity icons url
2223
*
2324
* @var string
25+
* @since 2.0.0
2426
*/
2527
protected $_severityIconsUrl;
2628

2729
/**
2830
* Authentication
2931
*
3032
* @var \Magento\Backend\Model\Auth\Session
33+
* @since 2.0.0
3134
*/
3235
protected $_authSession;
3336

3437
/**
3538
* Critical messages collection
3639
*
3740
* @var \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
41+
* @since 2.0.0
3842
*/
3943
protected $_criticalCollection;
4044

4145
/**
4246
* @var \Magento\Adminnotification\Model\Inbox
47+
* @since 2.0.0
4348
*/
4449
protected $_latestItem;
4550

@@ -48,6 +53,7 @@ class Window extends \Magento\Backend\Block\Template
4853
* If it isn't defined then application considers it as false.
4954
*
5055
* @var bool
56+
* @since 2.0.0
5157
*/
5258
protected $_isScopePrivate;
5359

@@ -56,6 +62,7 @@ class Window extends \Magento\Backend\Block\Template
5662
* @param \Magento\Backend\Model\Auth\Session $authSession
5763
* @param \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Critical $criticalCollection
5864
* @param array $data
65+
* @since 2.0.0
5966
*/
6067
public function __construct(
6168
\Magento\Backend\Block\Template\Context $context,
@@ -73,6 +80,7 @@ public function __construct(
7380
* Render block
7481
*
7582
* @return string
83+
* @since 2.0.0
7684
*/
7785
protected function _toHtml()
7886
{
@@ -92,6 +100,7 @@ protected function _toHtml()
92100
* Retrieve latest critical item
93101
*
94102
* @return bool|\Magento\Adminnotification\Model\Inbox
103+
* @since 2.0.0
95104
*/
96105
protected function _getLatestItem()
97106
{
@@ -110,6 +119,7 @@ protected function _getLatestItem()
110119
* Check whether block should be displayed
111120
*
112121
* @return bool
122+
* @since 2.0.0
113123
*/
114124
public function canShow()
115125
{

0 commit comments

Comments
 (0)