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

Moves AccessControl initialization outside of API to Initializer

Browse Source
This commit is contained in:
Vlad
2017-08-23 11:25:39 -04:00
parent 7c23415d26
commit 316fa91a10
6 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/API/API.php
View File

@ -1,4 +1,5 @@
<?php <?php
namespace MailPoet\API; namespace MailPoet\API;
use MailPoet\Config\AccessControl; use MailPoet\Config\AccessControl;
@ -6,8 +7,7 @@ use MailPoet\Config\AccessControl;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
class API { class API {
static function JSON() { static function JSON(AccessControl $access_control) {
$access_control = new AccessControl();
return new \MailPoet\API\JSON\API($access_control); return new \MailPoet\API\JSON\API($access_control);
} }

2
lib/Config/Initializer.php
View File

@ -223,7 +223,7 @@ class Initializer {
} }
function setupJSONAPI() { function setupJSONAPI() {
API\API::JSON()->init(); API\API::JSON($this->access_control)->init();
} }
function setupRouter() { function setupRouter() {

4
lib/Form/Widget.php
View File

@ -3,7 +3,7 @@
namespace MailPoet\Form; namespace MailPoet\Form;
use MailPoet\API\JSON\API; use MailPoet\API\JSON\API;
use MailPoet\Config\Renderer; use MailPoet\Config\Renderer as ConfigRenderer;
use MailPoet\Form\Renderer as FormRenderer; use MailPoet\Form\Renderer as FormRenderer;
use MailPoet\Models\Form; use MailPoet\Models\Form;
use MailPoet\Util\Security; use MailPoet\Util\Security;
@ -174,7 +174,7 @@ class Widget extends \WP_Widget {
$data['api_version'] = API::CURRENT_VERSION; $data['api_version'] = API::CURRENT_VERSION;
// render form // render form
$renderer = new Renderer(); $renderer = new ConfigRenderer();
try { try {
$output = $renderer->render('form/widget.html', $data); $output = $renderer->render('form/widget.html', $data);
$output = do_shortcode($output); $output = do_shortcode($output);

3
lib/Subscription/Form.php
View File

@ -4,12 +4,13 @@ namespace MailPoet\Subscription;
use MailPoet\API\API as API; use MailPoet\API\API as API;
use MailPoet\API\JSON\Response as APIResponse; use MailPoet\API\JSON\Response as APIResponse;
use MailPoet\Config\AccessControl;
use MailPoet\Util\Url as UrlHelper; use MailPoet\Util\Url as UrlHelper;
class Form { class Form {
static function onSubmit($request_data = false) { static function onSubmit($request_data = false) {
$request_data = ($request_data) ? $request_data : $_REQUEST; $request_data = ($request_data) ? $request_data : $_REQUEST;
$api = API::JSON(); $api = API::JSON(new AccessControl());
$api->setRequestData($request_data); $api->setRequestData($request_data);
$form_id = (!empty($request_data['data']['form_id'])) ? (int)$request_data['data']['form_id'] : false; $form_id = (!empty($request_data['data']['form_id'])) ? (int)$request_data['data']['form_id'] : false;
$response = $api->processRoute(); $response = $api->processRoute();

3
tests/unit/API/APITest.php
View File

@ -2,10 +2,11 @@
namespace MailPoet\Test\API; namespace MailPoet\Test\API;
use MailPoet\API\API; use MailPoet\API\API;
use MailPoet\Config\AccessControl;
class APITest extends \MailPoetTest { class APITest extends \MailPoetTest {
function testItCallsJSONAPI() { function testItCallsJSONAPI() {
expect(API::JSON())->isInstanceOf('MailPoet\API\JSON\API'); expect(API::JSON(new AccessControl()))->isInstanceOf('MailPoet\API\JSON\API');
} }
function testItCallsMPAPI() { function testItCallsMPAPI() {

2
tests/unit/API/JSON/APITest.php
View File

@ -28,7 +28,7 @@ class APITest extends \MailPoetTest {
} else { } else {
$this->wp_user_id = $wp_user_id; $this->wp_user_id = $wp_user_id;
} }
$this->api = API::JSON(); $this->api = API::JSON(new AccessControl());
} }
function testItCallsAPISetupAction() { function testItCallsAPISetupAction() {