From b476143ff23ee36990867b21c223ae20f73c465e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Garc=C3=ADa?= <lucas@codeccoop.org>
Date: Wed, 31 Jan 2024 13:40:13 +0100
Subject: [PATCH] feat: abstract dir
---
{includes => abstract}/class-plugin.php | 5 ++++-
.../class-settings.php | 4 ++--
{includes => abstract}/class-singleton.php | 2 +-
includes/class-menu.php | 2 +-
includes/class-settings.php | 4 +---
wpct-http-backend.php | 8 +++++---
6 files changed, 14 insertions(+), 11 deletions(-)
rename {includes => abstract}/class-plugin.php (94%)
rename includes/class-base-settings.php => abstract/class-settings.php (98%)
rename {includes => abstract}/class-singleton.php (95%)
diff --git a/includes/class-plugin.php b/abstract/class-plugin.php
similarity index 94%
rename from includes/class-plugin.php
rename to abstract/class-plugin.php
index 68952fa..f70f6f2 100644
--- a/includes/class-plugin.php
+++ b/abstract/class-plugin.php
@@ -1,6 +1,9 @@
<?php
-namespace WPCT_HB;
+namespace WPCT_HB\Abstract;
+
+use WPCT_HB\Menu as Menu;
+use WPCT_HB\Settings as Settings;
abstract class Plugin extends Singleton
{
diff --git a/includes/class-base-settings.php b/abstract/class-settings.php
similarity index 98%
rename from includes/class-base-settings.php
rename to abstract/class-settings.php
index a28f67c..6576b5d 100644
--- a/includes/class-base-settings.php
+++ b/abstract/class-settings.php
@@ -1,12 +1,12 @@
<?php
-namespace WPCT_HB;
+namespace WPCT_HB\Abstract;
class Undefined
{
};
-abstract class BaseSettings extends Singleton
+abstract class Settings extends Singleton
{
protected $group_name;
diff --git a/includes/class-singleton.php b/abstract/class-singleton.php
similarity index 95%
rename from includes/class-singleton.php
rename to abstract/class-singleton.php
index 959fdf4..8daeb38 100644
--- a/includes/class-singleton.php
+++ b/abstract/class-singleton.php
@@ -1,6 +1,6 @@
<?php
-namespace WPCT_HB;
+namespace WPCT_HB\Abstract;
abstract class Singleton
{
diff --git a/includes/class-menu.php b/includes/class-menu.php
index 58cb73e..3f185a6 100644
--- a/includes/class-menu.php
+++ b/includes/class-menu.php
@@ -2,7 +2,7 @@
namespace WPCT_HB;
-class Menu extends Singleton
+class Menu extends Abstract\Singleton
{
private $name;
private $settings;
diff --git a/includes/class-settings.php b/includes/class-settings.php
index 69ecce1..fe522a4 100644
--- a/includes/class-settings.php
+++ b/includes/class-settings.php
@@ -2,9 +2,7 @@
namespace WPCT_HB;
-require_once 'class-base-settings.php';
-
-class Settings extends BaseSettings
+class Settings extends Abstract\Settings
{
public function register()
{
diff --git a/wpct-http-backend.php b/wpct-http-backend.php
index 1017e59..8880fd8 100755
--- a/wpct-http-backend.php
+++ b/wpct-http-backend.php
@@ -23,13 +23,15 @@ if (!defined('ABSPATH')) {
define('JWT_AUTH_SECRET_KEY', getenv('WPCT_HB_AUTH_SECRET') ? getenv('WPCT_HB_AUTH_SECRET') : '123456789');
define('JWT_AUTH_CORS_ENABLE', true);
-require_once 'includes/class-singleton.php';
-require_once 'includes/class-plugin.php';
+require_once 'abstract/class-singleton.php';
+require_once 'abstract/class-plugin.php';
+require_once 'abstract/class-settings.php';
+
require_once 'includes/class-menu.php';
require_once 'includes/class-settings.php';
require_once "includes/class-http-client.php";
-class Wpct_Http_Backend extends Plugin
+class Wpct_Http_Backend extends Abstract\Plugin
{
protected $name = 'Wpct Http Backed';
protected $textdomain = 'wpct-http-backend';
--
GitLab