Skip to content

Commit

Permalink
MAGETWO-71697: Merge branch 'develop' of github.com:magento/magento2 …
Browse files Browse the repository at this point in the history 
…into MAGETWO-71697-PR-10582
  • Loading branch information
@ishakhsuvarov
ishakhsuvarov committed Aug 30, 2017
2 parents 904a13c + b9d696e commit 3d2f8e4
Show file tree
Hide file tree
Showing 5,118 changed files with 12,174 additions and 13,768 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 0 additions & 4 deletions app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@

namespace Magento\AdminNotification\Block\Grid\Renderer;

/**
* Class \Magento\AdminNotification\Block\Grid\Renderer\Actions
*
*/
class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
{
/**
Expand Down
4 changes: 0 additions & 4 deletions app/code/Magento/AdminNotification/Block/Grid/Renderer/Notice.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
*/
namespace Magento\AdminNotification\Block\Grid\Renderer;

/**
* Class \Magento\AdminNotification\Block\Grid\Renderer\Notice
*
*/
class Notice extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
{
/**
Expand Down
4 changes: 0 additions & 4 deletions app/code/Magento/AdminNotification/Block/Grid/Renderer/Severity.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@

use Magento\Framework\Notification\MessageInterface;

/**
* Class \Magento\AdminNotification\Block\Grid\Renderer\Severity
*
*/
class Severity extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
{
/**
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/AdminNotification/Block/Inbox.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

/**
* @api
* @since 100.0.2
*/
class Inbox extends \Magento\Backend\Block\Widget\Grid\Container
{
Expand Down
4 changes: 0 additions & 4 deletions app/code/Magento/AdminNotification/Block/System/Messages.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
*/
namespace Magento\AdminNotification\Block\System;

/**
* Class \Magento\AdminNotification\Block\System\Messages
*
*/
class Messages extends \Magento\Backend\Block\Template
{
/**
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

/**
* @api
* @since 100.0.2
*/
class UnreadMessagePopup extends \Magento\Backend\Block\Template
{
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/AdminNotification/Block/ToolbarEntry.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
*
* @api
* @author Magento Core Team <core@magentocommerce.com>
* @since 100.0.2
*/
class ToolbarEntry extends \Magento\Backend\Block\Template
{
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/AdminNotification/Block/Window.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

/**
* @api
* @since 100.0.2
*/
class Window extends \Magento\Backend\Block\Template
{
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

/**
* @api
* @since 100.0.2
*/
abstract class Notification extends \Magento\Backend\App\AbstractAction
{
Expand Down
4 changes: 0 additions & 4 deletions app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
*/
namespace Magento\AdminNotification\Controller\Adminhtml\Notification;

/**
* Class \Magento\AdminNotification\Controller\Adminhtml\Notification\Index
*
*/
class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification
{
/**
Expand Down
4 changes: 0 additions & 4 deletions app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
*/
namespace Magento\AdminNotification\Controller\Adminhtml\Notification;

/**
* Class \Magento\AdminNotification\Controller\Adminhtml\Notification\MarkAsRead
*
*/
class MarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Notification
{
/**
Expand Down
4 changes: 0 additions & 4 deletions app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
*/
namespace Magento\AdminNotification\Controller\Adminhtml\Notification;

/**
* Class \Magento\AdminNotification\Controller\Adminhtml\Notification\MassMarkAsRead
*
*/
class MassMarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Notification
{

Expand Down
4 changes: 0 additions & 4 deletions app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
*/
namespace Magento\AdminNotification\Controller\Adminhtml\Notification;

/**
* Class \Magento\AdminNotification\Controller\Adminhtml\Notification\MassRemove
*
*/
class MassRemove extends \Magento\AdminNotification\Controller\Adminhtml\Notification
{

Expand Down
4 changes: 0 additions & 4 deletions app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
*/
namespace Magento\AdminNotification\Controller\Adminhtml\Notification;

/**
* Class \Magento\AdminNotification\Controller\Adminhtml\Notification\Remove
*
*/
class Remove extends \Magento\AdminNotification\Controller\Adminhtml\Notification
{

Expand Down
4 changes: 0 additions & 4 deletions app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
*/
namespace Magento\AdminNotification\Controller\Adminhtml\System\Message;

/**
* Class \Magento\AdminNotification\Controller\Adminhtml\System\Message\ListAction
*
*/
class ListAction extends \Magento\Backend\App\AbstractAction
{
/**
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/AdminNotification/Model/Config/Source/Frequency.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*
* @codeCoverageIgnore
* @api
* @since 100.0.2
*/
class Frequency implements \Magento\Framework\Option\ArrayInterface
{
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/AdminNotification/Model/Feed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* @author Magento Core Team <core@magentocommerce.com>
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @api
* @since 100.0.2
*/
class Feed extends \Magento\Framework\Model\AbstractModel
{
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/AdminNotification/Model/Inbox.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
* @method \Magento\AdminNotification\Model\Inbox setIsRemove(int $value)
*
* @api
* @since 100.0.2
*/
class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierInterface, InboxInterface
{
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/AdminNotification/Model/InboxInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*
* @author Magento Core Team <core@magentocommerce.com>
* @api
* @since 100.0.2
*/
interface InboxInterface
{
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/AdminNotification/Model/NotificationService.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*
* @author Magento Core Team <core@magentocommerce.com>
* @api
* @since 100.0.2
*/
class NotificationService
{
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

/**
* @api
* @since 100.0.2
*/
class Collection extends \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
{
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/AdminNotification/Model/ResourceModel/Inbox.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

/**
* @api
* @since 100.0.2
*/
class Inbox extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
{
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
* @api
* @author Magento Core Team <core@magentocommerce.com>
* @api
* @since 100.0.2
*/
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
{
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Critical.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

/**
* @api
* @since 100.0.2
*/
class Critical extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
{
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Unread.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

/**
* @api
* @since 100.0.2
*/
class Unread extends \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
{
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/AdminNotification/Model/ResourceModel/System/Message.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

/**
* @api
* @since 100.0.2
*/
class Message extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
{
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

/**
* @api
* @since 100.0.2
*/
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
{
Expand Down
1 change: 1 addition & 0 deletions .../Magento/AdminNotification/Model/ResourceModel/System/Message/Collection/Synchronized.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

/**
* @api
* @since 100.0.2
*/
class Synchronized extends \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection
{
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/AdminNotification/Model/System/Message.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
/**
* @codeCoverageIgnore
* @api
* @since 100.0.2
*/
class Message extends \Magento\Framework\Model\AbstractModel implements \Magento\Framework\Notification\MessageInterface
{
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

/**
* @api
* @since 100.0.2
*/
class CacheOutdated implements \Magento\Framework\Notification\MessageInterface
{
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/AdminNotification/Model/System/Message/Media/AbstractSynchronization.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

/**
* @api
* @since 100.0.2
*/
abstract class AbstractSynchronization implements \Magento\Framework\Notification\MessageInterface
{
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

/**
* @api
* @since 100.0.2
*/
class Error extends \Magento\AdminNotification\Model\System\Message\Media\AbstractSynchronization
{
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

/**
* @api
* @since 100.0.2
*/
class Success extends \Magento\AdminNotification\Model\System\Message\Media\AbstractSynchronization
{
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/AdminNotification/Model/System/Message/Security.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

/**
* @api
* @since 100.0.2
*/
class Security implements \Magento\Framework\Notification\MessageInterface
{
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/AdminNotification/Ui/Component/DataProvider/DataProvider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
* @param SynchronizedFactory $messageCollectionFactory
* @param array $meta
* @param array $data
* @since 100.2.0
*/
public function __construct(
$name,
Expand Down
4 changes: 0 additions & 4 deletions app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
use Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing as ExportAdvancedPricing;
use Magento\Catalog\Model\Product as CatalogProduct;

/**
* Class \Magento\AdvancedPricingImportExport\Controller\Adminhtml\Export\GetFilter
*
*/
class GetFilter extends ExportController
{
/**
Expand Down
4 changes: 0 additions & 4 deletions app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
use \Magento\Framework\Validator\AbstractValidator;

/**
* Class \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator
*
*/
class Validator extends AbstractValidator implements RowValidatorInterface
{
/**
Expand Down
4 changes: 0 additions & 4 deletions .../Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing;
use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;

/**
* Class \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator\TierPrice
*
*/
class TierPrice extends \Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractPrice
{
/**
Expand Down
4 changes: 0 additions & 4 deletions ...de/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
use Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator;
use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;

/**
* Class \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator\Website
*
*/
class Website extends AbstractImportValidator implements RowValidatorInterface
{
/**
Expand Down
4 changes: 0 additions & 4 deletions app/code/Magento/AdvancedPricingImportExport/Model/Indexer/Product/Price/Plugin/Import.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@

use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing;

/**
* Class \Magento\AdvancedPricingImportExport\Model\Indexer\Product\Price\Plugin\Import
*
*/
class Import extends \Magento\Catalog\Model\Indexer\Product\Price\Plugin\AbstractPlugin
{
/**
Expand Down
4 changes: 0 additions & 4 deletions app/code/Magento/Authorization/Model/Acl/Loader/Role.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
use Magento\Framework\App\ObjectManager;
use Magento\Framework\Serialize\Serializer\Json;

/**
* Class \Magento\Authorization\Model\Acl\Loader\Role
*
*/
class Role implements \Magento\Framework\Acl\LoaderInterface
{
/**
Expand Down
4 changes: 0 additions & 4 deletions app/code/Magento/Authorization/Model/Acl/Loader/Rule.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
use Magento\Framework\App\ObjectManager;
use Magento\Framework\Serialize\Serializer\Json;

/**
* Class \Magento\Authorization\Model\Acl\Loader\Rule
*
*/
class Rule implements \Magento\Framework\Acl\LoaderInterface
{
/**
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/Authorization/Model/CompositeUserContext.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
* Instead, it will try to find the first suitable child and return its result.
*
* @api
* @since 100.0.2
*/
class CompositeUserContext implements \Magento\Authorization\Model\UserContextInterface
{
Expand Down
Loading

0 comments on commit 3d2f8e4

Please sign in to comment.