[WIP] Update Manager Refactor

composer.json

@@ -30,7 +30,7 @@
     },
     "require": {
         "php": "^8.0.2",
-        "winter/storm": "dev-develop as 1.2",
+        "winter/storm": "dev-wip/support-uploading-packages-update-manager-changes as 1.2",
         "winter/wn-system-module": "dev-develop",
         "winter/wn-backend-module": "dev-develop",
         "winter/wn-cms-module": "dev-develop",

modules/backend/ServiceProvider.php

@@ -12,11 +12,12 @@
 use System\Classes\MailManager;
 use System\Classes\SettingsManager;
 use System\Classes\UpdateManager;
+use Winter\Storm\Foundation\Extension\WinterExtension;
 use Winter\Storm\Support\Facades\Config;
 use Winter\Storm\Support\Facades\Flash;
 use Winter\Storm\Support\ModuleServiceProvider;
 
-class ServiceProvider extends ModuleServiceProvider
+class ServiceProvider extends ModuleServiceProvider implements WinterExtension
 {
     /**
      * Register the service provider.
@@ -322,4 +323,14 @@ protected function registerBackendSettings()
             $manager->registerOwnerAlias('Winter.Backend', 'October.Backend');
         });
     }
+
+    public function getPath(): string
+    {
+        return __DIR__;
+    }
+
+    public function getIdentifier(): string
+    {
+        return 'Backend';
+    }
 }

modules/backend/classes/AuthManager.php

@@ -1,7 +1,7 @@
 <?php namespace Backend\Classes;
 
 use Config;
-use System\Classes\PluginManager;
+use System\Classes\Extensions\PluginManager;
 use Winter\Storm\Auth\Manager as StormAuthManager;
 use Winter\Storm\Exception\SystemException;
 

modules/backend/classes/BackendController.php

@@ -9,7 +9,7 @@
 use Request;
 use Response;
 use Str;
-use System\Classes\PluginManager;
+use System\Classes\Extensions\PluginManager;
 use View;
 use Winter\Storm\Router\Helper as RouterHelper;
 

modules/backend/classes/NavigationManager.php

@@ -1,12 +1,12 @@
 <?php namespace Backend\Classes;
 
-use Event;
 use BackendAuth;
-use System\Classes\PluginManager;
-use Validator;
-use SystemException;
-use Log;
 use Config;
+use Event;
+use Log;
+use System\Classes\Extensions\PluginManager;
+use SystemException;
+use Validator;
 
 /**
  * Manages the backend navigation.

modules/backend/classes/WidgetManager.php

@@ -1,10 +1,10 @@
 <?php namespace Backend\Classes;
 
-use Str;
 use BackendAuth;
-use SystemException;
-use System\Classes\PluginManager;
 use Event;
+use Str;
+use System\Classes\Extensions\PluginManager;
+use SystemException;
 
 /**
  * Widget manager

modules/backend/widgets/Lists.php

@@ -1,23 +1,23 @@
 <?php namespace Backend\Widgets;
 
+use ApplicationException;
+use Backend;
+use Backend\Classes\ListColumn;
+use Backend\Classes\WidgetBase;
+use BackendAuth;
+use Carbon\Carbon;
 use Db;
-use Str;
+use DbDongle;
 use Html;
 use Lang;
-use Backend;
-use DbDongle;
-use Carbon\Carbon;
-use Winter\Storm\Html\Helper as HtmlHelper;
-use Winter\Storm\Router\Helper as RouterHelper;
-use System\Helpers\DateTime as DateTimeHelper;
-use System\Classes\PluginManager;
-use System\Classes\MediaLibrary;
+use Str;
+use System\Classes\Extensions\PluginManager;
 use System\Classes\ImageResizer;
-use Backend\Classes\ListColumn;
-use Backend\Classes\WidgetBase;
+use System\Classes\MediaLibrary;
+use System\Helpers\DateTime as DateTimeHelper;
 use Winter\Storm\Database\Model;
-use ApplicationException;
-use BackendAuth;
+use Winter\Storm\Html\Helper as HtmlHelper;
+use Winter\Storm\Router\Helper as RouterHelper;
 
 /**
  * List Widget

modules/cms/ServiceProvider.php

@@ -11,6 +11,7 @@
 use Cms\Classes\Page as CmsPage;
 use Cms\Classes\Router;
 use Cms\Classes\Theme;
+use Cms\Classes\ThemeManager;
 use Cms\Models\ThemeData;
 use Cms\Models\ThemeLog;
 use Cms\Twig\DebugExtension;
@@ -21,14 +22,16 @@
 use Illuminate\Support\Facades\View;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 use System\Classes\CombineAssets;
+use Winter\Storm\Console\Command;
+use Winter\Storm\Foundation\Extension\WinterExtension;
 use System\Classes\MarkupManager;
 use System\Classes\SettingsManager;
 use Twig\Cache\FilesystemCache as TwigCacheFilesystem;
 use Winter\Storm\Support\Facades\Event;
 use Winter\Storm\Support\Facades\Url;
 use Winter\Storm\Support\ModuleServiceProvider;
 
-class ServiceProvider extends ModuleServiceProvider
+class ServiceProvider extends ModuleServiceProvider implements WinterExtension
 {
     /**
      * Register the service provider.
@@ -58,6 +61,17 @@ public function register()
             $this->registerBackendWidgets();
             $this->registerBackendSettings();
         }
+
+        /*
+         * Console specific
+         */
+        if ($this->app->runningInConsole()) {
+            Command::extend(function (Command $command) {
+                $command->bindEvent('beforeRun', function () use ($command) {
+                    ThemeManager::instance()->setOutput($command->getOutput());
+                });
+            });
+        }
     }
 
     /**
@@ -477,4 +491,14 @@ protected function registerHalcyonModels()
             ];
         });
     }
+
+    public function getPath(): string
+    {
+        return __DIR__;
+    }
+
+    public function getIdentifier(): string
+    {
+        return 'Cms';
+    }
 }

modules/cms/classes/ComponentManager.php

@@ -1,9 +1,9 @@
 <?php namespace Cms\Classes;
 
+use Illuminate\Support\Facades\App;
 use Str;
-use System\Classes\PluginManager;
+use System\Classes\Extensions\PluginManager;
 use SystemException;
-use Illuminate\Support\Facades\App;
 
 /**
  * Component manager

modules/cms/classes/Theme.php

@@ -8,18 +8,21 @@
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Lang;
+use Winter\Storm\Foundation\Extension\WinterExtension;
 use System\Models\Parameter;
 use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Exception\SystemException;
 use Winter\Storm\Halcyon\Datasource\DatasourceInterface;
 use Winter\Storm\Halcyon\Datasource\DbDatasource;
 use Winter\Storm\Halcyon\Datasource\FileDatasource;
+use Winter\Storm\Packager\Composer;
 use Winter\Storm\Support\Facades\Config;
 use Winter\Storm\Support\Facades\Event;
 use Winter\Storm\Support\Facades\File;
 use Winter\Storm\Support\Facades\Url;
 use Winter\Storm\Support\Facades\Yaml;
 use Winter\Storm\Support\Str;
+use Winter\Storm\Support\Traits\HasComposerPackage;
 
 /**
  * This class represents the CMS theme.
@@ -29,8 +32,10 @@
  * @package winter\wn-cms-module
  * @author Alexey Bobkov, Samuel Georges
  */
-class Theme extends CmsObject
+class Theme extends CmsObject implements WinterExtension
 {
+    use HasComposerPackage;
+
     /**
      * @var string Specifies the theme directory name.
      */
@@ -73,10 +78,13 @@ public static function load($dirName, $file = null): self
         $theme = new static;
         $theme->setDirName($dirName);
         $theme->registerHalcyonDatasource();
+
         if (App::runningInBackend()) {
             $theme->registerBackendLocalization();
         }
 
+        $theme->setComposerPackage(Composer::getPackageInfoByPath($theme->getPath()));
+
         return $theme;
     }
 
@@ -713,4 +721,14 @@ public function __isset($key)
 
         return false;
     }
+
+    public function getVersion(): string
+    {
+        // TODO: Implement extensionVersion() method.
+    }
+
+    public function getIdentifier(): string
+    {
+        return $this->getId();
+    }
 }