Allow to use PCA as embeded package

Author: RobiNN1

config.dist.php

@@ -140,4 +140,6 @@
     'metricsrefresh' => 60, // In seconds, refresh interval for metrics - default 60
     'metricstab'     => 1440, // Default tab in metrics, 60 - Last hour, 1440 - Last day, 10080 - Last week, 43200 - Last month - default 1440
     'hash'           => 'pca', // Any random string to secure metrics DB file
+    'tmpdir'         => __DIR__.'/tmp',
+    //'pcapath'        => 'vendor/robinn/phpcacheadmin/', // Path to the package when installed via composer. User for assets.
 ];

index.php

@@ -6,11 +6,6 @@
 
 declare(strict_types=1);
 
-use Composer\InstalledVersions;
-use RobiNN\Pca\Admin;
-use RobiNN\Pca\Config;
-use RobiNN\Pca\Template;
-
 // Always display errors
 ini_set('display_errors', 'On');
 ini_set('display_startup_errors', 'On');
@@ -26,7 +21,7 @@
     require_once __DIR__.'/vendor/autoload.php';
 
     if (!extension_loaded('redis') &&
-        InstalledVersions::isInstalled('predis/predis') === false &&
+        Composer\InstalledVersions::isInstalled('predis/predis') === false &&
         is_file($path.'predis.phar')
     ) {
         require_once 'phar://'.$path.'predis.phar/vendor/autoload.php';
@@ -38,10 +33,9 @@
 
 $auth = false;
 
-if (is_callable(Config::get('auth'))) {
-    Config::get('auth')();
+if (is_callable(RobiNN\Pca\Config::get('auth'))) {
+    RobiNN\Pca\Config::get('auth')();
     $auth = true;
 }
 
-$template = new Template();
-echo (new Admin($template))->render($auth);
+echo (new RobiNN\Pca\Admin())->render($auth);

src/Admin.php

@@ -13,15 +13,19 @@
 class Admin {
     public const VERSION = '2.3.1';
 
+    private readonly Template $template;
+
     /**
      * @var array<string, DashboardInterface>
      */
     private array $dashboards = [];
 
-    public function __construct(private readonly Template $template) {
+    public function __construct() {
+        $this->template = new Template();
+
         foreach (Config::get('dashboards', []) as $class) {
             if (is_subclass_of($class, DashboardInterface::class) && $class::check()) {
-                $dashboard = new $class($template);
+                $dashboard = new $class($this->template);
                 $info = $dashboard->dashboardInfo();
                 $this->dashboards[$info['key']] = $dashboard;
             }

src/Config.php

@@ -16,11 +16,19 @@ class Config {
      */
     private static ?array $config = null;
 
+    private static ?string $config_path = null;
+
+    public static function setConfigPath(string $path): void {
+        self::$config_path = $path;
+        self::$config = null;
+    }
+
     /**
      * This is intended for use in tests.
      */
     public static function reset(): void {
         self::$config = null;
+        self::$config_path = null;
     }
 
     /**
@@ -35,7 +43,9 @@ public static function get(string $key, $default = null) {
             return self::$config[$key] ?? $default;
         }
 
-        if (is_file(__DIR__.'/../config.php')) {
+        if (self::$config_path !== null && is_file(self::$config_path)) {
+            $config = (array) require self::$config_path;
+        } elseif (is_file(__DIR__.'/../config.php')) {
             $config = (array) require __DIR__.'/../config.php';
         } elseif (is_file(__DIR__.'/../config.dist.php')) {
             $config = (array) require __DIR__.'/../config.dist.php';

src/Dashboards/Memcached/MemcachedMetrics.php

@@ -33,7 +33,8 @@ public function __construct(
     ) {
         $server_name = Helpers::getServerTitle($servers[$selected]);
         $hash = md5($server_name.Config::get('hash', 'pca'));
-        $db = __DIR__.'/../../../tmp/memcached_metrics_'.$hash.'.db';
+        $tmp = Config::get('tmpdir', __DIR__.'/../../../tmp');
+        $db = $tmp.'/memcached_metrics_'.$hash.'.db';
 
         $this->pdo = new PDO('sqlite:'.$db);
         $this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);

src/Dashboards/Redis/RedisMetrics.php

@@ -33,7 +33,8 @@ public function __construct(
     ) {
         $server_name = Helpers::getServerTitle($servers[$selected]);
         $hash = md5($server_name.Config::get('hash', 'pca'));
-        $db = __DIR__.'/../../../tmp/redis_metrics_'.$hash.'.db';
+        $tmp = Config::get('tmpdir', __DIR__.'/../../../tmp');
+        $db = $tmp.'/redis_metrics_'.$hash.'.db';
 
         $this->pdo = new PDO('sqlite:'.$db);
         $this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);

src/Template.php

@@ -49,8 +49,9 @@ public function addPath(string $namespace, string $path): void {
 
     private function initTwig(): Environment {
         $loader = new FilesystemLoader(__DIR__.'/../templates');
+        $tmp = Config::get('tmpdir', __DIR__.'/../tmp');
         $twig = new Environment($loader, [
-            'cache' => Config::get('twig-cache', __DIR__.'/../tmp/twig'),
+            'cache' => Config::get('twig-cache', $tmp.'/twig'),
             'debug' => Config::get('twig-debug', false),
         ]);
 

templates/dashboards/memcached/metrics.twig

@@ -33,7 +33,7 @@
     </div>
 </div>
 
-<script src="assets/js/echarts.min.js"></script>
+<script src="{{ config('pcapath', '') }}assets/js/echarts.min.js"></script>
 <script>
     document.addEventListener('DOMContentLoaded', () => {
         const initial_theme = document.documentElement.classList.contains('dark') ? 'dark' : null;

templates/dashboards/redis/metrics.twig

@@ -27,7 +27,7 @@
     </div>
 </div>
 
-<script src="assets/js/echarts.min.js"></script>
+<script src="{{ config('pcapath', '') }}assets/js/echarts.min.js"></script>
 <script>
     document.addEventListener('DOMContentLoaded', () => {
         const initial_theme = document.documentElement.classList.contains('dark') ? 'dark' : null;

templates/layout.twig

@@ -4,9 +4,9 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{{ site_title }} - phpCacheAdmin</title>
-    <link rel="icon" type="image/png" sizes="32x32" href="assets/favicon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="{{ config('pcapath', '') }}assets/favicon.png">
     <meta name="theme-color" content="#ffffff">
-    <link rel="stylesheet" href="assets/css/styles.css?v={{ version }}">
+    <link rel="stylesheet" href="{{ config('pcapath', '') }}assets/css/styles.css?v={{ version }}">
 
     {%- if colors -%}
         <style>
@@ -97,6 +97,6 @@
     </div>
 </footer>
 {{ modals|raw }}
-<script src="assets/js/scripts.js?v={{ version }}"></script>
+<script src="{{ config('pcapath', '') }}assets/js/scripts.js?v={{ version }}"></script>
 </body>
 </html>