Moves current API under JSON namespace

lib/API/JSON/API.php

@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\API;
+namespace MailPoet\API\JSON;
 
 use MailPoet\Config\Env;
 use MailPoet\Util\Helpers;

lib/API/JSON/Access.php

@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\API;
+namespace MailPoet\API\JSON;
 
 if(!defined('ABSPATH')) exit;
 

lib/API/JSON/Endpoint.php

@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\API;
+namespace MailPoet\API\JSON;
 
 if(!defined('ABSPATH')) exit;
 

lib/API/JSON/Endpoints/v1/AutomatedLatestContent.php

@@ -1,6 +1,6 @@
 <?php
-namespace MailPoet\API\Endpoints\v1;
-use MailPoet\API\Endpoint as APIEndpoint;
+namespace MailPoet\API\JSON\Endpoints\v1;
+use MailPoet\API\JSON\Endpoint as APIEndpoint;
 use MailPoet\WP\Posts as WPPosts;
 
 if(!defined('ABSPATH')) exit;

lib/API/JSON/Endpoints/v1/CustomFields.php

@@ -1,7 +1,7 @@
 <?php
-namespace MailPoet\API\Endpoints\v1;
-use MailPoet\API\Endpoint as APIEndpoint;
-use MailPoet\API\Error as APIError;
+namespace MailPoet\API\JSON\Endpoints\v1;
+use MailPoet\API\JSON\Endpoint as APIEndpoint;
+use MailPoet\API\JSON\Error as APIError;
 use MailPoet\Models\CustomField;
 
 if(!defined('ABSPATH')) exit;

lib/API/JSON/Endpoints/v1/Forms.php

@@ -1,7 +1,7 @@
 <?php
-namespace MailPoet\API\Endpoints\v1;
-use MailPoet\API\Endpoint as APIEndpoint;
-use MailPoet\API\Error as APIError;
+namespace MailPoet\API\JSON\Endpoints\v1;
+use MailPoet\API\JSON\Endpoint as APIEndpoint;
+use MailPoet\API\JSON\Error as APIError;
 
 use MailPoet\Models\Form;
 use MailPoet\Models\StatisticsForms;

lib/API/JSON/Endpoints/v1/ImportExport.php

@@ -1,6 +1,6 @@
 <?php
-namespace MailPoet\API\Endpoints\v1;
-use MailPoet\API\Endpoint as APIEndpoint;
+namespace MailPoet\API\JSON\Endpoints\v1;
+use MailPoet\API\JSON\Endpoint as APIEndpoint;
 
 use MailPoet\Subscribers\ImportExport\Import\MailChimp;
 use MailPoet\Models\Segment;

lib/API/JSON/Endpoints/v1/Mailer.php

@@ -1,7 +1,7 @@
 <?php
-namespace MailPoet\API\Endpoints\v1;
-use MailPoet\API\Endpoint as APIEndpoint;
-use MailPoet\API\Error as APIError;
+namespace MailPoet\API\JSON\Endpoints\v1;
+use MailPoet\API\JSON\Endpoint as APIEndpoint;
+use MailPoet\API\JSON\Error as APIError;
 use MailPoet\Mailer\MailerLog;
 
 if(!defined('ABSPATH')) exit;

lib/API/JSON/Endpoints/v1/NewsletterTemplates.php

@@ -1,7 +1,7 @@
 <?php
-namespace MailPoet\API\Endpoints\v1;
-use MailPoet\API\Endpoint as APIEndpoint;
-use MailPoet\API\Error as APIError;
+namespace MailPoet\API\JSON\Endpoints\v1;
+use MailPoet\API\JSON\Endpoint as APIEndpoint;
+use MailPoet\API\JSON\Error as APIError;
 
 use MailPoet\Models\NewsletterTemplate;
 

lib/API/JSON/Endpoints/v1/Newsletters.php

@@ -1,8 +1,8 @@
 <?php
-namespace MailPoet\API\Endpoints\v1;
+namespace MailPoet\API\JSON\Endpoints\v1;
 
-use MailPoet\API\Endpoint as APIEndpoint;
-use MailPoet\API\Error as APIError;
+use MailPoet\API\JSON\Endpoint as APIEndpoint;
+use MailPoet\API\JSON\Error as APIError;
 use MailPoet\Listing;
 use MailPoet\Models\SendingQueue;
 use MailPoet\Models\Setting;

lib/API/JSON/Endpoints/v1/Segments.php

@@ -1,7 +1,7 @@
 <?php
-namespace MailPoet\API\Endpoints\v1;
-use MailPoet\API\Endpoint as APIEndpoint;
-use MailPoet\API\Error as APIError;
+namespace MailPoet\API\JSON\Endpoints\v1;
+use MailPoet\API\JSON\Endpoint as APIEndpoint;
+use MailPoet\API\JSON\Error as APIError;
 
 use MailPoet\Models\Segment;
 use MailPoet\Listing;

lib/API/JSON/Endpoints/v1/SendingQueue.php

@@ -1,7 +1,7 @@
 <?php
-namespace MailPoet\API\Endpoints\v1;
-use MailPoet\API\Endpoint as APIEndpoint;
-use MailPoet\API\Error as APIError;
+namespace MailPoet\API\JSON\Endpoints\v1;
+use MailPoet\API\JSON\Endpoint as APIEndpoint;
+use MailPoet\API\JSON\Error as APIError;
 
 use MailPoet\Mailer\Mailer;
 use MailPoet\Models\Newsletter;

lib/API/JSON/Endpoints/v1/Services.php

@@ -1,8 +1,8 @@
 <?php
-namespace MailPoet\API\Endpoints\v1;
+namespace MailPoet\API\JSON\Endpoints\v1;
 
-use MailPoet\API\Endpoint as APIEndpoint;
-use MailPoet\API\Error as APIError;
+use MailPoet\API\JSON\Endpoint as APIEndpoint;
+use MailPoet\API\JSON\Error as APIError;
 use MailPoet\Services\Bridge;
 use MailPoet\Util\License\License;
 use MailPoet\WP\DateTime;

lib/API/JSON/Endpoints/v1/Settings.php

@@ -1,8 +1,8 @@
 <?php
-namespace MailPoet\API\Endpoints\v1;
+namespace MailPoet\API\JSON\Endpoints\v1;
 
-use MailPoet\API\Endpoint as APIEndpoint;
-use MailPoet\API\Error as APIError;
+use MailPoet\API\JSON\Endpoint as APIEndpoint;
+use MailPoet\API\JSON\Error as APIError;
 use MailPoet\Models\Setting;
 use MailPoet\Services\Bridge;
 

lib/API/JSON/Endpoints/v1/Setup.php

@@ -1,7 +1,7 @@
 <?php
-namespace MailPoet\API\Endpoints\v1;
+namespace MailPoet\API\JSON\Endpoints\v1;
 
-use MailPoet\API\Endpoint as APIEndpoint;
+use MailPoet\API\JSON\Endpoint as APIEndpoint;
 use MailPoet\Config\Activator;
 use MailPoet\WP\Hooks;
 

lib/API/JSON/Endpoints/v1/Subscribers.php

@@ -1,8 +1,8 @@
 <?php
-namespace MailPoet\API\Endpoints\v1;
-use MailPoet\API\Endpoint as APIEndpoint;
-use MailPoet\API\Error as APIError;
-use MailPoet\API\Access as APIAccess;
+namespace MailPoet\API\JSON\Endpoints\v1;
+use MailPoet\API\JSON\Endpoint as APIEndpoint;
+use MailPoet\API\JSON\Error as APIError;
+use MailPoet\API\JSON\Access as APIAccess;
 
 use MailPoet\Listing;
 use MailPoet\Models\Subscriber;

lib/API/JSON/Error.php

@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\API;
+namespace MailPoet\API\JSON;
 
 if(!defined('ABSPATH')) exit;
 

lib/API/JSON/ErrorResponse.php

@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\API;
+namespace MailPoet\API\JSON;
 
 if(!defined('ABSPATH')) exit;
 

lib/API/JSON/Response.php

@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\API;
+namespace MailPoet\API\JSON;
 
 if(!defined('ABSPATH')) exit;
 

lib/API/JSON/SuccessResponse.php

@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\API;
+namespace MailPoet\API\JSON;
 
 if(!defined('ABSPATH')) exit;
 

lib/Config/Initializer.php

@@ -98,7 +98,7 @@ class Initializer {
     }
 
     try {
-      $this->setupAPI();
+      $this->setupJSONAPI();
       $this->setupRouter();
       $this->setupPages();
     } catch(\Exception $e) {
@@ -171,8 +171,8 @@ class Initializer {
     $hooks->init();
   }
 
-  function setupAPI() {
-    $api = new API\API();
+  function setupJSONAPI() {
+    $api = new API\JSON\API();
     $api->init();
   }
 

lib/Form/Widget.php

@@ -1,6 +1,6 @@
 <?php
 namespace MailPoet\Form;
-use MailPoet\API\API;
+use MailPoet\API\JSON\API;
 use MailPoet\Config\Renderer;
 use MailPoet\Models\Form;
 use MailPoet\Form\Renderer as FormRenderer;

lib/Subscription/Form.php

@@ -1,8 +1,8 @@
 <?php
 namespace MailPoet\Subscription;
 
-use MailPoet\API\API;
-use MailPoet\API\Endpoints\Subscribers;
+use MailPoet\API\JSON\API;
+use MailPoet\API\JSON\Endpoints\Subscribers;
 use MailPoet\API\Response as APIResponse;
 use MailPoet\Util\Url;
 

tests/unit/API/JSON/APITest.php

@@ -1,9 +1,9 @@
 <?php
 
 use Codeception\Util\Stub;
-use MailPoet\API\API;
-use MailPoet\API\SuccessResponse;
-use MailPoet\API\Response as APIResponse;
+use MailPoet\API\JSON\API;
+use MailPoet\API\JSON\SuccessResponse;
+use MailPoet\API\JSON\Response as APIResponse;
 
 // required to be able to use wp_delete_user()
 require_once(ABSPATH.'wp-admin/includes/user.php');
@@ -84,7 +84,7 @@ class APITest extends MailPoetTest {
 
   function testItAcceptsAndProcessesAPIVersion() {
     $namespace = array(
-      'name' => 'MailPoet\API\Endpoints\v2',
+      'name' => 'MailPoet\API\JSON\Endpoints\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\Endpoints\v2\NamespacedEndpointStub'
+      'MailPoet\API\JSON\Endpoints\v2\NamespacedEndpointStub'
     );
   }
 
   function testItCallsAddedEndpoints() {
     $namespace = array(
-      'name' => 'MailPoet\API\Endpoints\v1',
+      'name' => 'MailPoet\API\JSON\Endpoints\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\Endpoints\v2',
+      'name' => 'MailPoet\API\JSON\Endpoints\v2',
       'version' => 'v2'
     );
     $this->api->addEndpointNamespace($namespace['name'], $namespace['version']);

tests/unit/API/JSON/APITestNamespacedEndpointStubV1.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace MailPoet\API\Endpoints\v1;
+namespace MailPoet\API\JSON\Endpoints\v1;
 
-use MailPoet\API\Endpoint as APIEndpoint;
-use MailPoet\API\Access as APIAccess;
+use MailPoet\API\JSON\Endpoint as APIEndpoint;
+use MailPoet\API\JSON\Access as APIAccess;
 
 if(!defined('ABSPATH')) exit;
 

tests/unit/API/JSON/APITestNamespacedEndpointStubV2.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace MailPoet\API\Endpoints\v2;
+namespace MailPoet\API\JSON\Endpoints\v2;
 
-use MailPoet\API\Access as APIAccess;
-use MailPoet\API\Endpoint as APIEndpoint;
+use MailPoet\API\JSON\Access as APIAccess;
+use MailPoet\API\JSON\Endpoint as APIEndpoint;
 
 if(!defined('ABSPATH')) exit;
 

tests/unit/API/JSON/Endpoints/v1/CustomFieldsTest.php

@@ -1,7 +1,7 @@
 <?php
 
-use MailPoet\API\Endpoints\v1\CustomFields;
-use MailPoet\API\Response as APIResponse;
+use MailPoet\API\JSON\Endpoints\v1\CustomFields;
+use MailPoet\API\JSON\Response as APIResponse;
 use MailPoet\Models\CustomField;
 
 class CustomFieldsTest extends MailPoetTest {

tests/unit/API/JSON/Endpoints/v1/FormsTest.php

@@ -1,6 +1,6 @@
 <?php
-use MailPoet\API\Endpoints\v1\Forms;
-use MailPoet\API\Response as APIResponse;
+use MailPoet\API\JSON\Endpoints\v1\Forms;
+use MailPoet\API\JSON\Response as APIResponse;
 use MailPoet\Models\Form;
 use MailPoet\Models\Segment;
 

tests/unit/API/JSON/Endpoints/v1/MailerTest.php

@@ -1,7 +1,7 @@
 <?php
 
-use MailPoet\API\Endpoints\v1\Mailer;
-use MailPoet\API\Response as APIResponse;
+use MailPoet\API\JSON\Endpoints\v1\Mailer;
+use MailPoet\API\JSON\Response as APIResponse;
 use MailPoet\Mailer\MailerLog;
 
 class MailerEndpointTest extends MailPoetTest {

tests/unit/API/JSON/Endpoints/v1/NewsletterTemplatesTest.php

@@ -1,6 +1,6 @@
 <?php
-use MailPoet\API\Response as APIResponse;
-use MailPoet\API\Endpoints\v1\NewsletterTemplates;
+use MailPoet\API\JSON\Response as APIResponse;
+use MailPoet\API\JSON\Endpoints\v1\NewsletterTemplates;
 use MailPoet\Models\NewsletterTemplate;
 
 class NewsletterTemplatesTest extends MailPoetTest {

tests/unit/API/JSON/Endpoints/v1/NewslettersTest.php

@@ -3,8 +3,8 @@ use Carbon\Carbon;
 use Codeception\Util\Fixtures;
 use Codeception\Util\Stub;
 use Helper\WordPressHooks as WPHooksHelper;
-use MailPoet\API\Endpoints\v1\Newsletters;
-use MailPoet\API\Response as APIResponse;
+use MailPoet\API\JSON\Endpoints\v1\Newsletters;
+use MailPoet\API\JSON\Response as APIResponse;
 use MailPoet\Models\Newsletter;
 use MailPoet\Models\NewsletterOptionField;
 use MailPoet\Models\NewsletterSegment;

tests/unit/API/JSON/Endpoints/v1/SegmentsTest.php

@@ -1,6 +1,6 @@
 <?php
-use MailPoet\API\Endpoints\v1\Segments;
-use MailPoet\API\Response as APIResponse;
+use MailPoet\API\JSON\Endpoints\v1\Segments;
+use MailPoet\API\JSON\Response as APIResponse;
 use MailPoet\Models\Segment;
 
 class SegmentsTest extends MailPoetTest {

tests/unit/API/JSON/Endpoints/v1/ServicesTest.php

@@ -1,8 +1,8 @@
 <?php
 
 use Codeception\Util\Stub;
-use MailPoet\API\Endpoints\v1\Services;
-use MailPoet\API\Response as APIResponse;
+use MailPoet\API\JSON\Endpoints\v1\Services;
+use MailPoet\API\JSON\Response as APIResponse;
 use MailPoet\Services\Bridge;
 
 class ServicesTest extends MailPoetTest {

tests/unit/API/JSON/Endpoints/v1/SettingsTest.php

@@ -1,7 +1,7 @@
 <?php
-use MailPoet\API\Response as APIResponse;
-use MailPoet\API\Error as APIError;
-use MailPoet\API\Endpoints\v1\Settings;
+use MailPoet\API\JSON\Response as APIResponse;
+use MailPoet\API\JSON\Error as APIError;
+use MailPoet\API\JSON\Endpoints\v1\Settings;
 use MailPoet\Models\Setting;
 
 class SettingsTest extends MailPoetTest {

tests/unit/API/JSON/Endpoints/v1/SetupTest.php

@@ -1,7 +1,7 @@
 <?php
 use Helper\WordPressHooks as WPHooksHelper;
-use MailPoet\API\Response as APIResponse;
-use MailPoet\API\Endpoints\v1\Setup;
+use MailPoet\API\JSON\Response as APIResponse;
+use MailPoet\API\JSON\Endpoints\v1\Setup;
 use MailPoet\Models\Setting;
 
 class SetupTest extends MailPoetTest {

tests/unit/API/JSON/Endpoints/v1/SubscribersTest.php

@@ -1,8 +1,8 @@
 <?php
 
 use Codeception\Util\Fixtures;
-use MailPoet\API\Endpoints\v1\Subscribers;
-use MailPoet\API\Response as APIResponse;
+use MailPoet\API\JSON\Endpoints\v1\Subscribers;
+use MailPoet\API\JSON\Response as APIResponse;
 use MailPoet\Models\Form;
 use MailPoet\Models\Subscriber;
 use MailPoet\Models\Segment;

tests/unit/Cron/Triggers/MailPoetTest.php

@@ -1,6 +1,6 @@
 <?php
 
-use MailPoet\API\Endpoints\Cron;
+use MailPoet\API\JSON\Endpoints\Cron;
 use MailPoet\Cron\CronHelper;
 use MailPoet\Cron\Triggers\MailPoet;
 use MailPoet\Models\Setting;

tests/unit/Cron/Triggers/WordPressTest.php

@@ -1,7 +1,7 @@
 <?php
 
 use Carbon\Carbon;
-use MailPoet\API\Endpoints\Cron;
+use MailPoet\API\JSON\Endpoints\Cron;
 use MailPoet\Cron\CronHelper;
 use MailPoet\Cron\Triggers\WordPress;
 use MailPoet\Mailer\Mailer;