Merge pull request #2633 from Leantime/marketplaceFixes

Fixes to version management for plugins
Leantime · Aug 24, 2024 · 2639883 · 2639883
2 parents fb4e2e1 + 2ad43d2
commit 2639883
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 5 deletions.
diff --git a/.idea/codeception.xml b/.idea/codeception.xml
diff --git a/.idea/leantime-oss.iml b/.idea/leantime-oss.iml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/phpspec.xml b/.idea/phpspec.xml
diff --git a/app/Core/Exceptions/ExceptionHandler.php b/app/Core/Exceptions/ExceptionHandler.php
@@ -29,6 +29,7 @@
 use Throwable;
 use Whoops\Handler\HandlerInterface;
 use Whoops\Run as Whoops;
+use Symfony\Component\Console\Application as ConsoleApplication;
 
 class ExceptionHandler implements ExceptionHandlerContract
 {
@@ -583,7 +584,7 @@ protected function convertExceptionToArray(Throwable $e)
      */
     public function renderForConsole($output, Throwable $e)
     {
-        app()->renderThrowable($e, $output);
+        (new ConsoleApplication())->renderThrowable($e, $output);
     }
 
     /**

diff --git a/app/Domain/Plugins/Models/MarketplacePlugin.php b/app/Domain/Plugins/Models/MarketplacePlugin.php
@@ -26,6 +26,7 @@ class MarketplacePlugin implements PluginDisplayStrategy
     public array $reviews;
     public string $marketplaceId;
     public array $compatibility;
+    public string $version;
 
     public function getCardDesc(): string
     {

diff --git a/app/Domain/Plugins/Services/Plugins.php b/app/Domain/Plugins/Services/Plugins.php
@@ -414,6 +414,7 @@ public function getMarketplacePlugins(int $page, string $query = ''): array
                         ->set('vendorEmail', $plugin['vendor_email'] ?? '')
                         ->set('startingPrice', '$' . ($plugin['price'] ?? '') . (! empty($plugin['sub_interval']) ? '/' . $plugin['sub_interval'] : ''))
                         ->set('rating', $plugin['rating'] ?? '')
+                        ->set('version', $plugin['version'] ?? '')
                         ->get();
                 }
             }

diff --git a/app/Plugins b/app/Plugins