Moved current Router files to API

- updated Unit tests to reflect the change

lib/API/API.php

@@ -1,10 +1,11 @@
 <?php
-namespace MailPoet\Router;
+namespace MailPoet\API;
+
 use \MailPoet\Util\Security;
 
 if(!defined('ABSPATH')) exit;
 
-class Router {
+class API {
   function __construct() {
   }
 

lib/API/AutomatedLatestContent.php

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

lib/API/Cron.php

@@ -1,5 +1,6 @@
 <?php
-namespace MailPoet\Router;
+namespace MailPoet\API;
+
 
 use MailPoet\Cron\CronHelper;
 use MailPoet\Cron\Supervisor;

lib/API/CustomFields.php

@@ -1,5 +1,6 @@
 <?php
-namespace MailPoet\Router;
+namespace MailPoet\API;
+
 use \MailPoet\Models\CustomField;
 
 if(!defined('ABSPATH')) exit;

lib/API/Forms.php

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

lib/API/ImportExport.php

@@ -1,5 +1,6 @@
 <?php
-namespace MailPoet\Router;
+namespace MailPoet\API;
+
 
 use MailPoet\Subscribers\ImportExport\Import\MailChimp;
 use MailPoet\Models\CustomField;

lib/API/Mailer.php

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

lib/API/NewsletterTemplates.php

@@ -1,5 +1,6 @@
 <?php
-namespace MailPoet\Router;
+namespace MailPoet\API;
+
 
 use MailPoet\Models\NewsletterTemplate;
 

lib/API/Newsletters.php

@@ -1,5 +1,6 @@
 <?php
-namespace MailPoet\Router;
+namespace MailPoet\API;
+
 
 use MailPoet\Listing;
 use MailPoet\Models\Newsletter;

lib/API/Segments.php

@@ -1,5 +1,6 @@
 <?php
-namespace MailPoet\Router;
+namespace MailPoet\API;
+
 use \MailPoet\Models\Segment;
 use \MailPoet\Models\SubscriberSegment;
 use \MailPoet\Models\SegmentFilter;

lib/API/SendingQueue.php

@@ -1,5 +1,6 @@
 <?php
-namespace MailPoet\Router;
+namespace MailPoet\API;
+
 
 use MailPoet\Mailer\Mailer;
 use MailPoet\Models\Newsletter;

lib/API/Settings.php

@@ -1,5 +1,6 @@
 <?php
-namespace MailPoet\Router;
+namespace MailPoet\API;
+
 use \MailPoet\Models\Setting;
 
 if(!defined('ABSPATH')) exit;

lib/API/Setup.php

@@ -1,5 +1,6 @@
 <?php
-namespace MailPoet\Router;
+namespace MailPoet\API;
+
 use \MailPoet\Config\Activator;
 
 if(!defined('ABSPATH')) exit;

lib/API/Subscribers.php

@@ -1,5 +1,6 @@
 <?php
-namespace MailPoet\Router;
+namespace MailPoet\API;
+
 
 use MailPoet\Listing;
 use MailPoet\Models\Subscriber;

lib/Config/Initializer.php

@@ -4,6 +4,7 @@ namespace MailPoet\Config;
 use MailPoet\Models;
 use MailPoet\Cron\Supervisor;
 use MailPoet\Router;
+use MailPoet\API;
 use MailPoet\WP\Notice as WPNotice;
 
 if(!defined('ABSPATH')) exit;
@@ -120,11 +121,7 @@ class Initializer {
     }
 
     try {
-      // legacy router
-      $this->setupRouter();
-      // new api (will replace legacy router completely)
       $this->setupAPI();
-
       $this->setupFrontRouter();
       $this->setupPages();
     } catch(\Exception $e) {
@@ -160,11 +157,6 @@ class Initializer {
     $menu->init();
   }
 
-  function setupRouter() {
-    $router = new Router\Router();
-    $router->init();
-  }
-
   function setupAnalytics() {
     $analytics = new Analytics();
     $analytics->init();
@@ -191,7 +183,8 @@ class Initializer {
   }
 
   function setupAPI() {
-
+    $api = new API\API();
+    $api->init();
   }
 
   function setupFrontRouter() {

tests/unit/API/CustomFieldsTest.php

@@ -1,6 +1,7 @@
 <?php
 
-use \MailPoet\Router\CustomFields;
+use \MailPoet\API
+    \CustomFields;
 use \MailPoet\Models\CustomField;
 
 class CustomFieldsTest extends MailPoetTest {

tests/unit/API/FormsTest.php

@@ -1,5 +1,6 @@
 <?php
-use \MailPoet\Router\Forms;
+use \MailPoet\API
+    \Forms;
 use \MailPoet\Models\Form;
 use \MailPoet\Models\Segment;
 

tests/unit/API/NewsletterTemplatesTest.php

@@ -1,5 +1,6 @@
 <?php
-use \MailPoet\Router\NewsletterTemplates;
+use \MailPoet\API
+    \NewsletterTemplates;
 use \MailPoet\Models\NewsletterTemplate;
 
 class NewsletterTemplatesTest extends MailPoetTest {

tests/unit/API/NewslettersTest.php

@@ -1,5 +1,6 @@
 <?php
-use \MailPoet\Router\Newsletters;
+use \MailPoet\API
+    \Newsletters;
 use \MailPoet\Models\Newsletter;
 use \MailPoet\Models\NewsletterSegment;
 use \MailPoet\Models\NewsletterTemplate;

tests/unit/API/SegmentsTest.php

@@ -1,5 +1,6 @@
 <?php
-use \MailPoet\Router\Segments;
+use \MailPoet\API
+    \Segments;
 use \MailPoet\Models\Segment;
 
 class SegmentsTest extends MailPoetTest {

tests/unit/API/SettingsTest.php

@@ -1,5 +1,6 @@
 <?php
-use \MailPoet\Router\Settings;
+use \MailPoet\API
+    \Settings;
 use \MailPoet\Models\Setting;
 
 class SettingsTest extends MailPoetTest {

tests/unit/API/SetupTest.php

@@ -1,5 +1,6 @@
 <?php
-use \MailPoet\Router\Setup;
+use \MailPoet\API
+    \Setup;
 use \MailPoet\Models\Setting;
 
 class SetupTest extends MailPoetTest {

tests/unit/API/SubscribersTest.php

@@ -1,6 +1,7 @@
 <?php
 
-use \MailPoet\Router\Subscribers;
+use \MailPoet\API
+    \Subscribers;
 use \MailPoet\Models\Subscriber;
 use \MailPoet\Models\Segment;