banquise/pelican-panel-mirror
13
0
Fork 1
mirror of https://github.com/pelican-dev/panel.git synced 2025-11-09 20:19:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

use own composer process for better error messages

Browse Source
This commit is contained in:
Boy132 2025-11-07 00:05:29 +01:00
parent 427c1187a2
commit bfae4e7f30
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Services/Helpers/PluginService.php
View File

@ -12,7 +12,6 @@ use Illuminate\Console\Application as ConsoleApplication;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Illuminate\Foundation\Application; use Illuminate\Foundation\Application;
use Illuminate\Http\UploadedFile; use Illuminate\Http\UploadedFile;
use Illuminate\Support\Composer;
use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\File; use Illuminate\Support\Facades\File;
use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Http;
@ -23,7 +22,7 @@ use ZipArchive;
class PluginService class PluginService
{ {
public function __construct(private Application $app, private Composer $composer) {} public function __construct(private Application $app) {}
public function loadPlugins(): void public function loadPlugins(): void
{ {
@ -160,10 +159,9 @@ class PluginService
->unique() ->unique()
->toArray(); ->toArray();
$success = $this->composer->setWorkingPath(base_path())->requirePackages($composerPackages); $result = Process::path(base_path())->timeout(600)->run(['composer', 'require', ...$composerPackages]);
if ($result->failed()) {
if (!$success) { throw new Exception('Could not require composer packages: ' . $result->errorOutput());
throw new Exception("Could not require composer packages for plugin '{$plugin->id}'");
} }
} }
} }