Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Use DI for Activator in Setup API

Browse Source 
[MAILPOET-2014]
This commit is contained in:
Jan Jakeš
2019-07-05 17:42:56 +02:00
committed by M. Shull
parent 4cbc89368c
commit 80d0e7e0f7
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/API/JSON/v1/Setup.php
View File

@ -6,29 +6,29 @@ use MailPoet\API\JSON\Endpoint as APIEndpoint;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
use MailPoet\Config\AccessControl; use MailPoet\Config\AccessControl;
use MailPoet\Config\Activator; use MailPoet\Config\Activator;
use MailPoet\Config\Populator;
use MailPoet\Settings\SettingsController;
use MailPoet\Subscription\Captcha;
if (!defined('ABSPATH')) exit; if (!defined('ABSPATH')) exit;
class Setup extends APIEndpoint { class Setup extends APIEndpoint {
private $wp;
public $permissions = [ public $permissions = [
'global' => AccessControl::PERMISSION_MANAGE_SETTINGS, 'global' => AccessControl::PERMISSION_MANAGE_SETTINGS,
]; ];
function __construct(WPFunctions $wp) { /** @var WPFunctions */
private $wp;
/** @var Activator */
private $activator;
function __construct(WPFunctions $wp, Activator $activator) {
$this->wp = $wp; $this->wp = $wp;
$this->activator = $activator;
} }
function reset() { function reset() {
try { try {
$settings = new SettingsController(); $this->activator->deactivate();
$captcha = new Captcha(); $this->activator->activate();
$activator = new Activator($settings, new Populator($settings, $this->wp, $captcha));
$activator->deactivate();
$activator->activate();
$this->wp->doAction('mailpoet_setup_reset'); $this->wp->doAction('mailpoet_setup_reset');
return $this->successResponse(); return $this->successResponse();
} catch (\Exception $e) { } catch (\Exception $e) {

6
tests/integration/API/JSON/v1/SetupTest.php
View File

@ -2,6 +2,8 @@
namespace MailPoet\Test\API\JSON\v1; namespace MailPoet\Test\API\JSON\v1;
use Codeception\Stub; use Codeception\Stub;
use MailPoet\Config\Activator;
use MailPoet\Config\Populator;
use MailPoet\Models\Setting; use MailPoet\Models\Setting;
use MailPoet\API\JSON\v1\Setup; use MailPoet\API\JSON\v1\Setup;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
@ -22,7 +24,9 @@ class SetupTest extends \MailPoetTest {
'doAction' => asCallable([WPHooksHelper::class, 'doAction']), 'doAction' => asCallable([WPHooksHelper::class, 'doAction']),
]); ]);
$router = new Setup($wp); $settings = new SettingsController();
$populator = new Populator($settings, $wp, new Captcha());
$router = new Setup($wp, new Activator($settings, $populator));
$response = $router->reset(); $response = $router->reset();
expect($response->status)->equals(APIResponse::STATUS_OK); expect($response->status)->equals(APIResponse::STATUS_OK);