zhangyuheng/blessing-skin-server
1
0
Fork 0
forked from mirror/blessing-skin-server
Code Pull Requests Activity

fix formatting unresolved plugins

Browse Source
This commit is contained in:
Pig Fang 2020-03-18 11:23:46 +08:00
parent 52340ff28c
commit 2a3d9c544d
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/Services/PluginManager.php
View File

@ -416,17 +416,20 @@ class PluginManager
Collection $conflicts
): array {
$unsatisfied = $unsatisfied->map(function ($detail, $name) {
$constraint = $detail['constraint'];
if (!$detail['version']) {
$plugin = $this->get($name);
$name = $plugin ? trans($plugin->title) : $name;
return trans('admin.plugins.operations.unsatisfied.disabled', compact('name'));
if ($name === 'blessing-skin-server') {
$title = 'Blessing Skin Server';
} elseif ($name === 'php') {
$title = 'PHP';
} else {
$title = trans($this->get($name)->title);
return trans('admin.plugins.operations.unsatisfied.version', compact('title', 'constraint'));
$plugin = $this->get($name);
$title = $plugin ? trans($plugin->title) : $name;
}
$constraint = $detail['constraint'];
return $detail['version']
? trans('admin.plugins.operations.unsatisfied.version', compact('title', 'constraint'))
: trans('admin.plugins.operations.unsatisfied.disabled', ['name' => $title]);
})->values()->all();
$conflicts = $conflicts->map(function ($detail, $name) {

10
tests/ServicesTest/PluginManagerTest.php
View File

@ -542,6 +542,8 @@ class PluginManagerTest extends TestCase
]));
$unsatisfied = collect([
'blessing-skin-server' => ['version' => '4.0.0', 'constraint' => '^5.0.0'],
'php' => ['version' => '7.2.0', 'constraint' => '^7.3.0'],
'dep' => ['version' => '0.0.0', 'constraint' => '^6.6.6'],
'whatever' => ['version' => null, 'constraint' => '^1.2.3'],
]);
@ -551,6 +553,14 @@ class PluginManagerTest extends TestCase
$received = $manager->formatUnresolved($unsatisfied, $conflicts);
$expected = [
trans('admin.plugins.operations.unsatisfied.version', [
'title' => 'Blessing Skin Server',
'constraint' => '^5.0.0',
]),
trans('admin.plugins.operations.unsatisfied.version', [
'title' => 'PHP',
'constraint' => '^7.3.0',
]),
trans('admin.plugins.operations.unsatisfied.version', [
'title' => 'dep',
'constraint' => '^6.6.6',