Namespace refactor

entaseteam · Aug 11, 2022 · 2cb5ea3 · 2cb5ea3
1 parent 0234c62
commit 2cb5ea3
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 36 deletions.
diff --git a/src/Entase/Client.php → src/Client.php b/src/Entase/Client.php → src/Client.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Entase;
+namespace Entase\SDK;
 
 
 class Client

diff --git a/src/Entase/Endpoint.php → src/Endpoint.php b/src/Entase/Endpoint.php → src/Endpoint.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Entase;
+namespace Entase\SDK;
 
 class Endpoint
 {

diff --git a/src/Entase/Endpoints/Events.php → src/Endpoints/Events.php b/src/Entase/Endpoints/Events.php → src/Endpoints/Events.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Entase\Endpoints;
+namespace Entase\SDK\Endpoints;
 
-class Events extends \Entase\Endpoint
+class Events extends \Entase\SDK\Endpoint
 {
     public function __construct($client)
     {

diff --git a/src/Entase/Endpoints/Productions.php → src/Endpoints/Productions.php b/src/Entase/Endpoints/Productions.php → src/Endpoints/Productions.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Entase\Endpoints;
+namespace Entase\SDK\Endpoints;
 
-class Productions extends \Entase\Endpoint
+class Productions extends \Entase\SDK\Endpoint
 {
     public function __construct($client)
     {

diff --git a/src/Entase/Exception.php b/src/Entase/Exception.php
diff --git a/src/Entase/Env.php → src/Env.php b/src/Entase/Env.php → src/Env.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Entase;
+namespace Entase\SDK;
 
 abstract class Env
 {

diff --git a/src/Entase/Exceptions/API.php → src/Exceptions/API.php b/src/Entase/Exceptions/API.php → src/Exceptions/API.php
@@ -1,5 +1,5 @@
 <?php
 
-namespace Entase\Exceptions;
+namespace Entase\SDK\Exceptions;
 
 class API extends Base {}
diff --git a/src/Entase/Exceptions/Base.php → src/Exceptions/Base.php b/src/Entase/Exceptions/Base.php → src/Exceptions/Base.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Entase\Exceptions;
+namespace Entase\SDK\Exceptions;
 
 class Base extends \Exception
 {

diff --git a/src/Entase/Exceptions/CURL.php → src/Exceptions/CURL.php b/src/Entase/Exceptions/CURL.php → src/Exceptions/CURL.php
@@ -1,5 +1,5 @@
 <?php
 
-namespace Entase\Exceptions;
+namespace Entase\SDK\Exceptions;
 
 class CURL extends Base {}
diff --git a/src/Entase/Exceptions/Request.php → src/Exceptions/Request.php b/src/Entase/Exceptions/Request.php → src/Exceptions/Request.php
@@ -1,5 +1,5 @@
 <?php
 
-namespace Entase\Exceptions;
+namespace Entase\SDK\Exceptions;
 
 class Request extends Base {}
diff --git a/src/Entase/ObjectBase.php → src/ObjectBase.php b/src/Entase/ObjectBase.php → src/ObjectBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Entase;
+namespace Entase\SDK;
 
 class ObjectBase
 {

diff --git a/src/Entase/ObjectCollection.php → src/ObjectCollection.php b/src/Entase/ObjectCollection.php → src/ObjectCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Entase;
+namespace Entase\SDK;
 
 use \IteratorAggregate;
 use \Traversable;

diff --git a/src/Entase/ObjectCursor.php → src/ObjectCursor.php b/src/Entase/ObjectCursor.php → src/ObjectCursor.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Entase;
+namespace Entase\SDK;
 
 class ObjectCursor extends ObjectBase
 {

diff --git a/src/autoloader.php b/src/autoloader.php
@@ -1,43 +1,32 @@
 <?php
 
-namespace EntaseSDK;
+namespace Entase\SDK;
 
 function AutoLoader($className) 
 {
-    if (strpos($className, 'Entase\\') !== 0)
+    if (strpos($className, 'Entase\\SDK\\') !== 0)
         return;
 
+    $calledClass = $className;
+    $className = str_replace('Entase\\SDK\\', '', $className);
+
     $fileName = '';
     $namespace = '';
 
-    // Sets the include path as the "src" directory
     $includePath = dirname(__FILE__).DIRECTORY_SEPARATOR;
-
     if (false !== ($lastNsPos = strripos($className, '\\'))) {
         $namespace = substr($className, 0, $lastNsPos);
         $className = substr($className, $lastNsPos + 1);
         $fileName = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
     }
+
     $fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
-    $fullFileName = $includePath . DIRECTORY_SEPARATOR . $fileName;
-    $fullFileNameEX = $includePath . DIRECTORY_SEPARATOR .'ThirdParty/'.$fileName;
-
-    $pos = strpos($fileName, '/');
-    $fileName_src = ($pos !== false) ? substr_replace($fileName, '/src/', $pos, 1) : 'src/'.$fileName;
-    $fullFileNameEX_SRC = $includePath . DIRECTORY_SEPARATOR .'ThirdParty/'.$fileName_src;
+    $fullFilePath = $includePath.DIRECTORY_SEPARATOR.$fileName;
 
-    if (file_exists($fullFileName)) {
-        require_once $fullFileName;
-    }
-    elseif (file_exists($fullFileNameEX)) {
-        require_once $fullFileNameEX;
-    }
-    elseif (file_exists($fullFileNameEX_SRC)) {
-        require_once $fullFileNameEX_SRC;
-    }
-    else {
-        die('Class "'.$className.'" does not exist.');
+    if (file_exists($fullFilePath)) {
+        require_once $fullFilePath;
     }
+    else die('Class "'.$calledClass.'" does not exist.');
 }
 
-\spl_autoload_register('EntaseSDK\AutoLoader'); // Registers the autoloader
+\spl_autoload_register('Entase\\SDK\\AutoLoader'); // Registers the autoloader