Skip to content

[Forwardport] Remove direct use of object manager #17042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 25, 2018
Merged

[Forwardport] Remove direct use of object manager #17042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdaf11a
Remove direct use of object manager
AnshuMishra17 Jul 16, 2018
3109186
DocBlock fix
Jul 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand All @@ -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();
Expand Down
31 changes: 27 additions & 4 deletions app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand All @@ -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();
Expand Down