Refactored cli-service structure

Author: Shadow243

composer.json

@@ -19,6 +19,11 @@
     ],
     "homepage": "https://cypht.org",
     "license": "LGPL-2.1",
+    "autoload": {
+        "psr-4": {
+            "Services\\": "services/"
+        }
+    },
     "authors": [
         {
             "name": "Jason Munro",
@@ -38,7 +43,6 @@
         "bacon/bacon-qr-code": "^1.0.3 || ^2.0.0",
         "christian-riesen/base32": "^1.3.2",
         "composer": "^2.0.0",
-        "cypht/cli-service": "*",
         "ext-curl": "*",
         "ext-fileinfo": "*",
         "ext-iconv": "*",
@@ -50,7 +54,9 @@
         "henrique-borba/php-sieve-manager": "^1.0",
         "league/commonmark": "^2.4",
         "paragonie/random_compat": "^2.0.18",
+        "php-di/php-di": "^7.0",
         "php": ">=8.1",
+        "symfony/console": "^6.4",
         "symfony/dotenv": "^4.3 || 5.4",
         "symfony/yaml": "~6.4.3",
         "thomaspark/bootswatch": "^5.3",
@@ -88,13 +94,5 @@
         "post-update-cmd": "composer suggest",
         "post-package-install": "composer suggest",
         "post-install-cmd": "composer suggest"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "repositories": [
-        {
-            "type": "path",
-            "url": "./packages/cli-service"
-        }
-    ]
+    }
 }

composer.lock

@@ -1,21 +1,53 @@
 #!/usr/bin/env php
 <?php
-define('SKIP_HM_DISPATCH', true);
-
-
 // Load the application dependencies and bootstrap the application
-require_once __DIR__ . '/index.php';
+define('APP_PATH', '');
+define('VENDOR_PATH', APP_PATH.'vendor/');
+define('CONFIG_PATH', APP_PATH.'config/');
+define('WEB_ROOT', '');
+define('ASSETS_THEMES_ROOT', '');
+define('DEBUG_MODE', true);
+define('CACHE_ID', '');
+define('SITE_ID', '');
+define('JS_HASH', '');
+define('CSS_HASH', '');
+
+/* show all warnings in debug mode */
+if (DEBUG_MODE) {
+    error_reporting(E_ALL);
+}
+
+/* don't let anything output content until we are ready */
+ob_start();
+
+require VENDOR_PATH.'autoload.php';
+/* get includes */
+require APP_PATH.'lib/framework.php';
+$environment = Hm_Environment::getInstance();
+$environment->load();
+
+/* get configuration */
+$config = new Hm_Site_Config_File();
+/* set default TZ */
+date_default_timezone_set($config->get('default_setting_timezone', 'UTC'));
+/* set the default since and per_source values */
+$environment->define_default_constants($config);
+
+/* setup ini settings */
+if (!$config->get('disable_ini_settings')) {
+    require APP_PATH.'lib/ini_set.php';
+}
 
 
 use Symfony\Component\Console\Application;
-use Cypht\Service\Providers\CommandServiceProvider;
+use Services\Providers\Hm_CommandServiceProvider;
 
-$container = require __DIR__ . '/packages/cli-service/bootstrap.php';
+$container = require __DIR__ . '/services/Hm_bootstrap.php';
 
 $application = new Application('Cypht Console', '1.0');
 
 // Register commands automatically using the service provider
-$commandServiceProvider = new CommandServiceProvider();
+$commandServiceProvider = new Hm_CommandServiceProvider();
 $commandServiceProvider->register($application, $container);
 
 // Run the console application

console

@@ -49,9 +49,7 @@
     require APP_PATH.'lib/ini_set.php';
 }
 /* process the request */
-if (!defined('SKIP_HM_DISPATCH')) {
-    new Hm_Dispatch($config);
-}
+new Hm_Dispatch($config);
 
 /* log some debug stats about the page */
 if (DEBUG_MODE) {