Match class and filename allowing autoloader to locate them

- Composer PSR-4 autoloading.

classes/modules/abstractModule.php → classes/modules/AbstractModule.php

@@ -5,6 +5,5 @@ namespace uib\ub\loadspeakr\modules;
 abstract class AbstractModule
 {
     abstract protected function match($uri);
-
     abstract protected function execute($params);
 }

classes/modules/adminModule.php → classes/modules/AdminModule.php

@@ -7,8 +7,6 @@ use uib\ub\loadspeakr\Endpoint;
 use uib\ub\loadspeakr\HTTPStatus;
 use uib\ub\loadspeakr\Utils;
 
-require_once('abstractModule.php');
-
 class AdminModule extends abstractModule
 {
     //Service module

classes/modules/exportModule.php → classes/modules/ExportModule.php

@@ -4,8 +4,6 @@ namespace uib\ub\loadspeakr\modules;
 
 use ARC2;
 
-require_once('abstractModule.php');
-
 class ExportModule extends abstractModule
 {
     private $serialization;

classes/modules/redirectModule.php → classes/modules/RedirectModule.php

@@ -4,8 +4,6 @@ namespace uib\ub\loadspeakr\modules;
 
 use uib\ub\loadspeakr\MetaDb;
 
-require_once('abstractModule.php');
-
 class RedirectModule extends abstractModule
 {
     public function match($uri)

classes/modules/serviceModule.php → classes/modules/ServiceModule.php

@@ -8,8 +8,6 @@ use uib\ub\loadspeakr\HTTPStatus;
 use uib\ub\loadspeakr\Logging;
 use uib\ub\loadspeakr\Utils;
 
-require_once('abstractModule.php');
-
 class ServiceModule extends abstractModule
 {
     public function match($uri)

classes/modules/sessionModule.php → classes/modules/SessionModule.php

@@ -4,8 +4,6 @@ namespace uib\ub\loadspeakr\modules;
 
 use uib\ub\loadspeakr\HTTPStatus;
 
-require_once('abstractModule.php');
-
 class SessionModule extends abstractModule
 {
     //Session module

classes/modules/sparqlFilterModule.php → classes/modules/SparqlFilterModule.php

@@ -10,9 +10,7 @@ use uib\ub\loadspeakr\MetaDb;
 use uib\ub\loadspeakr\Queries;
 use uib\ub\loadspeakr\Utils;
 
-require_once('abstractModule.php');
-
-class sparqlFilterModule extends abstractModule
+class SparqlFilterModule extends abstractModule
 {
     public function match($uri)
     {

classes/modules/staticModule.php → classes/modules/StaticModule.php

@@ -6,8 +6,6 @@ use uib\ub\loadspeakr\HTTPStatus;
 use uib\ub\loadspeakr\Logging;
 use uib\ub\loadspeakr\Utils;
 
-require_once('abstractModule.php');
-
 class StaticModule extends abstractModule
 {
     public function match($uri)

classes/modules/typeModule.php → classes/modules/TypeModule.php

@@ -9,8 +9,6 @@ use uib\ub\loadspeakr\MetaDb;
 use uib\ub\loadspeakr\Queries;
 use uib\ub\loadspeakr\Utils;
 
-require_once('abstractModule.php');
-
 class TypeModule extends abstractModule
 {
     public function match($uri)

classes/modules/uriModule.php → classes/modules/UriModule.php

@@ -9,8 +9,6 @@ use uib\ub\loadspeakr\MetaDb;
 use uib\ub\loadspeakr\Queries;
 use uib\ub\loadspeakr\Utils;
 
-require_once('abstractModule.php');
-
 class UriModule extends abstractModule
 {
     public function match($uri)

index.php

@@ -68,16 +68,9 @@ $uri = Utils::getMirroredUri($localUri);
 
 // Load Loadspeakr modules.
 foreach ($conf['modules']['available'] as $i) {
-    $className = $i . 'Module';
+    $className = ucfirst($i) . 'Module';
     $currentModule = $conf['modules']['directory'] . $className . '.php';
-
-    if (!is_file($currentModule)) {
-        HTTPStatus::send500('<br/>Can\'t load or error in module <pre>' . $currentModule . '</pre>');
-        exit(1);
-    }
-
-    require_once($currentModule);
-    $namespacedClassName = 'uib\ub\loadspeakr\modules\\' . ucfirst($className);
+    $namespacedClassName = 'uib\ub\loadspeakr\modules\\' . $className;
     $module = new $namespacedClassName();
     $matching = $module->match($uri);