From 61a285ff70f41211d255279cda5e549af9e0c297 Mon Sep 17 00:00:00 2001
From: Stein Magne Bjorklund <steinmb@smbjorklund.com>
Date: Mon, 20 Sep 2021 12:46:32 +0200
Subject: [PATCH] Change AbstractModule.php to a interface
Do not implement properties or code. It is a interface
and should be typed as one.
---
classes/modules/AbstractModule.php | 9 ---------
classes/modules/AdminModule.php | 2 +-
classes/modules/ExportModule.php | 2 +-
classes/modules/ModuleInterface.php | 9 +++++++++
classes/modules/RedirectModule.php | 2 +-
classes/modules/ServiceModule.php | 2 +-
classes/modules/SessionModule.php | 2 +-
classes/modules/SparqlFilterModule.php | 2 +-
classes/modules/StaticModule.php | 2 +-
classes/modules/TypeModule.php | 2 +-
classes/modules/UriModule.php | 2 +-
11 files changed, 18 insertions(+), 18 deletions(-)
delete mode 100644 classes/modules/AbstractModule.php
create mode 100644 classes/modules/ModuleInterface.php
diff --git a/classes/modules/AbstractModule.php b/classes/modules/AbstractModule.php
deleted file mode 100644
index 042111ee..00000000
--- a/classes/modules/AbstractModule.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace uib\ub\loadspeakr\modules;
-
-abstract class AbstractModule
-{
- abstract protected function match($uri);
- abstract protected function execute($params);
-}
diff --git a/classes/modules/AdminModule.php b/classes/modules/AdminModule.php
index 981bc2ea..36d1a209 100644
--- a/classes/modules/AdminModule.php
+++ b/classes/modules/AdminModule.php
@@ -7,7 +7,7 @@ use uib\ub\loadspeakr\Endpoint;
use uib\ub\loadspeakr\HTTPStatus;
use uib\ub\loadspeakr\Utils;
-class AdminModule extends abstractModule
+class AdminModule implements ModuleInterface
{
//Service module
private $head = "<!DOCTYPE html>
diff --git a/classes/modules/ExportModule.php b/classes/modules/ExportModule.php
index 48e9269d..9abe8e13 100644
--- a/classes/modules/ExportModule.php
+++ b/classes/modules/ExportModule.php
@@ -4,7 +4,7 @@ namespace uib\ub\loadspeakr\modules;
use ARC2;
-class ExportModule extends abstractModule
+class ExportModule implements ModuleInterface
{
private $serialization;
private $graph;
diff --git a/classes/modules/ModuleInterface.php b/classes/modules/ModuleInterface.php
new file mode 100644
index 00000000..12614e20
--- /dev/null
+++ b/classes/modules/ModuleInterface.php
@@ -0,0 +1,9 @@
+<?php declare(strict_types=1);
+
+namespace uib\ub\loadspeakr\modules;
+
+interface ModuleInterface
+{
+ public function match($uri);
+ public function execute($params);
+}
diff --git a/classes/modules/RedirectModule.php b/classes/modules/RedirectModule.php
index 6a3ebbf7..57e17d1c 100644
--- a/classes/modules/RedirectModule.php
+++ b/classes/modules/RedirectModule.php
@@ -4,7 +4,7 @@ namespace uib\ub\loadspeakr\modules;
use uib\ub\loadspeakr\MetaDb;
-class RedirectModule extends abstractModule
+class RedirectModule implements ModuleInterface
{
public function match($uri)
{
diff --git a/classes/modules/ServiceModule.php b/classes/modules/ServiceModule.php
index 67caf485..b5262cb5 100644
--- a/classes/modules/ServiceModule.php
+++ b/classes/modules/ServiceModule.php
@@ -8,7 +8,7 @@ use uib\ub\loadspeakr\HTTPStatus;
use uib\ub\loadspeakr\Logging;
use uib\ub\loadspeakr\Utils;
-class ServiceModule extends abstractModule
+class ServiceModule implements ModuleInterface
{
public function match($uri)
{
diff --git a/classes/modules/SessionModule.php b/classes/modules/SessionModule.php
index c029512c..bf3f47ff 100644
--- a/classes/modules/SessionModule.php
+++ b/classes/modules/SessionModule.php
@@ -4,7 +4,7 @@ namespace uib\ub\loadspeakr\modules;
use uib\ub\loadspeakr\HTTPStatus;
-class SessionModule extends abstractModule
+class SessionModule implements ModuleInterface
{
//Session module
private $sessionUri = "session";
diff --git a/classes/modules/SparqlFilterModule.php b/classes/modules/SparqlFilterModule.php
index 10a5ff87..6ac39fe6 100644
--- a/classes/modules/SparqlFilterModule.php
+++ b/classes/modules/SparqlFilterModule.php
@@ -10,7 +10,7 @@ use uib\ub\loadspeakr\MetaDb;
use uib\ub\loadspeakr\Queries;
use uib\ub\loadspeakr\Utils;
-class SparqlFilterModule extends abstractModule
+class SparqlFilterModule implements ModuleInterface
{
public function match($uri)
{
diff --git a/classes/modules/StaticModule.php b/classes/modules/StaticModule.php
index 92833e0d..b72072d7 100644
--- a/classes/modules/StaticModule.php
+++ b/classes/modules/StaticModule.php
@@ -6,7 +6,7 @@ use uib\ub\loadspeakr\HTTPStatus;
use uib\ub\loadspeakr\Logging;
use uib\ub\loadspeakr\Utils;
-class StaticModule extends abstractModule
+class StaticModule implements ModuleInterface
{
public function match($uri)
{
diff --git a/classes/modules/TypeModule.php b/classes/modules/TypeModule.php
index 4b52cc33..915b783b 100644
--- a/classes/modules/TypeModule.php
+++ b/classes/modules/TypeModule.php
@@ -9,7 +9,7 @@ use uib\ub\loadspeakr\MetaDb;
use uib\ub\loadspeakr\Queries;
use uib\ub\loadspeakr\Utils;
-class TypeModule extends abstractModule
+class TypeModule implements ModuleInterface
{
public function match($uri)
{
diff --git a/classes/modules/UriModule.php b/classes/modules/UriModule.php
index b0c778e7..112afd19 100644
--- a/classes/modules/UriModule.php
+++ b/classes/modules/UriModule.php
@@ -9,7 +9,7 @@ use uib\ub\loadspeakr\MetaDb;
use uib\ub\loadspeakr\Queries;
use uib\ub\loadspeakr\Utils;
-class UriModule extends abstractModule
+class UriModule implements ModuleInterface
{
public function match($uri)
{
--
GitLab