diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php index 0dd2e5c4b387f..7f02e4ea13445 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php @@ -6,8 +6,32 @@ */ namespace Magento\Newsletter\Controller\Adminhtml\Subscriber; -class MassDelete extends \Magento\Newsletter\Controller\Adminhtml\Subscriber +use Magento\Newsletter\Controller\Adminhtml\Subscriber; +use Magento\Backend\App\Action\Context; +use Magento\Framework\App\Response\Http\FileFactory; +use Magento\Newsletter\Model\SubscriberFactory; +use Magento\Framework\App\ObjectManager; + +class MassDelete extends Subscriber { + /** + * @var SubscriberFactory + */ + private $subscriberFactory; + + /** + * @param Context $context + * @param FileFactory $fileFactory + */ + public function __construct( + Context $context, + FileFactory $fileFactory, + SubscriberFactory $subscriberFactory = null + ) { + $this->subscriberFactory = $subscriberFactory ?: ObjectManager::getInstance()->get(SubscriberFactory::class); + parent::__construct($context, $fileFactory); + } + /** * Delete one or more subscribers action * @@ -21,9 +45,7 @@ public function execute() } else { try { foreach ($subscribersIds as $subscriberId) { - $subscriber = $this->_objectManager->create( - \Magento\Newsletter\Model\Subscriber::class - )->load( + $subscriber = $this->subscriberFactory->create()->load( $subscriberId ); $subscriber->delete(); diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php index f294d23f46ece..b61494f795905 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php @@ -6,8 +6,33 @@ */ namespace Magento\Newsletter\Controller\Adminhtml\Subscriber; -class MassUnsubscribe extends \Magento\Newsletter\Controller\Adminhtml\Subscriber +use Magento\Newsletter\Controller\Adminhtml\Subscriber; +use Magento\Backend\App\Action\Context; +use Magento\Framework\App\Response\Http\FileFactory; +use Magento\Newsletter\Model\SubscriberFactory; +use Magento\Framework\App\ObjectManager; + +class MassUnsubscribe extends Subscriber { + /** + * @var SubscriberFactory + */ + private $subscriberFactory; + + /** + * @param Context $context + * @param FileFactory $fileFactory + * @param SubscriberFactory $subscriberFactory + */ + public function __construct( + Context $context, + FileFactory $fileFactory, + SubscriberFactory $subscriberFactory = null + ) { + $this->subscriberFactory = $subscriberFactory ?: ObjectManager::getInstance()->get(SubscriberFactory::class); + parent::__construct($context, $fileFactory); + } + /** * Unsubscribe one or more subscribers action * @@ -21,9 +46,7 @@ public function execute() } else { try { foreach ($subscribersIds as $subscriberId) { - $subscriber = $this->_objectManager->create( - \Magento\Newsletter\Model\Subscriber::class - )->load( + $subscriber = $this->subscriberFactory->create()->load( $subscriberId ); $subscriber->unsubscribe();