Adds one entry point for both JSON and MP APIs
Removes endpoints folder and moves versions to the root JSON API folder
This commit is contained in:
@@ -84,7 +84,7 @@ class APITest extends MailPoetTest {
|
||||
|
||||
function testItAcceptsAndProcessesAPIVersion() {
|
||||
$namespace = array(
|
||||
'name' => 'MailPoet\API\JSON\Endpoints\v2',
|
||||
'name' => 'MailPoet\API\JSON\v2',
|
||||
'version' => 'v2'
|
||||
);
|
||||
$this->api->addEndpointNamespace($namespace['name'], $namespace['version']);
|
||||
@@ -98,13 +98,13 @@ class APITest extends MailPoetTest {
|
||||
|
||||
expect($this->api->getRequestedAPIVersion())->equals('v2');
|
||||
expect($this->api->getRequestedEndpointClass())->equals(
|
||||
'MailPoet\API\JSON\Endpoints\v2\NamespacedEndpointStub'
|
||||
'MailPoet\API\JSON\v2\NamespacedEndpointStub'
|
||||
);
|
||||
}
|
||||
|
||||
function testItCallsAddedEndpoints() {
|
||||
$namespace = array(
|
||||
'name' => 'MailPoet\API\JSON\Endpoints\v1',
|
||||
'name' => 'MailPoet\API\JSON\v1',
|
||||
'version' => 'v1'
|
||||
);
|
||||
$this->api->addEndpointNamespace($namespace['name'], $namespace['version']);
|
||||
@@ -123,7 +123,7 @@ class APITest extends MailPoetTest {
|
||||
|
||||
function testItCallsAddedEndpointsForSpecificAPIVersion() {
|
||||
$namespace = array(
|
||||
'name' => 'MailPoet\API\JSON\Endpoints\v2',
|
||||
'name' => 'MailPoet\API\JSON\v2',
|
||||
'version' => 'v2'
|
||||
);
|
||||
$this->api->addEndpointNamespace($namespace['name'], $namespace['version']);
|
||||
|
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace MailPoet\API\JSON\Endpoints\v1;
|
||||
namespace MailPoet\API\JSON\v1;
|
||||
|
||||
use MailPoet\API\JSON\Endpoint as APIEndpoint;
|
||||
use MailPoet\API\JSON\Access as APIAccess;
|
||||
|
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace MailPoet\API\JSON\Endpoints\v2;
|
||||
namespace MailPoet\API\JSON\v2;
|
||||
|
||||
use MailPoet\API\JSON\Access as APIAccess;
|
||||
use MailPoet\API\JSON\Endpoint as APIEndpoint;
|
||||
|
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
use MailPoet\API\JSON\Endpoints\v1\CustomFields;
|
||||
use MailPoet\API\JSON\v1\CustomFields;
|
||||
use MailPoet\API\JSON\Response as APIResponse;
|
||||
use MailPoet\Models\CustomField;
|
||||
|
@@ -1,5 +1,5 @@
|
||||
<?php
|
||||
use MailPoet\API\JSON\Endpoints\v1\Forms;
|
||||
use MailPoet\API\JSON\v1\Forms;
|
||||
use MailPoet\API\JSON\Response as APIResponse;
|
||||
use MailPoet\Models\Form;
|
||||
use MailPoet\Models\Segment;
|
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
use MailPoet\API\JSON\Endpoints\v1\Mailer;
|
||||
use MailPoet\API\JSON\v1\Mailer;
|
||||
use MailPoet\API\JSON\Response as APIResponse;
|
||||
use MailPoet\Mailer\MailerLog;
|
||||
|
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
use MailPoet\API\JSON\Response as APIResponse;
|
||||
use MailPoet\API\JSON\Endpoints\v1\NewsletterTemplates;
|
||||
use MailPoet\API\JSON\v1\NewsletterTemplates;
|
||||
use MailPoet\Models\NewsletterTemplate;
|
||||
|
||||
class NewsletterTemplatesTest extends MailPoetTest {
|
@@ -3,7 +3,7 @@ use Carbon\Carbon;
|
||||
use Codeception\Util\Fixtures;
|
||||
use Codeception\Util\Stub;
|
||||
use Helper\WordPressHooks as WPHooksHelper;
|
||||
use MailPoet\API\JSON\Endpoints\v1\Newsletters;
|
||||
use MailPoet\API\JSON\v1\Newsletters;
|
||||
use MailPoet\API\JSON\Response as APIResponse;
|
||||
use MailPoet\Models\Newsletter;
|
||||
use MailPoet\Models\NewsletterOptionField;
|
@@ -1,5 +1,5 @@
|
||||
<?php
|
||||
use MailPoet\API\JSON\Endpoints\v1\Segments;
|
||||
use MailPoet\API\JSON\v1\Segments;
|
||||
use MailPoet\API\JSON\Response as APIResponse;
|
||||
use MailPoet\Models\Segment;
|
||||
|
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
|
||||
use Codeception\Util\Stub;
|
||||
use MailPoet\API\JSON\Endpoints\v1\Services;
|
||||
use MailPoet\API\JSON\v1\Services;
|
||||
use MailPoet\API\JSON\Response as APIResponse;
|
||||
use MailPoet\Services\Bridge;
|
||||
|
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
use MailPoet\API\JSON\Response as APIResponse;
|
||||
use MailPoet\API\JSON\Error as APIError;
|
||||
use MailPoet\API\JSON\Endpoints\v1\Settings;
|
||||
use MailPoet\API\JSON\v1\Settings;
|
||||
use MailPoet\Models\Setting;
|
||||
|
||||
class SettingsTest extends MailPoetTest {
|
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
use Helper\WordPressHooks as WPHooksHelper;
|
||||
use MailPoet\API\JSON\Response as APIResponse;
|
||||
use MailPoet\API\JSON\Endpoints\v1\Setup;
|
||||
use MailPoet\API\JSON\v1\Setup;
|
||||
use MailPoet\Models\Setting;
|
||||
|
||||
class SetupTest extends MailPoetTest {
|
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
|
||||
use Codeception\Util\Fixtures;
|
||||
use MailPoet\API\JSON\Endpoints\v1\Subscribers;
|
||||
use MailPoet\API\JSON\v1\Subscribers;
|
||||
use MailPoet\API\JSON\Response as APIResponse;
|
||||
use MailPoet\Models\Form;
|
||||
use MailPoet\Models\Subscriber;
|
Reference in New Issue
Block a user