From 75a2190af5fce8ec02ea69ed1753fd57b57d62b3 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Mon, 27 Jan 2020 21:18:42 -0500
Subject: [PATCH] Move Module\Base\Api to Module\BaseApi

---
 src/Module/Api/Mastodon/FollowRequests.php | 7 ++-----
 src/Module/Api/Mastodon/Instance.php       | 6 +++---
 src/Module/Api/Mastodon/Instance/Peers.php | 4 ++--
 src/Module/{Base/Api.php => BaseApi.php}   | 6 +++---
 4 files changed, 10 insertions(+), 13 deletions(-)
 rename src/Module/{Base/Api.php => BaseApi.php} (95%)

diff --git a/src/Module/Api/Mastodon/FollowRequests.php b/src/Module/Api/Mastodon/FollowRequests.php
index 79fe48783..3b2de61bc 100644
--- a/src/Module/Api/Mastodon/FollowRequests.php
+++ b/src/Module/Api/Mastodon/FollowRequests.php
@@ -2,18 +2,15 @@
 
 namespace Friendica\Module\Api\Mastodon;
 
-use Friendica\Object\Api\Mastodon;
-use Friendica\Object\Api\Mastodon\Relationship;
 use Friendica\Core\System;
 use Friendica\DI;
-use Friendica\Model\Contact;
-use Friendica\Module\Base\Api;
+use Friendica\Module\BaseApi;
 use Friendica\Network\HTTPException;
 
 /**
  * @see https://docs.joinmastodon.org/methods/accounts/follow_requests
  */
-class FollowRequests extends Api
+class FollowRequests extends BaseApi
 {
 	public static function init(array $parameters = [])
 	{
diff --git a/src/Module/Api/Mastodon/Instance.php b/src/Module/Api/Mastodon/Instance.php
index c3d1b93ac..927642887 100644
--- a/src/Module/Api/Mastodon/Instance.php
+++ b/src/Module/Api/Mastodon/Instance.php
@@ -2,14 +2,14 @@
 
 namespace Friendica\Module\Api\Mastodon;
 
-use Friendica\Object\Api\Mastodon\Instance as InstanceEntity;
 use Friendica\Core\System;
-use Friendica\Module\Base\Api;
+use Friendica\Module\BaseApi;
+use Friendica\Object\Api\Mastodon\Instance as InstanceEntity;
 
 /**
  * @see https://docs.joinmastodon.org/api/rest/instances/
  */
-class Instance extends Api
+class Instance extends BaseApi
 {
 	/**
 	 * @param array $parameters
diff --git a/src/Module/Api/Mastodon/Instance/Peers.php b/src/Module/Api/Mastodon/Instance/Peers.php
index 5eaf355cc..99c878fcb 100644
--- a/src/Module/Api/Mastodon/Instance/Peers.php
+++ b/src/Module/Api/Mastodon/Instance/Peers.php
@@ -5,14 +5,14 @@ namespace Friendica\Module\Api\Mastodon\Instance;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\Module\Base\Api;
+use Friendica\Module\BaseApi;
 use Friendica\Network\HTTPException;
 use Friendica\Util\Network;
 
 /**
  * Undocumented API endpoint that is implemented by both Mastodon and Pleroma
  */
-class Peers extends Api
+class Peers extends BaseApi
 {
 	/**
 	 * @param array $parameters
diff --git a/src/Module/Base/Api.php b/src/Module/BaseApi.php
similarity index 95%
rename from src/Module/Base/Api.php
rename to src/Module/BaseApi.php
index 7349f45fa..81814bb0d 100644
--- a/src/Module/Base/Api.php
+++ b/src/Module/BaseApi.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Friendica\Module\Base;
+namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\DI;
 use Friendica\Network\HTTPException;
 
-require_once __DIR__ . '/../../../include/api.php';
+require_once __DIR__ . '/../../include/api.php';
 
-class Api extends BaseModule
+class BaseApi extends BaseModule
 {
 	/**
 	 * @var string json|xml|rss|atom