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

change composer_packages to json to allow version constraints

Browse Source
This commit is contained in:
Boy132 2025-10-23 11:46:02 +02:00
parent 3c6ec63381
commit 4f00603c59
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Plugin.php
View File

@ -119,7 +119,7 @@ class Plugin extends Model implements HasPluginSettings
$composerPackages = null; $composerPackages = null;
if (array_key_exists('composer_packages', $data)) { if (array_key_exists('composer_packages', $data)) {
$composerPackages = $data['composer_packages']; $composerPackages = $data['composer_packages'];
$composerPackages = is_array($composerPackages) ? implode(',', $composerPackages) : $composerPackages; $composerPackages = is_array($composerPackages) ? json_encode($composerPackages, JSON_THROW_ON_ERROR) : $composerPackages;
} }
$data = [ $data = [

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

@ -162,7 +162,13 @@ class PluginService
public function requireComposerPackages(Plugin $plugin): void public function requireComposerPackages(Plugin $plugin): void
{ {
if ($plugin->composer_packages) { if ($plugin->composer_packages) {
$success = $this->composer->requirePackages(explode(',', $plugin->composer_packages)); $composerPackages = collect(json_decode($plugin->composer_packages, true, 512, JSON_THROW_ON_ERROR))
->map(fn ($version, $package) => "'$package:$version'")
->flatten()
->unique()
->toArray();
$success = $this->composer->requirePackages($composerPackages);
if (!$success) { if (!$success) {
throw new Exception("Could not require composer packages for plugin '{$plugin->id}'"); throw new Exception("Could not require composer packages for plugin '{$plugin->id}'");