Adds one entry point for both JSON and MP APIs

Removes endpoints folder and moves versions to the root
JSON API folder

lib/API/API.php

@@ -0,0 +1,18 @@
+<?php
+namespace MailPoet\API;
+
+if(!defined('ABSPATH')) exit;
+
+class API {
+  static function JSON() {
+    return new \MailPoet\API\JSON\API();
+  }
+
+  static function MP($version) {
+    $api_class = sprintf('%s\MP\%s\API', __NAMESPACE__, $version);
+    if(class_exists($api_class)) {
+      return new $api_class();
+    }
+    throw new \Exception(__('Invalid API version.', 'mailpoet'));
+  }
+}

lib/API/JSON/API.php

@@ -20,12 +20,11 @@ class API {
       'v1'
   );
   const CURRENT_VERSION = 'v1';
-  const ENDPOINTS_LOCATION = 'Endpoints';
 
   function __construct() {
     foreach($this->_available_api_versions as $available_api_version) {
       $this->addEndpointNamespace(
-        sprintf('%s\%s\%s', __NAMESPACE__, self::ENDPOINTS_LOCATION, $available_api_version),
+        sprintf('%s\%s', __NAMESPACE__, $available_api_version),
         $available_api_version
       );
     }

lib/API/JSON/v1/AutomatedLatestContent.php

@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\API\JSON\Endpoints\v1;
+namespace MailPoet\API\JSON\v1;
 use MailPoet\API\JSON\Endpoint as APIEndpoint;
 use MailPoet\WP\Posts as WPPosts;
 

lib/API/JSON/v1/CustomFields.php

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

lib/API/JSON/v1/Forms.php

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

lib/API/JSON/v1/ImportExport.php

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

lib/API/JSON/v1/Mailer.php

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

lib/API/JSON/v1/NewsletterTemplates.php

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

lib/API/JSON/v1/Newsletters.php

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

lib/API/JSON/v1/Segments.php

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

lib/API/JSON/v1/SendingQueue.php

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

lib/API/JSON/v1/Services.php

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

lib/API/JSON/v1/Settings.php

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

lib/API/JSON/v1/Setup.php

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

lib/API/JSON/v1/Subscribers.php

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

lib/API/MP/API.php

@@ -1,15 +0,0 @@
-<?php
-namespace MailPoet\MP\API;
-
-if(!defined('ABSPATH')) exit;
-
-class API {
-  static function __callStatic($version, $arguments) {
-    $api_class = sprintf('%s\%s\API', __NAMESPACE__, $version);
-    if(class_exists($api_class)) {
-      $api = new $api_class();
-      return $api;
-    }
-    throw new \Exception(__('Invalid API version.', 'mailpoet'));
-  }
-}

lib/Config/Initializer.php

@@ -172,8 +172,7 @@ class Initializer {
   }
 
   function setupJSONAPI() {
-    $api = new API\JSON\API();
+    API\API::JSON()->init();
-    $api->init();
   }
 
   function setupRouter() {

tests/unit/API/JSON/APITest.php

@@ -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']);

tests/unit/API/JSON/APITestNamespacedEndpointStubV1.php

@@ -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;

tests/unit/API/JSON/APITestNamespacedEndpointStubV2.php

@@ -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;

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

@@ -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;
 

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

@@ -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;

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

@@ -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;
 

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

@@ -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 {

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

@@ -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;

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

@@ -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;
 

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

@@ -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;
 

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

@@ -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 {

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

@@ -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 {

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

@@ -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;