cleanup for 1.10 (#1906)

2020-08-22 19:15:54 +02:00
parent 064d083db6
commit c2c4f087e4
26 changed files with 66 additions and 13 deletions
--- a/src/Plugin/PluginManager.php
+++ b/src/Plugin/PluginManager.php
@@ -94,7 +94,8 @@ class PluginManager
        $json = json_decode(file_get_contents($composer), true);

        $reqVersion = $json['extra']['kimai']['require'] ?? 'unknown';
-        $version = $json['extra']['kimai']['version'] ?? 'unknown';
+        // the version field is required if we use composer to install a plugin via var/packages/
+        $version = $json['extra']['kimai']['version'] ?? ($json['version'] ?? 'unknown');
        $description = $json['description'] ?? '';

        $homepage = $json['homepage'] ?? Constants::HOMEPAGE . '/store/';