Some shit.

.dockerignore

@@ -1,5 +1,3 @@
 .idea/
-.DS_Store
 vendor/
-.phpunit.cache/
+.phpunit.cache/
-tests/

.gitea/workflows/build.yml

@@ -33,41 +33,5 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
-          platforms: linux/amd64,linux/arm64
           dockerfile: Dockerfile
-          tags: siteworxpro/template:${{ gitea.ref_name }}
+          tags: siteworxpro/template:${{ gitea.ref_name }}
-
-  Build-Migrations:
-    needs:
-      - Build
-    name: 🖥️ 🔨 Build Migrations
-    runs-on: ubuntu-latest
-    steps:
-      - name: 🛡️ 🔒 Add Siteworx CA Certificates
-        run: |
-          curl -Ls https://siteworxpro.com/hosted/Siteworx+Root+CA.pem -o /usr/local/share/ca-certificates/sw.crt
-          update-ca-certificates
-
-      - name: 🔑 🔐 Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: 📖 🔍 Checkout Repository Code
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 1
-
-      - name: 🏗️ 🔧 Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: 🐳 🔨 Build Migrations Container
-        uses: docker/build-push-action@v6
-        with:
-          platforms: linux/amd64,linux/arm64
-          sbom: true
-          provenance: true
-          context: .
-          file: migrations.Dockerfile
-          tags: siteworxpro/template:${{ gitea.ref_name }}-migrations

.gitea/workflows/tests.yml

@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-      - "**"
+      - "*"
 
 name: 🧪✨ Tests Workflow
 
@@ -91,7 +91,6 @@ jobs:
       - name: 📖 ✨ Install Composer Libraries
         run: |
           docker run --rm \
-            -v composer-cache:/tmp/cache \
             --volumes-from ${{ env.JOB_CONTAINER_NAME }} \
             -w ${{ github.workspace }} \
             siteworxpro/composer \
@@ -129,7 +128,6 @@ jobs:
       - name: 📖 ✨ Install Composer Libraries
         run: |
           docker run --rm \
-            -v composer-cache:/tmp/cache \
             --volumes-from ${{ env.JOB_CONTAINER_NAME }} \
             -w ${{ github.workspace }} \
             siteworxpro/composer \
@@ -166,7 +164,6 @@ jobs:
       - name: 📖 ✨ Install Composer Libraries
         run: |
           docker run --rm \
-            -v composer-cache:/tmp/cache \
             --volumes-from ${{ env.JOB_CONTAINER_NAME }} \
             -w ${{ github.workspace }} \
             siteworxpro/composer \
@@ -200,10 +197,9 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: 📖 ✨ Install Composer Libraries
+      - name: Install Composer Libraries
         run: |
           docker run --rm \
-            -v composer-cache:/tmp/cache \
             --volumes-from ${{ env.JOB_CONTAINER_NAME }} \
             -w ${{ github.workspace }} \
             siteworxpro/composer \
@@ -237,32 +233,18 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: 📖 ✨ Install Composer Libraries
+      - name: Install Composer Libraries
         run: |
           docker run --rm \
-            -v composer-cache:/tmp/cache \
             --volumes-from ${{ env.JOB_CONTAINER_NAME }} \
             -w ${{ github.workspace }} \
             siteworxpro/composer \
             install --ignore-platform-reqs --no-interaction --prefer-dist --optimize-autoloader
 
-      - name: 🧪 ✅ Run Unit Tests
+      - name: Run Unit Tests
-        uses: addnab/docker-run-action@v3
+        run: |
-        with:
+          docker run --rm \
-          username: ${{ secrets.DOCKER_USERNAME }}
+            --volumes-from ${{ env.JOB_CONTAINER_NAME }} \
-          password: ${{ secrets.DOCKER_PASSWORD }}
+            -w ${{ github.workspace }} \
-          image: siteworxpro/composer
+            siteworxpro/composer \
-          options: --volumes-from ${{ env.JOB_CONTAINER_NAME }} -w ${{ gitea.workspace }}
+            run tests:unit
-          run: |
-            bin/pcov.sh
-            composer run tests:unit:coverage
-
-#      - name: 📦 Publish Build Artifacts
-#        env:
-#          NODE_TLS_REJECT_UNAUTHORIZED: 0
-#        uses: christopherhx/gitea-upload-artifact@v4
-#        with:
-#          options: --volumes-from ${{ env.JOB_CONTAINER_NAME }} -w ${{ gitea.workspace }}
-#          name: junit-coverage.xml
-#          path: tests/reports/junit.xml
-#          retention-days: 1

.gitignore

@@ -1,6 +1,3 @@
 .idea/
-.DS_Store
 vendor/
-.phpunit.cache/
+.phpunit.cache/
-
-tests/reports/

.gitlab-ci.yml

@@ -0,0 +1,5 @@
+include:
+  - local: .gitlab/ci/stages.yml
+  - local: .gitlab/ci/tests.yml
+  - local: .gitlab/ci/libraries.yml
+

.gitlab/ci/libraries.yml

@@ -0,0 +1,15 @@
+Install Composer Libraries:
+  stage: libraries
+  image: siteworxpro/composer:latest
+  rules:
+    - if: '$CI_COMMIT_TAG'
+      when: never
+    - if: '$CI_PIPELINE_SOURCE == "push"'
+      when: always
+    - when: never
+  script:
+    - composer install --ignore-platform-reqs
+  artifacts:
+    paths:
+      - vendor/
+    expire_in: 1 hour

.gitlab/ci/stages.yml

@@ -0,0 +1,3 @@
+stages:
+  - libraries
+  - tests

.gitlab/ci/tests.yml

@@ -0,0 +1,65 @@
+Unit Tests:
+  stage: tests
+  needs:
+    - Install Composer Libraries
+  rules:
+    - if: '$CI_COMMIT_TAG'
+      when: never
+    - if: '$CI_PIPELINE_SOURCE == "push"'
+      when: always
+    - when: never
+  image: siteworxpro/composer
+  before_script: |
+    bin/pcov.sh
+  script: |
+    echo "Running unit tests..."
+    composer run tests:unit:coverage
+  coverage: '/^\s*Lines:\s*\d+.\d+\%/'
+  artifacts:
+    expire_in: 1 day
+    reports:
+      junit: tests/reports/junit.xml
+    paths:
+      - tests/reports/
+
+Run License Check:
+  stage: tests
+  needs:
+    - Install Composer Libraries
+  rules:
+    - if: '$CI_COMMIT_TAG'
+      when: never
+    - if: '$CI_PIPELINE_SOURCE == "push"'
+      when: on_success
+    - when: never
+  image: siteworxpro/composer
+  script:
+    - composer run tests:license
+
+Run Code Lint:
+  stage: tests
+  needs:
+    - Install Composer Libraries
+  rules:
+    - if: '$CI_COMMIT_TAG'
+      when: never
+    - if: '$CI_PIPELINE_SOURCE == "push"'
+      when: on_success
+    - when: never
+  image: siteworxpro/composer
+  script:
+    - composer run tests:lint
+
+Run Code Sniffer:
+  stage: tests
+  needs:
+    - Install Composer Libraries
+  rules:
+    - if: '$CI_COMMIT_TAG'
+      when: never
+    - if: '$CI_PIPELINE_SOURCE == "push"'
+      when: on_success
+    - when: never
+  image: siteworxpro/composer
+  script:
+    - composer run tests:phpstan

README.md

@@ -1,6 +1,8 @@
 # Template
 
-![pipeline status](https://gitea.siteworxpro.com/siteworxpro/Php-Template/actions/workflows/tests.yml/badge.svg?branch=master&style=flat-square)
+[![pipeline status](https://git.siteworxpro.com/rrise/php-template/badges/master/pipeline.svg)](https://git.siteworxpro.com/rrise/php-template/-/commits/master)
+[![coverage report](https://git.siteworxpro.com/rrise/php-template/badges/master/coverage.svg)](https://git.siteworxpro.com/rrise/php-template/-/commits/master)
+[![Latest Release](https://git.siteworxpro.com/rrise/php-template/-/badges/release.svg)](https://git.siteworxpro.com/rrise/php-template/-/releases)
 
 ## Dev Environment
 
@@ -38,7 +40,7 @@ You can access the api at `http://localhost:9501/`
 
 xdebug needs to be built into the container before it will work
 ```shell
- docker exec -it php-template-composer-runtime-1 bin/xdebug.sh
+ docker exec -it template-runtime-1 bin/xdebug.sh
 ```
 
 ### Install the dependencies

bin/migrate.sh

@@ -1,4 +0,0 @@
-eval #!/bin/sh
-set -e
-
-migrate -path /app/db/migrations -database "postgres://$DB_USERNAME:$DB_PASSWORD@$DB_HOST:$DB_PORT/$DB_DATABASE?sslmode=disable" up

composer.json

@@ -9,21 +9,21 @@
   },
   "require": {
     "php": "^8.4",
-    "league/route": "^6.2.0",
+    "league/route": "^6.2",
-    "illuminate/database": "^v12.34.0",
+    "illuminate/database": "^12.10",
-    "spiral/roadrunner-http": "^v3.6.0",
+    "spiral/roadrunner-http": "^3.5",
-    "nyholm/psr7": "^1.8.2",
+    "nyholm/psr7": "^1.8",
     "illuminate/support": "^v12.10.2",
-    "roadrunner-php/app-logger": "^1.2.0",
+    "roadrunner-php/app-logger": "^1.2",
-    "siteworxpro/config": "^1.1.1",
+    "siteworxpro/config": "^1.1",
-    "predis/predis": "^v3.2.0"
+    "predis/predis": "^3.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^12.4",
+    "phpunit/phpunit": "^12.1",
     "mockery/mockery": "^1.6",
     "squizlabs/php_codesniffer": "^3.12",
     "lendable/composer-license-checker": "^1.2",
-    "phpstan/phpstan": "^2.1.31"
+    "phpstan/phpstan": "^2.1"
   },
   "scripts": {
     "tests:all": [
@@ -53,10 +53,16 @@
       "phpstan analyse --level 4 ./src/ -c phpstan.neon"
     ]
   },
-  "repositories": [
+  "repositories": {
-    {
+    "git.siteworxpro.com/24": {
       "type": "composer",
-      "url": "https://gitea.siteworxpro.com/api/packages/php-packages/composer"
+      "url": "https://git.siteworxpro.com/api/v4/group/24/-/packages/composer/packages.json",
+      "options": {
+        "ssl": {
+          "verify_peer": false,
+          "allow_self_signed": true
+        }
+      }
     }
-  ]
+  }
 }

config.php

@@ -8,7 +8,7 @@ return [
      * The server configuration.
      */
     'server' => [
-        'port' => Env::get('HTTP_PORT', 9501, 'int'),
+       'port' => Env::get('HTTP_PORT', 9501, 'int'),
         'dev_mode' => Env::get('DEV_MODE', false, 'bool'),
     ],
 
@@ -21,15 +21,9 @@ return [
         'database' => Env::get('DB_DATABASE', 'siteworxpro'),
         'username' => Env::get('DB_USERNAME', 'siteworxpro'),
         'password' => Env::get('DB_PASSWORD', 'password'),
-        'port' => Env::get('DB_PORT', 5432, 'int'),
-        'charset' => Env::get('DB_CHARSET', 'utf8'),
-        'collation' => Env::get('DB_COLLATION', 'utf8_unicode_ci'),
-        'prefix' => Env::get('DB_PREFIX', ''),
-        'options' => [
-            // Add any additional PDO options here
-        ],
     ],
 
+
     'cors' => [
         'allowed_origins' => Env::get('CORS_ALLOWED_ORIGINS', 'localhost:3000'),
         'allow_credentials' => Env::get('CORS_ALLOW_CREDENTIALS', true, 'bool'),
@@ -40,6 +34,5 @@ return [
         'host' => Env::get('REDIS_HOST', 'localhost'),
         'port' => Env::get('REDIS_PORT', 6379, 'int'),
         'database' => Env::get('REDIS_DATABASE', 0, 'int'),
-        'password' => Env::get('REDIS_PASSWORD'),
     ]
-];
+];

docker-compose.yml

@@ -12,24 +12,6 @@ services:
     environment:
       PHP_IDE_CONFIG: serverName=localhost
 
-  migration-container:
-    volumes:
-      - ./db/migrations:/app/db/migrations
-      - ./bin:/app/bin
-    image: siteworxpro/migrate:v4.18.3
-    working_dir: /app
-#    entrypoint: "/bin/sh -c 'while true; do sleep 30; done;'"
-    entrypoint: /bin/sh -c '/app/bin/migrate.sh'
-    depends_on:
-      postgres:
-        condition: service_healthy
-    environment:
-      DB_USERNAME: ${DB_USERNAME:-siteworxpro}
-      DB_PASSWORD: ${DB_PASSWORD:-password}
-      DB_DATABASE: ${DB_DATABASE:-siteworxpro}
-      DB_HOST: ${DB_HOST-postgres}
-      DB_PORT: ${DB_PORT-5432}
-
   dev-runtime:
     ports:
       - "9501:9501"
@@ -47,11 +29,6 @@ services:
 
   redis:
     image: redis:latest
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
     ports:
       - "6379:6379"
     volumes:
@@ -59,11 +36,6 @@ services:
 
   postgres:
     image: postgres:latest
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${DB_USERNAME:-siteworxpro}"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
     environment:
       POSTGRES_USER: ${DB_USERNAME:-siteworxpro}
       POSTGRES_PASSWORD: ${DB_PASSWORD:-password}

migrations.Dockerfile

@@ -1,8 +0,0 @@
-FROM siteworxpro/migrate:v4.18.3
-
-ADD db/migrations /app/db/migrations
-ADD bin/migrate.sh /app/bin/migrate.sh
-
-WORKDIR /app
-
-ENTRYPOINT ["/app/bin/migrate.sh"]

server.php

@@ -4,11 +4,11 @@ use Siteworxpro\App\Server;
 
 require __DIR__ . '/vendor/autoload.php';
 
-try {
+// Instantiate the ExternalServer class
-    // Instantiate the ExternalServer class
+$server = new Server();
-    $server = new Server();
 
-    // Start the server
+// Start the server
+try {
     $server->startServer();
 } catch (JsonException $e) {
     echo $e->getMessage();

src/Controllers/Controller.php

@@ -28,14 +28,6 @@ abstract class Controller implements ControllerInterface
         throw new NotFoundException("not found");
     }
 
-    /**
-     * @throws NotFoundException
-     */
-    public function put(ServerRequest $request): ResponseInterface
-    {
-        throw new NotFoundException("not found");
-    }
-
     /**
      * @throws NotFoundException
      */

src/Controllers/ControllerInterface.php

@@ -25,14 +25,6 @@ interface ControllerInterface
      */
     public function post(ServerRequest $request): ResponseInterface;
 
-    /**
-     * Handle the request and return a response.
-     *
-     * @param ServerRequest $request The request data.
-     * @return ResponseInterface The response data.
-     */
-    public function put(ServerRequest $request): ResponseInterface;
-
     /**
      * Handle the request and return a response.
      *

src/Facades/Config.php

@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Siteworxpro\App\Facades;
+
+use Illuminate\Contracts\Container\BindingResolutionException;
+use Illuminate\Support\Facades\Facade;
+use Siteworx\Config\Exception\EmptyDirectoryException;
+use Siteworx\Config\Exception\FileNotFoundException;
+use Siteworx\Config\Exception\UnsupportedFormatException;
+
+/**
+ * Class Config
+ *
+ * This class serves as a facade for the configuration settings of the application.
+ * It extends the Facade class from the Illuminate\Support\Facades namespace.
+ *
+ * @method static bool | string | int  get(string $key) Retrieve the configuration value for the given key.
+ *
+ * @package Siteworx\App\Facades
+ */
+class Config extends Facade
+{
+    protected static $cached = false;
+
+
+    /**
+     * @throws UnsupportedFormatException
+     * @throws FileNotFoundException
+     * @throws EmptyDirectoryException
+     */
+    public static function getFacadeRoot(): \Siteworx\Config\Config
+    {
+        if (self::$resolvedInstance !== null) {
+            try {
+                $config = self::resolveFacadeInstance(self::getFacadeAccessor());
+                if ($config instanceof \Siteworx\Config\Config) {
+                    return $config;
+                }
+            } catch (BindingResolutionException) {
+            }
+        }
+
+        return \Siteworx\Config\Config::load(__DIR__ . '/../../config.php');
+    }
+
+    /**
+     * Get the registered name of the component.
+     *
+     * @return string The name of the component.
+     */
+    protected static function getFacadeAccessor(): string
+    {
+        return \Siteworx\Config\Config::class;
+    }
+}

src/Facades/Logger.php

@@ -2,10 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Siteworxpro\App\Services\Facades;
+namespace Siteworxpro\App\Facades;
 
+use Illuminate\Support\Facades\Facade;
 use RoadRunner\Logger\Logger as RRLogger;
-use Siteworxpro\App\Services\Facade;
+use Spiral\Goridge\RPC\RPC;
 
 /**
  * Class Logger
@@ -13,7 +14,6 @@ use Siteworxpro\App\Services\Facade;
  * This class serves as a facade for the Monolog logger.
  * It extends the Facade class from the Illuminate\Support\Facades namespace.
  *
- * @method static debug(string $message, array $context = []) Log an informational message.
  * @method static info(string $message, array $context = []) Log an informational message.
  * @method static error(string $message, array $context = []) Log an error message.
  * @method static warning(string $message, array $context = []) Log a warning message.
@@ -22,6 +22,22 @@ use Siteworxpro\App\Services\Facade;
  */
 class Logger extends Facade
 {
+    public static function getFacadeRoot(): RRLogger
+    {
+        if (self::$resolvedInstance !== null) {
+            $logger = self::resolveFacadeInstance(self::getFacadeAccessor());
+
+            if ($logger instanceof RRLogger) {
+                return $logger;
+            }
+        }
+
+
+        $rpc = RPC::create('tcp://127.0.0.1:6001');
+
+        return new RRLogger($rpc);
+    }
+
     /**
      * Get the registered name of the component.
      *

src/Facades/Redis.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Siteworxpro\App\Services\Facades;
+namespace Siteworxpro\App\Facades;
 
+use Illuminate\Support\Facades\Facade;
 use Predis\Client;
 use Predis\Response\Status;
-use Siteworxpro\App\Services\Facade;
 
 /**
  * Facade for the Redis client.
@@ -21,6 +21,25 @@ use Siteworxpro\App\Services\Facade;
  */
 class Redis extends Facade
 {
+    public static function getFacadeRoot(): Client
+    {
+        if (self::$resolvedInstance !== null) {
+            $redis = self::resolveFacadeInstance(self::getFacadeAccessor());
+
+            if ($redis instanceof Client) {
+                return $redis;
+            }
+        }
+
+        // Create a new Redis client instance if not already resolved
+        return new Client([
+            'scheme' => 'tcp',
+            'host' => Config::get('redis.host'),
+            'port' => Config::get('redis.port'),
+            'database' => Config::get('redis.database'),
+        ]);
+    }
+
     /**
      * Get the registered name of the component.
      *

src/Http/Middleware/CorsMiddleware.php

@@ -9,7 +9,7 @@ use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Siteworxpro\App\Services\Facades\Config;
+use Siteworxpro\App\Facades\Config;
 
 /**
  * Class CorsMiddleware

src/Server.php

@@ -5,21 +5,16 @@ declare(strict_types=1);
 namespace Siteworxpro\App;
 
 use Illuminate\Container\Container;
-use Illuminate\Database\Capsule\Manager;
+use Illuminate\Support\Facades\Facade;
-use Illuminate\Support\ServiceProvider;
 use League\Route\Http\Exception\MethodNotAllowedException;
 use League\Route\Http\Exception\NotFoundException;
 use League\Route\Router;
 use Nyholm\Psr7\Factory\Psr17Factory;
-use Siteworx\Config\Config as SWConfig;
 use Siteworxpro\App\Controllers\IndexController;
+use Siteworxpro\App\Facades\Config;
+use Siteworxpro\App\Facades\Logger;
 use Siteworxpro\App\Http\JsonResponseFactory;
 use Siteworxpro\App\Http\Middleware\CorsMiddleware;
-use Siteworxpro\App\Services\Facade;
-use Siteworxpro\App\Services\Facades\Config;
-use Siteworxpro\App\Services\Facades\Logger;
-use Siteworxpro\App\Services\ServiceProviders\LoggerServiceProvider;
-use Siteworxpro\App\Services\ServiceProviders\RedisServiceProvider;
 use Spiral\RoadRunner\Http\PSR7Worker;
 use Spiral\RoadRunner\Worker;
 
@@ -44,17 +39,11 @@ class Server
      */
     protected PSR7Worker $worker;
 
-    public static array $serviceProviders = [
-        LoggerServiceProvider::class,
-        RedisServiceProvider::class
-    ];
-
 
     /**
      * Server constructor.
      *
      * Initializes the server by booting the PSR-7 worker and router.
-     * @throws \ReflectionException
      */
     public function __construct()
     {
@@ -69,33 +58,11 @@ class Server
      * subclasses to ensure proper initialization.
      *
      * @return void
-     * @throws \ReflectionException
      */
     private function boot(): void
     {
         $container = new Container();
-        Facade::setFacadeContainer($container);
+        Facade::setFacadeApplication($container);
-
-        // Bind the container to the Config facade first so that it can be used by service providers
-        $container->bind(SWConfig::class, function () {
-            return SWConfig::load(__DIR__ . '/../config.php');
-        });
-
-        foreach (self::$serviceProviders as $serviceProvider) {
-            if (class_exists($serviceProvider)) {
-                $provider = new $serviceProvider($container);
-                if ($provider instanceof ServiceProvider) {
-                    $provider->register();
-                } else {
-                    throw new \RuntimeException(sprintf(
-                        'Service provider %s is not an instance of ServiceProvider.',
-                        $serviceProvider
-                    ));
-                }
-            } else {
-                throw new \RuntimeException(sprintf('Service provider %s not found.', $serviceProvider));
-            }
-        }
 
         $this->worker = new PSR7Worker(
             Worker::create(),
@@ -121,8 +88,18 @@ class Server
      */
     public function bootModelCapsule(): void
     {
-        $capsule = new Manager();
+        $capsule = new \Illuminate\Database\Capsule\Manager();
-        $capsule->addConnection(Config::get('db'));
+        $capsule->addConnection([
+            'driver' => Config::get('db.driver'),
+            'host' => Config::get('db.host'),
+            'database' => Config::get('db.database'),
+            'username' => Config::get('db.username'),
+            'password' => Config::get('db.password'),
+            'charset' => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix' => '',
+        ]);
+
         $capsule->setAsGlobal();
         $capsule->bootEloquent();
     }

src/Services/Facade.php

@@ -1,308 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Siteworxpro\App\Services;
-
-use Illuminate\Contracts\Container\Container;
-use Illuminate\Support\Testing\Fakes\Fake;
-use Mockery;
-use Mockery\Expectation;
-use Mockery\ExpectationInterface;
-use Mockery\LegacyMockInterface;
-use Mockery\MockInterface;
-
-class Facade
-{
-    /**
-     * The application instance being facaded.
-     *
-     * @var Container | null
-     */
-    protected static ?Container $container = null;
-
-    /**
-     * The resolved object instances.
-     *
-     * @var array
-     */
-    protected static array $resolvedInstance;
-
-    /**
-     * Indicates if the resolved instance should be cached.
-     *
-     * @var bool
-     */
-    protected static bool $cached = true;
-
-    /**
-     * Run a Closure when the facade has been resolved.
-     *
-     * @param  \Closure  $callback
-     * @return void
-     */
-    public static function resolved(\Closure $callback): void
-    {
-        $accessor = static::getFacadeAccessor();
-
-        if (static::$container->resolved($accessor) === true) {
-            $callback(static::getFacadeRoot(), static::$container);
-        }
-
-        static::$container->afterResolving($accessor, function ($service, $app) use ($callback) {
-            $callback($service, $app);
-        });
-    }
-
-    /**
-     * Convert the facade into a Mockery spy.
-     *
-     * @return MockInterface
-     */
-    public static function spy(): MockInterface
-    {
-        if (! static::isMock()) {
-            $class = static::getMockableClass();
-
-            return tap($class ? Mockery::spy($class) : Mockery::spy(), function ($spy) {
-                static::swap($spy);
-            });
-        }
-
-        throw new \RuntimeException('Cannot spy on an existing mock instance.');
-    }
-
-    /**
-     * Initiate a partial mock on the facade.
-     *
-     * @return MockInterface
-     */
-    public static function partialMock(): MockInterface
-    {
-        $name = static::getFacadeAccessor();
-
-        $mock = static::isMock()
-            ? static::$resolvedInstance[$name]
-            : static::createFreshMockInstance();
-
-        return $mock->makePartial();
-    }
-
-    /**
-     * Initiate a mock expectation on the facade.
-     *
-     * @return Expectation|ExpectationInterface
-     */
-    public static function shouldReceive(): Mockery\Expectation | Mockery\ExpectationInterface
-    {
-        $name = static::getFacadeAccessor();
-
-        $mock = static::isMock()
-            ? static::$resolvedInstance[$name]
-            : static::createFreshMockInstance();
-
-        return $mock->shouldReceive(...func_get_args());
-    }
-
-    /**
-     * Initiate a mock expectation on the facade.
-     *
-     * @return Expectation|ExpectationInterface
-     */
-    public static function expects(): Mockery\Expectation | Mockery\ExpectationInterface
-    {
-        $name = static::getFacadeAccessor();
-
-        $mock = static::isMock()
-            ? static::$resolvedInstance[$name]
-            : static::createFreshMockInstance();
-
-        return $mock->expects(...func_get_args());
-    }
-
-    /**
-     * Create a fresh mock instance for the given class.
-     *
-     * @return MockInterface|LegacyMockInterface
-     */
-    protected static function createFreshMockInstance(): MockInterface | LegacyMockInterface
-    {
-        return tap(static::createMock(), function ($mock) {
-            static::swap($mock);
-
-            $mock->shouldAllowMockingProtectedMethods();
-        });
-    }
-
-    /**
-     * Create a fresh mock instance for the given class.
-     *
-     * @return MockInterface
-     */
-    protected static function createMock(): MockInterface
-    {
-        $class = static::getMockableClass();
-
-        return $class ? Mockery::mock($class) : Mockery::mock();
-    }
-
-    /**
-     * Determines whether a mock is set as the instance of the facade.
-     *
-     * @return bool
-     */
-    protected static function isMock(): bool
-    {
-        $name = static::getFacadeAccessor();
-
-        return isset(static::$resolvedInstance[$name]) &&
-            static::$resolvedInstance[$name] instanceof LegacyMockInterface;
-    }
-
-    /**
-     * Get the mockable class for the bound instance.
-     *
-     * @return string|null
-     */
-    protected static function getMockableClass(): ?string
-    {
-        if ($root = static::getFacadeRoot()) {
-            return get_class($root);
-        }
-
-        return null;
-    }
-
-    /**
-     * Hotswap the underlying instance behind the facade.
-     *
-     * @param  mixed  $instance
-     * @return void
-     */
-    public static function swap(mixed $instance): void
-    {
-        static::$resolvedInstance[static::getFacadeAccessor()] = $instance;
-
-        if (isset(static::$container)) {
-            static::$container->instance(static::getFacadeAccessor(), $instance);
-        }
-    }
-
-    /**
-     * Determines whether a "fake" has been set as the facade instance.
-     *
-     * @return bool
-     */
-    public static function isFake(): bool
-    {
-        $name = static::getFacadeAccessor();
-
-        return isset(static::$resolvedInstance[$name]) &&
-            static::$resolvedInstance[$name] instanceof Fake;
-    }
-
-    /**
-     * Get the root object behind the facade.
-     *
-     * @return mixed
-     */
-    public static function getFacadeRoot(): mixed
-    {
-        return static::resolveFacadeInstance(static::getFacadeAccessor());
-    }
-
-    /**
-     * Get the registered name of the component.
-     *
-     * @return string
-     *
-     * @throws \RuntimeException
-     */
-    protected static function getFacadeAccessor(): string
-    {
-        throw new \RuntimeException('Facade does not implement getFacadeAccessor method.');
-    }
-
-    /**
-     * Resolve the facade root instance from the container.
-     *
-     * @param string $name
-     * @return mixed
-     */
-    protected static function resolveFacadeInstance(string $name): mixed
-    {
-        if (isset(static::$resolvedInstance[$name])) {
-            return static::$resolvedInstance[$name];
-        }
-
-        if (static::$container) {
-            if (static::$cached) {
-                return static::$resolvedInstance[$name] = static::$container[$name];
-            }
-
-            return static::$container[$name];
-        }
-
-        return null;
-    }
-
-    /**
-     * Clear a resolved facade instance.
-     *
-     * @param string $name
-     * @return void
-     */
-    public static function clearResolvedInstance(string $name): void
-    {
-        unset(static::$resolvedInstance[$name]);
-    }
-
-    /**
-     * Clear all of the resolved instances.
-     *
-     * @return void
-     */
-    public static function clearResolvedInstances(): void
-    {
-        static::$resolvedInstance = [];
-    }
-
-    /**
-     * Get the application instance behind the facade.
-     */
-    public static function getFacadeContainer(): ?Container
-    {
-        return static::$container;
-    }
-
-    /**
-     * Set the application instance.
-     *
-     * @param Container | null $container
-     * @return void
-     */
-    public static function setFacadeContainer(Container | null $container): void
-    {
-        static::$container = $container;
-    }
-
-    /**
-     * Handle dynamic, static calls to the object.
-     *
-     * @param string $method
-     * @param array $args
-     * @return mixed
-     *
-     * @throws \RuntimeException
-     */
-    public static function __callStatic(string $method, array $args)
-    {
-        $instance = static::getFacadeRoot();
-
-        if (! $instance) {
-            throw new \RuntimeException('A facade root has not been set.');
-        }
-
-        return $instance->$method(...$args);
-    }
-}

src/Services/Facades/Config.php

@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Siteworxpro\App\Services\Facades;
-
-use Siteworx\Config\Config as SwConfig;
-use Siteworxpro\App\Services\Facade;
-
-/**
- * Class Config
- *
- * This class serves as a facade for the configuration settings of the application.
- * It extends the Facade class from the Illuminate\Support\Facades namespace.
- *
- * @method static array | bool | string | int | null  get(string $key) Retrieve the configuration value for the given key. // @codingStandardsIgnoreStart
- *
- * @package Siteworx\App\Facades
- */
-class Config extends Facade
-{
-    /**
-     * Get the registered name of the component.
-     *
-     * @return string The name of the component.
-     */
-    protected static function getFacadeAccessor(): string
-    {
-        return SwConfig::class;
-    }
-}

src/Services/ServiceProviders/LoggerServiceProvider.php

@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Siteworxpro\App\Services\ServiceProviders;
-
-use Illuminate\Support\ServiceProvider;
-use RoadRunner\Logger\Logger as RRLogger;
-use Spiral\Goridge\RPC\RPC;
-
-class LoggerServiceProvider extends ServiceProvider
-{
-    public function register(): void
-    {
-        $this->app->singleton(RRLogger::class, function () {
-            $rpc = RPC::create('tcp://127.0.0.1:6001');
-            return new RRLogger($rpc);
-        });
-    }
-}

src/Services/ServiceProviders/RedisServiceProvider.php

@@ -1,25 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Siteworxpro\App\Services\ServiceProviders;
-
-use Illuminate\Support\ServiceProvider;
-use Predis\Client;
-use Siteworxpro\App\Services\Facades\Config;
-
-class RedisServiceProvider extends ServiceProvider
-{
-    public function register(): void
-    {
-        $this->app->singleton(Client::class, function () {
-            return new Client([
-                'scheme' => 'tcp',
-                'host' => Config::get('redis.host'),
-                'port' => Config::get('redis.port'),
-                'database' => Config::get('redis.database'),
-                'password' => Config::get('redis.password'),
-            ]);
-        });
-    }
-}

tests/Controllers/AbstractController.php

@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Siteworxpro\Tests\Controllers;
-
-use Nyholm\Psr7\ServerRequest;
-use Siteworxpro\Tests\Unit;
-
-abstract class AbstractController extends Unit
-{
-    protected function getMockRequest(string $method = 'GET', string $uri = '/'): ServerRequest
-    {
-        return new ServerRequest($method, $uri);
-    }
-}

tests/Controllers/ControllerTest.php

@@ -1,54 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Siteworxpro\Tests\Controllers;
-
-use Siteworxpro\App\Controllers\Controller;
-
-class ControllerTest extends AbstractController
-{
-    public function testNotFoundExceptions()
-    {
-        $testClass = new TestClass();
-
-        $this->expectException(\League\Route\Http\Exception\NotFoundException::class);
-        $testClass->get($this->getMockRequest());
-    }
-
-    public function testNotFoundExceptionPost()
-    {
-        $testClass = new TestClass();
-
-        $this->expectException(\League\Route\Http\Exception\NotFoundException::class);
-        $testClass->post($this->getMockRequest());
-    }
-
-    public function testNotFoundExceptionPut()
-    {
-        $testClass = new TestClass();
-
-        $this->expectException(\League\Route\Http\Exception\NotFoundException::class);
-        $testClass->put($this->getMockRequest());
-    }
-
-    public function testNotFoundExceptionDelete()
-    {
-        $testClass = new TestClass();
-
-        $this->expectException(\League\Route\Http\Exception\NotFoundException::class);
-        $testClass->delete($this->getMockRequest());
-    }
-
-    public function testNotFoundExceptionPatch()
-    {
-        $testClass = new TestClass();
-
-        $this->expectException(\League\Route\Http\Exception\NotFoundException::class);
-        $testClass->patch($this->getMockRequest());
-    }
-}
-
-class TestClass extends Controller // phpcs:ignore
-{
-}

tests/Controllers/IndexControllerTest.php

@@ -1,25 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Siteworxpro\Tests\Controllers;
-
-use Siteworxpro\App\Controllers\IndexController;
-
-class IndexControllerTest extends AbstractController
-{
-    /**
-     * @throws \JsonException
-     */
-    public function testGet(): void
-    {
-        $this->assertTrue(true);
-
-        $controller = new IndexController();
-
-        $response = $controller->get($this->getMockRequest());
-
-        $this->assertEquals(200, $response->getStatusCode());
-        $this->assertEquals('{"status_code":200,"message":"Server is running"}', (string)$response->getBody());
-    }
-}

tests/Facades/AbstractFacade.php

@@ -1,32 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Siteworxpro\Tests\Facades;
-
-use Siteworxpro\App\Services\Facade;
-use Siteworxpro\Tests\Unit;
-
-abstract class AbstractFacade extends Unit
-{
-    abstract protected function getFacadeClass(): string;
-    abstract protected function getConcrete(): string;
-
-    public function testFacadeAccessor(): void
-    {
-        /** @var Facade | string $class */
-        $class = $this->getFacadeClass();
-
-        $this->assertTrue(
-            method_exists($class, 'getFacadeAccessor'),
-            sprintf('The class %s must implement the method getFacadeAccessor.', $class)
-        );
-
-        $facade = $class::getFacadeRoot();
-
-        $this->assertNotNull(
-            $facade,
-            sprintf('The facade %s is not properly initialized.', $this->getConcrete())
-        );
-    }
-}

tests/Facades/RedisTest.php

@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Siteworxpro\Tests\Facades;
-
-use Predis\Client;
-use Siteworxpro\App\Services\Facades\Redis;
-
-class RedisTest extends AbstractFacade
-{
-    protected function getFacadeClass(): string
-    {
-        return Redis::class;
-    }
-
-    protected function getConcrete(): string
-    {
-        return Client::class;
-    }
-}

tests/Http/Middleware/CorsMiddlewareTest.php

@@ -7,8 +7,8 @@ namespace Siteworxpro\Tests\Http\Middleware;
 use Nyholm\Psr7\Response;
 use Nyholm\Psr7\ServerRequest;
 use Psr\Http\Server\RequestHandlerInterface;
+use Siteworxpro\App\Facades\Config;
 use Siteworxpro\App\Http\Middleware\CorsMiddleware;
-use Siteworxpro\App\Services\Facades\Config;
 use Siteworxpro\Tests\Unit;
 
 class CorsMiddlewareTest extends Unit

tests/ServiceProviders/AbstractServiceProvider.php

@@ -1,43 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Siteworxpro\Tests\ServiceProviders;
-
-use Illuminate\Container\Container;
-use Illuminate\Contracts\Container\BindingResolutionException;
-use Illuminate\Support\ServiceProvider;
-use Siteworxpro\Tests\Unit;
-
-abstract class AbstractServiceProvider extends Unit
-{
-    abstract protected function getProviderClass(): string;
-
-    /**
-     * @throws BindingResolutionException
-     */
-    public function testProvider(): void
-    {
-        $container = new Container();
-
-        $providerClass = $this->getProviderClass();
-
-        /** @var ServiceProvider $providerClass */
-        $provider = new $providerClass($container);
-
-        $this->assertInstanceOf($providerClass, $provider);
-        $provider->register();
-
-        $bindings = $provider->bindings;
-        foreach ($bindings as $abstract => $concrete) {
-            $this->assertTrue($container->bound($abstract), "The $abstract is not bound in the container.");
-            $this->assertNotNull($container->make($abstract), "The $abstract could not be resolved.");
-
-            $this->assertInstanceOf(
-                $concrete,
-                $container->make($abstract),
-                "The $abstract is not an instance of $concrete."
-            );
-        }
-    }
-}

tests/ServiceProviders/LoggerServiceProviderTest.php

@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Siteworxpro\Tests\ServiceProviders;
-
-use Siteworxpro\App\Services\ServiceProviders\LoggerServiceProvider;
-
-class LoggerServiceProviderTest extends AbstractServiceProvider
-{
-    protected function getProviderClass(): string
-    {
-        return LoggerServiceProvider::class;
-    }
-}

tests/ServiceProviders/RedisServiceProviderTest.php

@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Siteworxpro\Tests\ServiceProviders;
-
-use Siteworxpro\App\Services\ServiceProviders\RedisServiceProvider;
-
-class RedisServiceProviderTest extends AbstractServiceProvider
-{
-    protected function getProviderClass(): string
-    {
-        return RedisServiceProvider::class;
-    }
-}

tests/Unit.php

@@ -5,29 +5,21 @@ declare(strict_types=1);
 namespace Siteworxpro\Tests;
 
 use Illuminate\Container\Container;
+use Illuminate\Support\Facades\Facade;
 use PHPUnit\Framework\TestCase;
-use Siteworx\Config\Config as SWConfig;
+use Siteworxpro\App\Facades\Config;
-use Siteworxpro\App\Services\Facade;
-use Siteworxpro\App\Services\Facades\Config;
 
 abstract class Unit extends TestCase
 {
-    /**
-     * @throws \ReflectionException
-     */
     protected function setUp(): void
     {
         $container = new Container();
-        Facade::setFacadeContainer($container);
+        Facade::setFacadeApplication($container);
-
-        $container->bind(SWConfig::class, function () {
-            return SWConfig::load(__DIR__ . '/../config.php');
-        });
     }
 
     protected function tearDown(): void
     {
         Config::clearResolvedInstances();
-        Facade::setFacadeContainer(null);
+        Facade::setFacadeApplication(null);
     }
 }