Skip to content

Commit 18f9e12

Browse files
author
Oleksii Korshenko
committed
Merge remote-tracking branch 'mainline/develop' into develop-prs
2 parents 24a690d + e1b47dd commit 18f9e12

File tree

505 files changed

+1101
-21
lines changed

Some content is hidden

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

505 files changed

+1101
-21
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
*/
88
namespace Magento\AdminNotification\Controller\Adminhtml;
99

10+
/**
11+
* @api
12+
*/
1013
abstract class Notification extends \Magento\Backend\App\AbstractAction
1114
{
1215
/**

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* AdminNotification update frequency source
1010
*
1111
* @codeCoverageIgnore
12+
* @api
1213
*/
1314
class Frequency implements \Magento\Framework\Option\ArrayInterface
1415
{

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* @method int getIsRemove()
3030
* @method \Magento\AdminNotification\Model\Inbox setIsRemove(int $value)
3131
*
32-
* @author Magento Core Team <[email protected]>
32+
* @api
3333
*/
3434
class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierInterface, InboxInterface
3535
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* AdminNotification Inbox interface
1010
*
1111
* @author Magento Core Team <[email protected]>
12+
* @api
1213
*/
1314
interface InboxInterface
1415
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* Notification service model
1010
*
1111
* @author Magento Core Team <[email protected]>
12+
* @api
1213
*/
1314
class NotificationService
1415
{

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
*/
1212
namespace Magento\AdminNotification\Model\ResourceModel\Grid;
1313

14+
/**
15+
* @api
16+
*/
1417
class Collection extends \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
1518
{
1619
/**

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
namespace Magento\AdminNotification\Model\ResourceModel;
77

88
/**
9-
* AdminNotification Inbox model
10-
*
11-
* @author Magento Core Team <[email protected]>
9+
* @api
1210
*/
1311
class Inbox extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
1412
{

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

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

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
*/
88
namespace Magento\AdminNotification\Model\ResourceModel\Inbox\Collection;
99

10+
/**
11+
* @api
12+
*/
1013
class Critical extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
1114
{
1215
/**

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
*/
1212
namespace Magento\AdminNotification\Model\ResourceModel\Inbox\Collection;
1313

14+
/**
15+
* @api
16+
*/
1417
class Unread extends \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
1518
{
1619
/**

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

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

8+
/**
9+
* @api
10+
*/
811
class Message extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
912
{
1013
/**

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\AdminNotification\Model\ResourceModel\System\Message;
77

8+
/**
9+
* @api
10+
*/
811
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
912
{
1013
/**

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\AdminNotification\Model\ResourceModel\System\Message\Collection;
77

8+
/**
9+
* @api
10+
*/
811
class Synchronized extends \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection
912
{
1013
/**

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

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

88
/**
99
* @codeCoverageIgnore
10+
* @api
1011
*/
1112
class Message extends \Magento\Framework\Model\AbstractModel implements \Magento\Framework\Notification\MessageInterface
1213
{

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

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

8+
/**
9+
* @api
10+
*/
811
class CacheOutdated implements \Magento\Framework\Notification\MessageInterface
912
{
1013
/**

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\AdminNotification\Model\System\Message\Media;
77

8+
/**
9+
* @api
10+
*/
811
abstract class AbstractSynchronization implements \Magento\Framework\Notification\MessageInterface
912
{
1013
/**

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66

77
namespace Magento\AdminNotification\Model\System\Message\Media\Synchronization;
88

9+
/**
10+
* @api
11+
*/
912
class Error extends \Magento\AdminNotification\Model\System\Message\Media\AbstractSynchronization
1013
{
1114
/**

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\AdminNotification\Model\System\Message\Media\Synchronization;
77

8+
/**
9+
* @api
10+
*/
811
class Success extends \Magento\AdminNotification\Model\System\Message\Media\AbstractSynchronization
912
{
1013
/**

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

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

99
use Magento\Store\Model\Store;
1010

11+
/**
12+
* @api
13+
*/
1114
class Security implements \Magento\Framework\Notification\MessageInterface
1215
{
1316
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\SynchronizedFactory;
1010

1111
/**
12-
* Class DataProvider
12+
* @api
1313
*/
1414
class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
1515
{

app/code/Magento/AdminNotification/view/adminhtml/web/js/grid/columns/message.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
6+
/**
7+
* @api
8+
*/
59
define([
610
'Magento_Ui/js/grid/columns/column',
711
'underscore'

app/code/Magento/AdminNotification/view/adminhtml/web/js/grid/listing.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* See COPYING.txt for license details.
44
*/
55

6+
/**
7+
* @api
8+
*/
69
define([
710
'Magento_Ui/js/grid/listing',
811
'Magento_Ui/js/lib/spinner',

app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* See COPYING.txt for license details.
44
*/
55

6+
/**
7+
* @api
8+
*/
69
define([
710
'jquery',
811
'mage/template',

app/code/Magento/AdminNotification/view/adminhtml/web/toolbar_entry.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* See COPYING.txt for license details.
44
*/
55

6+
/**
7+
* @api
8+
*/
69
define([
710
'jquery',
811
'jquery/ui',

app/code/Magento/Backend/App/Area/FrontNameResolver.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
use Magento\Store\Model\ScopeInterface;
1414
use Magento\Store\Model\Store;
1515

16+
/**
17+
* @api
18+
*/
1619
class FrontNameResolver implements \Magento\Framework\App\Area\FrontNameResolverInterface
1720
{
1821
const XML_PATH_USE_CUSTOM_ADMIN_PATH = 'admin/url/use_custom_path';

app/code/Magento/Backend/App/BackendApp.php

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

99
/**
1010
* Backend Application which uses Magento Backend authentication process
11+
* @api
1112
*/
1213
class BackendApp
1314
{

app/code/Magento/Backend/App/BackendAppList.php

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

99
/**
1010
* List of Backend Applications to allow injection of them through the DI
11+
* @api
1112
*/
1213
class BackendAppList
1314
{

app/code/Magento/Backend/App/ConfigInterface.php

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

1010
/**
1111
* Backend config accessor
12+
* @api
1213
*/
1314
interface ConfigInterface
1415
{

app/code/Magento/Backend/App/DefaultPath.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
*/
88
namespace Magento\Backend\App;
99

10+
/**
11+
* @api
12+
*/
1013
class DefaultPath implements \Magento\Framework\App\DefaultPathInterface
1114
{
1215
/**

app/code/Magento/Backend/App/Request/PathInfoProcessor.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
*/
88
namespace Magento\Backend\App\Request;
99

10+
/**
11+
* @api
12+
*/
1013
class PathInfoProcessor implements \Magento\Framework\App\Request\PathInfoProcessorInterface
1114
{
1215
/**

app/code/Magento/Backend/App/Response/Http/FileFactory.php

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

88
use Magento\Framework\App\Filesystem\DirectoryList;
99

10+
/**
11+
* @api
12+
*/
1013
class FileFactory extends \Magento\Framework\App\Response\Http\FileFactory
1114
{
1215
/**

app/code/Magento/Backend/App/Router.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
*/
99
namespace Magento\Backend\App;
1010

11+
/**
12+
* @api
13+
*/
1114
class Router extends \Magento\Framework\App\Router\Base
1215
{
1316
/**

app/code/Magento/Backend/App/Router/NoRouteHandler.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
*/
88
namespace Magento\Backend\App\Router;
99

10+
/**
11+
* @api
12+
*/
1013
class NoRouteHandler implements \Magento\Framework\App\Router\NoRouteHandlerInterface
1114
{
1215
/**

app/code/Magento/Backend/App/UserConfig.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
use Magento\Framework\App\Console\Response;
1313
use Magento\Framework\AppInterface;
1414

15+
/**
16+
* @api
17+
*/
1518
class UserConfig implements AppInterface
1619
{
1720
/**

app/code/Magento/Backend/Block/Catalog/Product/Tab/Container.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\Backend\Block\Catalog\Product\Tab;
77

8+
/**
9+
* @api
10+
*/
811
class Container extends \Magento\Backend\Block\Template implements \Magento\Backend\Block\Widget\Tab\TabInterface
912
{
1013
/**

app/code/Magento/Backend/Block/Dashboard/Grid.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* Adminhtml dashboard grid
1010
*
1111
* @author Magento Core Team <[email protected]>
12+
* @api
1213
*/
1314
class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
1415
{

app/code/Magento/Backend/Block/Dashboard/Searches/Renderer/Searchquery.php

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

88
/**
99
* Dashboard search query column renderer
10+
* @api
1011
*/
1112
class Searchquery extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
1213
{

app/code/Magento/Backend/Block/Media/Uploader.php

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

88
/**
99
* Adminhtml media library uploader
10+
* @api
1011
*/
1112
class Uploader extends \Magento\Backend\Block\Widget
1213
{

app/code/Magento/Backend/Block/Menu.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* @method \Magento\Backend\Block\Menu setAdditionalCacheKeyInfo(array $cacheKeyInfo)
1616
* @method array getAdditionalCacheKeyInfo()
1717
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
18+
* @api
1819
*/
1920
class Menu extends \Magento\Backend\Block\Template
2021
{

app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php

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

1111
/**
1212
* Form fieldset renderer
13+
* @api
1314
*/
1415
class Fieldset extends \Magento\Backend\Block\Template implements RendererInterface
1516
{

app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php

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

88
/**
99
* Form fieldset renderer
10+
* @api
1011
*/
1112
class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element implements
1213
\Magento\Framework\Data\Form\Element\Renderer\RendererInterface

app/code/Magento/Backend/Block/System/Store/Store.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*
1111
* @api
1212
* @author Magento Core Team <[email protected]>
13+
* @api
1314
*/
1415
class Store extends \Magento\Backend\Block\Widget\Grid\Container
1516
{

0 commit comments

Comments
 (0)