Skip to content

Commit 2a5e444

Browse files
andimovandimov
committed
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-71434
2 parents 61fee9b + 5432781 commit 2a5e444

File tree

4,894 files changed

+4335
-12524
lines changed

Some content is hidden

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

4,894 files changed

+4335
-12524
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
@@ -8,10 +8,6 @@
88

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

11-
/**
12-
* Class \Magento\AdminNotification\Block\Grid\Renderer\Actions
13-
*
14-
*/
1511
class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
1612
{
1713
/**

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

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

10-
/**
11-
* Class \Magento\AdminNotification\Block\Grid\Renderer\Notice
12-
*
13-
*/
1410
class Notice extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
1511
{
1612
/**

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

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

1010
use Magento\Framework\Notification\MessageInterface;
1111

12-
/**
13-
* Class \Magento\AdminNotification\Block\Grid\Renderer\Severity
14-
*
15-
*/
1612
class Severity extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
1713
{
1814
/**

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

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

1010
/**
1111
* @api
12+
* @since 100.0.2
1213
*/
1314
class Inbox extends \Magento\Backend\Block\Widget\Grid\Container
1415
{

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

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

8-
/**
9-
* Class \Magento\AdminNotification\Block\System\Messages
10-
*
11-
*/
128
class Messages extends \Magento\Backend\Block\Template
139
{
1410
/**

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

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

1010
/**
1111
* @api
12+
* @since 100.0.2
1213
*/
1314
class UnreadMessagePopup extends \Magento\Backend\Block\Template
1415
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
*
1212
* @api
1313
* @author Magento Core Team <[email protected]>
14+
* @since 100.0.2
1415
*/
1516
class ToolbarEntry extends \Magento\Backend\Block\Template
1617
{

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

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

1010
/**
1111
* @api
12+
* @since 100.0.2
1213
*/
1314
class Window extends \Magento\Backend\Block\Template
1415
{

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

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

1010
/**
1111
* @api
12+
* @since 100.0.2
1213
*/
1314
abstract class Notification extends \Magento\Backend\App\AbstractAction
1415
{

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

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

9-
/**
10-
* Class \Magento\AdminNotification\Controller\Adminhtml\Notification\AjaxMarkAsRead
11-
*
12-
*/
139
class AjaxMarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Notification
1410
{
1511
/**

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

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

9-
/**
10-
* Class \Magento\AdminNotification\Controller\Adminhtml\Notification\Index
11-
*
12-
*/
139
class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification
1410
{
1511
/**

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

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

9-
/**
10-
* Class \Magento\AdminNotification\Controller\Adminhtml\Notification\MarkAsRead
11-
*
12-
*/
139
class MarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Notification
1410
{
1511
/**

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

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

9-
/**
10-
* Class \Magento\AdminNotification\Controller\Adminhtml\Notification\MassMarkAsRead
11-
*
12-
*/
139
class MassMarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Notification
1410
{
1511

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

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

9-
/**
10-
* Class \Magento\AdminNotification\Controller\Adminhtml\Notification\MassRemove
11-
*
12-
*/
139
class MassRemove extends \Magento\AdminNotification\Controller\Adminhtml\Notification
1410
{
1511

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

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

9-
/**
10-
* Class \Magento\AdminNotification\Controller\Adminhtml\Notification\Remove
11-
*
12-
*/
139
class Remove extends \Magento\AdminNotification\Controller\Adminhtml\Notification
1410
{
1511

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

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

9-
/**
10-
* Class \Magento\AdminNotification\Controller\Adminhtml\System\Message\ListAction
11-
*
12-
*/
139
class ListAction extends \Magento\Backend\App\AbstractAction
1410
{
1511
/**

‎app/code/Magento/AdminNotification/Model/Config/Source/Frequency.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*
1111
* @codeCoverageIgnore
1212
* @api
13+
* @since 100.0.2
1314
*/
1415
class Frequency implements \Magento\Framework\Option\ArrayInterface
1516
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* @author Magento Core Team <[email protected]>
1414
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1515
* @api
16+
* @since 100.0.2
1617
*/
1718
class Feed extends \Magento\Framework\Model\AbstractModel
1819
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
* @method \Magento\AdminNotification\Model\Inbox setIsRemove(int $value)
2929
*
3030
* @api
31+
* @since 100.0.2
3132
*/
3233
class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierInterface, InboxInterface
3334
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*
1111
* @author Magento Core Team <[email protected]>
1212
* @api
13+
* @since 100.0.2
1314
*/
1415
interface InboxInterface
1516
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*
1111
* @author Magento Core Team <[email protected]>
1212
* @api
13+
* @since 100.0.2
1314
*/
1415
class NotificationService
1516
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
/**
1515
* @api
16+
* @since 100.0.2
1617
*/
1718
class Collection extends \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
1819
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
/**
99
* @api
10+
* @since 100.0.2
1011
*/
1112
class Inbox extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
1213
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* @api
1212
* @author Magento Core Team <[email protected]>
1313
* @api
14+
* @since 100.0.2
1415
*/
1516
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
1617
{

‎app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Critical.php

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

1010
/**
1111
* @api
12+
* @since 100.0.2
1213
*/
1314
class Critical extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
1415
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
/**
1515
* @api
16+
* @since 100.0.2
1617
*/
1718
class Unread extends \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
1819
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
/**
99
* @api
10+
* @since 100.0.2
1011
*/
1112
class Message extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
1213
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
/**
99
* @api
10+
* @since 100.0.2
1011
*/
1112
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
1213
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
/**
99
* @api
10+
* @since 100.0.2
1011
*/
1112
class Synchronized extends \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection
1213
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
/**
99
* @codeCoverageIgnore
1010
* @api
11+
* @since 100.0.2
1112
*/
1213
class Message extends \Magento\Framework\Model\AbstractModel implements \Magento\Framework\Notification\MessageInterface
1314
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
/**
99
* @api
10+
* @since 100.0.2
1011
*/
1112
class CacheOutdated implements \Magento\Framework\Notification\MessageInterface
1213
{

‎app/code/Magento/AdminNotification/Model/System/Message/Media/AbstractSynchronization.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
/**
99
* @api
10+
* @since 100.0.2
1011
*/
1112
abstract class AbstractSynchronization implements \Magento\Framework\Notification\MessageInterface
1213
{

‎app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/**
1010
* @api
11+
* @since 100.0.2
1112
*/
1213
class Error extends \Magento\AdminNotification\Model\System\Message\Media\AbstractSynchronization
1314
{

‎app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
/**
99
* @api
10+
* @since 100.0.2
1011
*/
1112
class Success extends \Magento\AdminNotification\Model\System\Message\Media\AbstractSynchronization
1213
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
/**
1212
* @api
13+
* @since 100.0.2
1314
*/
1415
class Security implements \Magento\Framework\Notification\MessageInterface
1516
{

‎app/code/Magento/AdminNotification/Ui/Component/DataProvider/DataProvider.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
2222
* @param SynchronizedFactory $messageCollectionFactory
2323
* @param array $meta
2424
* @param array $data
25-
* @since 100.2.0
2625
*/
2726
public function __construct(
2827
$name,

‎app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
use Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing as ExportAdvancedPricing;
1111
use Magento\Catalog\Model\Product as CatalogProduct;
1212

13-
/**
14-
* Class \Magento\AdvancedPricingImportExport\Controller\Adminhtml\Export\GetFilter
15-
*
16-
*/
1713
class GetFilter extends ExportController
1814
{
1915
/**

‎app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
99
use \Magento\Framework\Validator\AbstractValidator;
1010

11-
/**
12-
* Class \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator
13-
*
14-
*/
1511
class Validator extends AbstractValidator implements RowValidatorInterface
1612
{
1713
/**

‎app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing;
99
use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
1010

11-
/**
12-
* Class \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator\TierPrice
13-
*
14-
*/
1511
class TierPrice extends \Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractPrice
1612
{
1713
/**

‎app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
use Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator;
1010
use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
1111

12-
/**
13-
* Class \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator\Website
14-
*
15-
*/
1612
class Website extends AbstractImportValidator implements RowValidatorInterface
1713
{
1814
/**

‎app/code/Magento/AdvancedPricingImportExport/Model/Indexer/Product/Price/Plugin/Import.php

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

88
use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing;
99

10-
/**
11-
* Class \Magento\AdvancedPricingImportExport\Model\Indexer\Product\Price\Plugin\Import
12-
*
13-
*/
1410
class Import extends \Magento\Catalog\Model\Indexer\Product\Price\Plugin\AbstractPlugin
1511
{
1612
/**

‎app/code/Magento/Authorization/Model/Acl/Loader/Role.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
use Magento\Framework\App\ObjectManager;
1111
use Magento\Framework\Serialize\Serializer\Json;
1212

13-
/**
14-
* Class \Magento\Authorization\Model\Acl\Loader\Role
15-
*
16-
*/
1713
class Role implements \Magento\Framework\Acl\LoaderInterface
1814
{
1915
/**

‎app/code/Magento/Authorization/Model/Acl/Loader/Rule.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
use Magento\Framework\App\ObjectManager;
99
use Magento\Framework\Serialize\Serializer\Json;
1010

11-
/**
12-
* Class \Magento\Authorization\Model\Acl\Loader\Rule
13-
*
14-
*/
1511
class Rule implements \Magento\Framework\Acl\LoaderInterface
1612
{
1713
/**

0 commit comments

Comments
 (0)