[WIP] Update Manager Refactor

composer.json

@@ -30,7 +30,7 @@
     },
     "require": {
         "php": ">=8.1",
-        "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",
@@ -81,7 +81,8 @@
     "config": {
         "allow-plugins": {
             "composer/installers": true,
-            "wikimedia/composer-merge-plugin": true
+            "wikimedia/composer-merge-plugin": true,
+            "php-http/discovery": false
         }
     }
 }

modules/backend/ServiceProvider.php

@@ -61,11 +61,13 @@ public function boot()
      */
     protected function registerConsole()
     {
-        $this->registerConsoleCommand('create.controller', \Backend\Console\CreateController::class);
-        $this->registerConsoleCommand('create.formwidget', \Backend\Console\CreateFormWidget::class);
-        $this->registerConsoleCommand('create.reportwidget', \Backend\Console\CreateReportWidget::class);
-        $this->registerConsoleCommand('user.create', \Backend\Console\UserCreate::class);
-        $this->registerConsoleCommand('winter.passwd', \Backend\Console\WinterPasswd::class);
+        $this->commands([
+            \Backend\Console\CreateController::class,
+            \Backend\Console\CreateFormWidget::class,
+            \Backend\Console\CreateReportWidget::class,
+            \Backend\Console\UserCreate::class,
+            \Backend\Console\WinterPasswd::class,
+        ]);
     }
 
     /**

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

@@ -120,7 +120,7 @@ public function callAction($method, $parameters)
      * Pass unhandled URLs to the CMS Controller, if it exists
      *
      * @param string $url
-     * @return Response
+     * @return \Illuminate\Http\Response
      */
     protected function passToCmsController($url)
     {

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

@@ -12,7 +12,7 @@
 use Illuminate\Support\Facades\Lang;
 use System\Classes\ImageResizer;
 use System\Classes\MediaLibrary;
-use System\Classes\PluginManager;
+use System\Classes\Extensions\PluginManager;
 use System\Helpers\DateTime as DateTimeHelper;
 use Winter\Storm\Database\Model;
 use Winter\Storm\Exception\ApplicationException;

modules/cms/ServiceProvider.php

@@ -1,7 +1,9 @@
-<?php namespace Cms;
+<?php
+
+namespace Cms;
 
-use Backend;
 use Backend\Classes\WidgetManager;
+use Backend\Facades\Backend;
 use Backend\Facades\BackendAuth;
 use Backend\Facades\BackendMenu;
 use Backend\Models\UserRole;
@@ -11,6 +13,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;
@@ -24,6 +27,7 @@
 use System\Classes\MarkupManager;
 use System\Classes\SettingsManager;
 use Twig\Cache\FilesystemCache as TwigCacheFilesystem;
+use Winter\Storm\Console\Command;
 use Winter\Storm\Support\Facades\Event;
 use Winter\Storm\Support\Facades\Url;
 use Winter\Storm\Support\ModuleServiceProvider;
@@ -58,6 +62,17 @@ public function register()
             $this->registerBackendWidgets();
             $this->registerBackendSettings();
         }
+
+        /*
+         * Console specific
+         */
+        if ($this->app->runningInConsole()) {
+            Command::extend(function (Command $command) {
+                $command->bindEvent('command.beforeRun', function () use ($command) {
+                    ThemeManager::instance()->setOutput($command->getOutput());
+                });
+            });
+        }
     }
 
     /**
@@ -78,14 +93,15 @@ public function boot()
      */
     protected function registerConsole()
     {
-        $this->registerConsoleCommand('create.component', \Cms\Console\CreateComponent::class);
-        $this->registerConsoleCommand('create.theme', \Cms\Console\CreateTheme::class);
-
-        $this->registerConsoleCommand('theme.install', \Cms\Console\ThemeInstall::class);
-        $this->registerConsoleCommand('theme.remove', \Cms\Console\ThemeRemove::class);
-        $this->registerConsoleCommand('theme.list', \Cms\Console\ThemeList::class);
-        $this->registerConsoleCommand('theme.use', \Cms\Console\ThemeUse::class);
-        $this->registerConsoleCommand('theme.sync', \Cms\Console\ThemeSync::class);
+        $this->commands([
+            \Cms\Console\CreateComponent::class,
+            \Cms\Console\CreateTheme::class,
+            \Cms\Console\ThemeInstall::class,
+            \Cms\Console\ThemeRemove::class,
+            \Cms\Console\ThemeList::class,
+            \Cms\Console\ThemeUse::class,
+            \Cms\Console\ThemeSync::class,
+        ]);
     }
 
     /**

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,6 +8,8 @@
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Lang;
+use System\Classes\Extensions\Traits\HasVersionFile;
+use Winter\Storm\Foundation\Extension\WinterExtension;
 use System\Models\Parameter;
 use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Exception\SystemException;
@@ -19,7 +21,7 @@
 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 +31,11 @@
  * @package winter\wn-cms-module
  * @author Alexey Bobkov, Samuel Georges
  */
-class Theme extends CmsObject
+class Theme extends CmsObject implements WinterExtension
 {
+    use HasComposerPackage;
+    use HasVersionFile;
+
     /**
      * @var string Specifies the theme directory name.
      */
@@ -61,6 +66,11 @@ class Theme extends CmsObject
      */
     protected $defaultExtension = 'yaml';
 
+    /**
+     * @var string The version of this theme as reported by version.yaml, access with getVersion()
+     */
+    protected $version;
+
     const ACTIVE_KEY = 'cms::theme.active';
     const EDIT_KEY = 'cms::theme.edit';
 
@@ -73,6 +83,7 @@ public static function load($dirName, $file = null): self
         $theme = new static;
         $theme->setDirName($dirName);
         $theme->registerHalcyonDatasource();
+
         if (App::runningInBackend()) {
             $theme->registerBackendLocalization();
         }
@@ -713,4 +724,26 @@ public function __isset($key)
 
         return false;
     }
+
+    public function getVersion(): string
+    {
+        if (isset($this->version)) {
+            return $this->version;
+        }
+
+        $versions = $this->getVersionsFromYaml(
+            versionFile: $this->getPath() . DIRECTORY_SEPARATOR . 'version.yaml',
+            includeScripts: false
+        );
+        if (empty($versions)) {
+            return $this->version = '0';
+        }
+
+        return $this->version = trim(key(array_slice($versions, -1, 1)));
+    }
+
+    public function getIdentifier(): string
+    {
+        return $this->getId();
+    }
 }