refactor: composer (#46)

Author: dkaser

.github/workflows/lint.yml

@@ -24,9 +24,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: php-actions/composer@v6
-      - uses: php-actions/phpstan@v3
         with:
-          version: composer
+          working_dir: "src/usr/local/php/unraid-tailscale-utils"
+      - run: "vendor/bin/phpstan"
 
   commitlint:
     name: Commitlint

.github/workflows/release.yml

@@ -9,6 +9,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Install dependencies
+        uses: "php-actions/composer@v6"
+        with:
+          dev: no
+          working_dir: "src/usr/local/php/unraid-tailscale-utils"
+
       - id: build_files
         run: |
           mkdir release

.gitignore

@@ -1,4 +1,4 @@
 .DS_Store
 ._.DS_Store
 .php-cs-fixer.cache
-/vendor
+vendor

.php-cs-fixer.dist.php

@@ -5,6 +5,7 @@
     ->in(__DIR__)
     ->name('*.php')
     ->name('*.page')
+    ->exclude(['vendor'])
 ;
 
 $config = new PhpCsFixer\Config();

composer

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+composer --working-dir src/usr/local/php/unraid-tailscale-utils/ "$@"

composer.json

@@ -5,3 +5,5 @@ parameters:
 		- page
 	paths:
 		- src
+	excludePaths:
+		- */vendor/*

phpstan.neon

@@ -4,10 +4,13 @@
 namespace Tailscale;
 
 require_once "include/common.php";
+if ( ! isset($utils)) {
+    throw new \Exception("Utils not initialized.");
+}
 
 $localAPI = new LocalAPI();
 
 foreach (array_slice($argv, 1) as $key => $value) {
-    Utils::logmsg("Tailnet lock: signing {$value}");
+    $utils->logmsg("Tailnet lock: signing {$value}");
     $localAPI->postTkaSign($value);
 }

src/usr/local/emhttp/plugins/tailscale/approve-nodes.php

@@ -6,7 +6,12 @@
 $docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
 
 require_once "{$docroot}/plugins/tailscale/include/common.php";
+if ( ! defined(__NAMESPACE__ . '\PLUGIN_ROOT') || ! defined(__NAMESPACE__ . '\PLUGIN_NAME')) {
+    throw new \RuntimeException("Common file not loaded.");
+}
+$utils = new Utils(PLUGIN_NAME);
+
 $tailscaleConfig = $tailscaleConfig ?? new Config();
 
-Utils::run_task('Tailscale\System::notifyOnKeyExpiration');
-Utils::run_task('Tailscale\System::refreshWebGuiCert');
+$utils->run_task('Tailscale\System::notifyOnKeyExpiration');
+$utils->run_task('Tailscale\System::refreshWebGuiCert');

src/usr/local/emhttp/plugins/tailscale/daily.php

@@ -2,8 +2,15 @@
 
 namespace Tailscale;
 
+use EDACerton\PluginUtils\Translator;
+
+if ( ! defined(__NAMESPACE__ . '\PLUGIN_ROOT') || ! defined(__NAMESPACE__ . '\PLUGIN_NAME')) {
+    throw new \RuntimeException("Common file not loaded.");
+}
+
+$tr = $tr ?? new Translator(PLUGIN_ROOT);
+
 $tailscaleConfig = $tailscaleConfig ?? new Config();
-$tr              = $tr              ?? new Translator();
 
 $tailscale_dashboard = "<tr><td>" . $tr->tr("tailscale_disabled") . "</td></tr>";