Skip to content

Commit 1a9e88f

Browse files
RuslanKostiv1RuslanKostiv1
committed
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-70846
2 parents b769265 + 99686e2 commit 1a9e88f

File tree

9,553 files changed

+50192
-66132
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,553 files changed

+50192
-66132
lines changed

‎.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,6 @@ script:
5959
- test $TEST_SUITE = "functional" && TEST_FILTER='dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php' || true
6060

6161
# The scripts for grunt/phpunit type tests
62-
- if [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
62+
- if [ $TEST_SUITE == "functional" ]; then dev/tests/functional/vendor/phpunit/phpunit/phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
63+
- if [ $TEST_SUITE != "functional" ] && [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
6364
- if [ $TEST_SUITE == "js" ]; then grunt $GRUNT_COMMAND; fi

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88

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

11+
/**
12+
* Class \Magento\AdminNotification\Block\Grid\Renderer\Actions
13+
*
14+
*/
1115
class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
1216
{
1317
/**

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

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

10+
/**
11+
* Class \Magento\AdminNotification\Block\Grid\Renderer\Notice
12+
*
13+
*/
1014
class Notice extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
1115
{
1216
/**

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

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

1010
use Magento\Framework\Notification\MessageInterface;
1111

12+
/**
13+
* Class \Magento\AdminNotification\Block\Grid\Renderer\Severity
14+
*
15+
*/
1216
class Severity extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
1317
{
1418
/**

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

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

8+
/**
9+
* Class \Magento\AdminNotification\Block\System\Messages
10+
*
11+
*/
812
class Messages extends \Magento\Backend\Block\Template
913
{
1014
/**

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
*/
77
namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
88

9+
/**
10+
* Class \Magento\AdminNotification\Controller\Adminhtml\Notification\AjaxMarkAsRead
11+
*
12+
*/
913
class AjaxMarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Notification
1014
{
1115
/**

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
*/
77
namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
88

9+
/**
10+
* Class \Magento\AdminNotification\Controller\Adminhtml\Notification\Index
11+
*
12+
*/
913
class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification
1014
{
1115
/**

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
*/
77
namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
88

9+
/**
10+
* Class \Magento\AdminNotification\Controller\Adminhtml\Notification\MarkAsRead
11+
*
12+
*/
913
class MarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Notification
1014
{
1115
/**

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
*/
77
namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
88

9+
/**
10+
* Class \Magento\AdminNotification\Controller\Adminhtml\Notification\MassMarkAsRead
11+
*
12+
*/
913
class MassMarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Notification
1014
{
1115

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
*/
77
namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
88

9+
/**
10+
* Class \Magento\AdminNotification\Controller\Adminhtml\Notification\MassRemove
11+
*
12+
*/
913
class MassRemove extends \Magento\AdminNotification\Controller\Adminhtml\Notification
1014
{
1115

0 commit comments

Comments
 (0)