diff --git a/app/Services/PluginManager.php b/app/Services/PluginManager.php index 6cf7d4e0..ef31b9f1 100644 --- a/app/Services/PluginManager.php +++ b/app/Services/PluginManager.php @@ -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) { diff --git a/tests/ServicesTest/PluginManagerTest.php b/tests/ServicesTest/PluginManagerTest.php index b89d786d..ca99e163 100644 --- a/tests/ServicesTest/PluginManagerTest.php +++ b/tests/ServicesTest/PluginManagerTest.php @@ -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',