Merge branch 'develop' into BUGS

magento · Jun 27, 2017 · b96f060 · b96f060
2 parents 3584686 + 68a79d9
commit b96f060
Show file tree

Hide file tree

Showing 516 changed files with 1,224 additions and 41 deletions.
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php
@@ -7,6 +7,9 @@
  */
 namespace Magento\AdminNotification\Controller\Adminhtml;
 
+/**
+ * @api
+ */
 abstract class Notification extends \Magento\Backend\App\AbstractAction
 {
     /**

diff --git a/app/code/Magento/AdminNotification/Model/Config/Source/Frequency.php b/app/code/Magento/AdminNotification/Model/Config/Source/Frequency.php
@@ -9,6 +9,7 @@
  * AdminNotification update frequency source
  *
  * @codeCoverageIgnore
+ * @api
  */
 class Frequency implements \Magento\Framework\Option\ArrayInterface
 {

diff --git a/app/code/Magento/AdminNotification/Model/Feed.php b/app/code/Magento/AdminNotification/Model/Feed.php
@@ -12,6 +12,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @api
  */
 class Feed extends \Magento\Framework\Model\AbstractModel
 {

diff --git a/app/code/Magento/AdminNotification/Model/Inbox.php b/app/code/Magento/AdminNotification/Model/Inbox.php
@@ -29,7 +29,7 @@
  * @method int getIsRemove()
  * @method \Magento\AdminNotification\Model\Inbox setIsRemove(int $value)
  *
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @api
  */
 class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierInterface, InboxInterface
 {

diff --git a/app/code/Magento/AdminNotification/Model/InboxInterface.php b/app/code/Magento/AdminNotification/Model/InboxInterface.php
@@ -9,6 +9,7 @@
  * AdminNotification Inbox interface
  *
  * @author Magento Core Team <core@magentocommerce.com>
+ * @api
  */
 interface InboxInterface
 {

diff --git a/app/code/Magento/AdminNotification/Model/NotificationService.php b/app/code/Magento/AdminNotification/Model/NotificationService.php
@@ -9,6 +9,7 @@
  * Notification service model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @api
  */
 class NotificationService
 {

diff --git a/app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php b/app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php
@@ -11,6 +11,9 @@
  */
 namespace Magento\AdminNotification\Model\ResourceModel\Grid;
 
+/**
+ * @api
+ */
 class Collection extends \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
 {
     /**

diff --git a/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox.php b/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox.php
@@ -6,9 +6,7 @@
 namespace Magento\AdminNotification\Model\ResourceModel;
 
 /**
- * AdminNotification Inbox model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @api
  */
 class Inbox extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {

diff --git a/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php b/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php
@@ -10,6 +10,7 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @api
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {

diff --git a/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Critical.php b/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Critical.php
@@ -7,6 +7,9 @@
  */
 namespace Magento\AdminNotification\Model\ResourceModel\Inbox\Collection;
 
+/**
+ * @api
+ */
 class Critical extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
     /**

diff --git a/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Unread.php b/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Unread.php
@@ -11,6 +11,9 @@
  */
 namespace Magento\AdminNotification\Model\ResourceModel\Inbox\Collection;
 
+/**
+ * @api
+ */
 class Unread extends \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
 {
     /**

diff --git a/app/code/Magento/AdminNotification/Model/ResourceModel/System/Message.php b/app/code/Magento/AdminNotification/Model/ResourceModel/System/Message.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\AdminNotification\Model\ResourceModel\System;
 
+/**
+ * @api
+ */
 class Message extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**

diff --git a/app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection.php b/app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\AdminNotification\Model\ResourceModel\System\Message;
 
+/**
+ * @api
+ */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
     /**

diff --git a/.../Magento/AdminNotification/Model/ResourceModel/System/Message/Collection/Synchronized.php b/.../Magento/AdminNotification/Model/ResourceModel/System/Message/Collection/Synchronized.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\AdminNotification\Model\ResourceModel\System\Message\Collection;
 
+/**
+ * @api
+ */
 class Synchronized extends \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection
 {
     /**

diff --git a/app/code/Magento/AdminNotification/Model/System/Message.php b/app/code/Magento/AdminNotification/Model/System/Message.php
@@ -7,6 +7,7 @@
 
 /**
  * @codeCoverageIgnore
+ * @api
  */
 class Message extends \Magento\Framework\Model\AbstractModel implements \Magento\Framework\Notification\MessageInterface
 {

diff --git a/app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php b/app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\AdminNotification\Model\System\Message;
 
+/**
+ * @api
+ */
 class CacheOutdated implements \Magento\Framework\Notification\MessageInterface
 {
     /**

diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Media/AbstractSynchronization.php b/app/code/Magento/AdminNotification/Model/System/Message/Media/AbstractSynchronization.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\AdminNotification\Model\System\Message\Media;
 
+/**
+ * @api
+ */
 abstract class AbstractSynchronization implements \Magento\Framework\Notification\MessageInterface
 {
     /**

diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php b/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php
@@ -6,6 +6,9 @@
 
 namespace Magento\AdminNotification\Model\System\Message\Media\Synchronization;
 
+/**
+ * @api
+ */
 class Error extends \Magento\AdminNotification\Model\System\Message\Media\AbstractSynchronization
 {
     /**

diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php b/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\AdminNotification\Model\System\Message\Media\Synchronization;
 
+/**
+ * @api
+ */
 class Success extends \Magento\AdminNotification\Model\System\Message\Media\AbstractSynchronization
 {
     /**

diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Security.php b/app/code/Magento/AdminNotification/Model/System/Message/Security.php
@@ -8,6 +8,9 @@
 
 use Magento\Store\Model\Store;
 
+/**
+ * @api
+ */
 class Security implements \Magento\Framework\Notification\MessageInterface
 {
     /**

diff --git a/app/code/Magento/AdminNotification/Ui/Component/DataProvider/DataProvider.php b/app/code/Magento/AdminNotification/Ui/Component/DataProvider/DataProvider.php
@@ -9,7 +9,7 @@
 use Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\SynchronizedFactory;
 
 /**
- * Class DataProvider
+ * @api
  */
 class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
 {

diff --git a/app/code/Magento/AdminNotification/view/adminhtml/web/js/grid/columns/message.js b/app/code/Magento/AdminNotification/view/adminhtml/web/js/grid/columns/message.js
@@ -2,6 +2,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @api
+ */
 define([
     'Magento_Ui/js/grid/columns/column',
     'underscore'

diff --git a/app/code/Magento/AdminNotification/view/adminhtml/web/js/grid/listing.js b/app/code/Magento/AdminNotification/view/adminhtml/web/js/grid/listing.js
@@ -3,6 +3,9 @@
  * See COPYING.txt for license details.
  */
 
+/**
+ * @api
+ */
 define([
     'Magento_Ui/js/grid/listing',
     'Magento_Ui/js/lib/spinner',

diff --git a/app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js b/app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js
@@ -3,6 +3,9 @@
  * See COPYING.txt for license details.
  */
 
+/**
+ * @api
+ */
 define([
     'jquery',
     'mage/template',

diff --git a/app/code/Magento/AdminNotification/view/adminhtml/web/toolbar_entry.js b/app/code/Magento/AdminNotification/view/adminhtml/web/toolbar_entry.js
@@ -3,6 +3,9 @@
  * See COPYING.txt for license details.
  */
 
+/**
+ * @api
+ */
 define([
     'jquery',
     'jquery/ui',

diff --git a/app/code/Magento/Backend/App/Area/FrontNameResolver.php b/app/code/Magento/Backend/App/Area/FrontNameResolver.php
@@ -13,6 +13,9 @@
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
 
+/**
+ * @api
+ */
 class FrontNameResolver implements \Magento\Framework\App\Area\FrontNameResolverInterface
 {
     const XML_PATH_USE_CUSTOM_ADMIN_PATH = 'admin/url/use_custom_path';

diff --git a/app/code/Magento/Backend/App/BackendApp.php b/app/code/Magento/Backend/App/BackendApp.php
@@ -8,6 +8,7 @@
 
 /**
  * Backend Application which uses Magento Backend authentication process
+ * @api
  */
 class BackendApp
 {

diff --git a/app/code/Magento/Backend/App/BackendAppList.php b/app/code/Magento/Backend/App/BackendAppList.php
@@ -8,6 +8,7 @@
 
 /**
  * List of Backend Applications to allow injection of them through the DI
+ * @api
  */
 class BackendAppList
 {

diff --git a/app/code/Magento/Backend/App/ConfigInterface.php b/app/code/Magento/Backend/App/ConfigInterface.php
@@ -9,6 +9,7 @@
 
 /**
  * Backend config accessor
+ * @api
  */
 interface ConfigInterface
 {

diff --git a/app/code/Magento/Backend/App/DefaultPath.php b/app/code/Magento/Backend/App/DefaultPath.php
@@ -7,6 +7,9 @@
  */
 namespace Magento\Backend\App;
 
+/**
+ * @api
+ */
 class DefaultPath implements \Magento\Framework\App\DefaultPathInterface
 {
     /**

diff --git a/app/code/Magento/Backend/App/Request/PathInfoProcessor.php b/app/code/Magento/Backend/App/Request/PathInfoProcessor.php
@@ -7,6 +7,9 @@
  */
 namespace Magento\Backend\App\Request;
 
+/**
+ * @api
+ */
 class PathInfoProcessor implements \Magento\Framework\App\Request\PathInfoProcessorInterface
 {
     /**

diff --git a/app/code/Magento/Backend/App/Response/Http/FileFactory.php b/app/code/Magento/Backend/App/Response/Http/FileFactory.php
@@ -7,6 +7,9 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 
+/**
+ * @api
+ */
 class FileFactory extends \Magento\Framework\App\Response\Http\FileFactory
 {
     /**

diff --git a/app/code/Magento/Backend/App/Router.php b/app/code/Magento/Backend/App/Router.php
@@ -8,6 +8,9 @@
  */
 namespace Magento\Backend\App;
 
+/**
+ * @api
+ */
 class Router extends \Magento\Framework\App\Router\Base
 {
     /**

diff --git a/app/code/Magento/Backend/App/Router/NoRouteHandler.php b/app/code/Magento/Backend/App/Router/NoRouteHandler.php
@@ -7,6 +7,9 @@
  */
 namespace Magento\Backend\App\Router;
 
+/**
+ * @api
+ */
 class NoRouteHandler implements \Magento\Framework\App\Router\NoRouteHandlerInterface
 {
     /**

diff --git a/app/code/Magento/Backend/App/UserConfig.php b/app/code/Magento/Backend/App/UserConfig.php
@@ -12,6 +12,9 @@
 use Magento\Framework\App\Console\Response;
 use Magento\Framework\AppInterface;
 
+/**
+ * @api
+ */
 class UserConfig implements AppInterface
 {
     /**

diff --git a/app/code/Magento/Backend/Block/Catalog/Product/Tab/Container.php b/app/code/Magento/Backend/Block/Catalog/Product/Tab/Container.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Backend\Block\Catalog\Product\Tab;
 
+/**
+ * @api
+ */
 class Container extends \Magento\Backend\Block\Template implements \Magento\Backend\Block\Widget\Tab\TabInterface
 {
     /**

diff --git a/app/code/Magento/Backend/Block/Dashboard/Grid.php b/app/code/Magento/Backend/Block/Dashboard/Grid.php
@@ -9,6 +9,7 @@
  * Adminhtml dashboard grid
  *
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @api
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {

diff --git a/app/code/Magento/Backend/Block/Dashboard/Searches/Renderer/Searchquery.php b/app/code/Magento/Backend/Block/Dashboard/Searches/Renderer/Searchquery.php
@@ -7,6 +7,7 @@
 
 /**
  * Dashboard search query column renderer
+ * @api
  */
 class Searchquery extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {

diff --git a/app/code/Magento/Backend/Block/Media/Uploader.php b/app/code/Magento/Backend/Block/Media/Uploader.php
@@ -7,6 +7,7 @@
 
 /**
  * Adminhtml media library uploader
+ * @api
  */
 class Uploader extends \Magento\Backend\Block\Widget
 {

diff --git a/app/code/Magento/Backend/Block/Menu.php b/app/code/Magento/Backend/Block/Menu.php
@@ -15,6 +15,7 @@
  * @method \Magento\Backend\Block\Menu setAdditionalCacheKeyInfo(array $cacheKeyInfo)
  * @method array getAdditionalCacheKeyInfo()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @api
  */
 class Menu extends \Magento\Backend\Block\Template
 {

diff --git a/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php b/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php
@@ -10,6 +10,7 @@
 
 /**
  * Form fieldset renderer
+ * @api
  */
 class Fieldset extends \Magento\Backend\Block\Template implements RendererInterface
 {

diff --git a/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php b/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php
@@ -7,6 +7,7 @@
 
 /**
  * Form fieldset renderer
+ * @api
  */
 class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element implements
     \Magento\Framework\Data\Form\Element\Renderer\RendererInterface

diff --git a/app/code/Magento/Backend/Block/System/Store/Store.php b/app/code/Magento/Backend/Block/System/Store/Store.php
@@ -10,6 +10,7 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @api
  */
 class Store extends \Magento\Backend\Block\Widget\Grid\Container
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,9 @@ @@
      */
     namespace Magento\AdminNotification\Controller\Adminhtml;
+    /**
+     * @api
+     */
     abstract class Notification extends \Magento\Backend\App\AbstractAction
     {
         /**
@@ Expand Down @@