From b92adbe3313ce4c7e44825c66f121f3a146605ea Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Mon, 29 Jul 2024 22:03:13 -0600
Subject: [PATCH 01/13] Added initial type hinting and better imports for
 update managing classes

---
 modules/system/classes/UpdateManager.php | 285 ++++++++---------------
 modules/system/controllers/Updates.php   | 125 +++++-----
 modules/system/models/PluginVersion.php  |   8 +-
 3 files changed, 170 insertions(+), 248 deletions(-)

diff --git a/modules/system/classes/UpdateManager.php b/modules/system/classes/UpdateManager.php
index 8a9569558c..aed24fa2b3 100644
--- a/modules/system/classes/UpdateManager.php
+++ b/modules/system/classes/UpdateManager.php
@@ -1,23 +1,29 @@
-<?php namespace System\Classes;
-
-use App;
-use Url;
-use File;
-use Lang;
-use Http;
-use Cache;
-use Schema;
-use Config;
-use Exception;
-use ApplicationException;
+<?php
+
+namespace System\Classes;
+
+use Carbon\Carbon;
 use Cms\Classes\ThemeManager;
+use Exception;
+use Illuminate\Console\OutputStyle;
+use Illuminate\Console\View\Components\Error;
+use Illuminate\Console\View\Components\Info;
+use Illuminate\Database\Migrations\DatabaseMigrationRepository;
+use Illuminate\Database\Migrations\Migrator;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Lang;
+use System\Helpers\Cache as CacheHelper;
 use System\Models\Parameter;
 use System\Models\PluginVersion;
-use System\Helpers\Cache as CacheHelper;
+use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Filesystem\Zip;
-use Carbon\Carbon;
-use Illuminate\Console\View\Components\Error;
-use Illuminate\Console\View\Components\Info;
+use Winter\Storm\Network\Http as NetworkHttp;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Facades\Http;
+use Winter\Storm\Support\Facades\Schema;
+use Winter\Storm\Support\Facades\Url;
 
 /**
  * Update manager
@@ -31,70 +37,46 @@ class UpdateManager
 {
     use \Winter\Storm\Support\Traits\Singleton;
 
-    /**
-     * @var \Illuminate\Console\OutputStyle
-     */
-    protected $notesOutput;
+    protected ?OutputStyle $notesOutput = null;
 
-    /**
-     * @var string Application base path.
-     */
-    protected $baseDirectory;
+    protected string $baseDirectory;
 
-    /**
-     * @var string A temporary working directory.
-     */
-    protected $tempDirectory;
+    protected string $tempDirectory;
 
-    /**
-     * @var \System\Classes\PluginManager
-     */
-    protected $pluginManager;
+    protected PluginManager $pluginManager;
 
-    /**
-     * @var \Cms\Classes\ThemeManager
-     */
-    protected $themeManager;
+    protected ThemeManager $themeManager;
 
-    /**
-     * @var \System\Classes\VersionManager
-     */
-    protected $versionManager;
+    protected VersionManager $versionManager;
 
     /**
-     * @var string Secure API Key
+     * Secure API Key
      */
-    protected $key;
+    protected ?string $key = null;
 
     /**
-     * @var string Secure API Secret
+     * Secure API Secret
      */
-    protected $secret;
+    protected ?string $secret = null;
 
     /**
-     * @var boolean If set to true, core updates will not be downloaded or extracted.
+     * If set to true, core updates will not be downloaded or extracted.
      */
-    protected $disableCoreUpdates = false;
+    protected bool $disableCoreUpdates = false;
 
     /**
-     * @var array Cache of gateway products
+     * Cache of gateway products
      */
-    protected $productCache;
+    protected array $productCache;
 
-    /**
-     * @var \Illuminate\Database\Migrations\Migrator
-     */
-    protected $migrator;
+    protected Migrator $migrator;
 
-    /**
-     * @var \Illuminate\Database\Migrations\DatabaseMigrationRepository
-     */
-    protected $repository;
+    protected DatabaseMigrationRepository $repository;
 
     /**
-     * @var array An array of messages returned by migrations / seeders. Returned at the end of the update process.
+     * Array of messages returned by migrations / seeders. Returned at the end of the update process.
      */
-    protected $messages = [];
+    protected array $messages = [];
 
     /**
      * Initialize this singleton.
@@ -130,9 +112,8 @@ public function bindContainerObjects()
 
     /**
      * Creates the migration table and updates
-     * @return self
      */
-    public function update()
+    public function update(): static
     {
         try {
             $firstUp = !Schema::hasTable($this->getMigrationTableName());
@@ -212,10 +193,9 @@ public function update()
     /**
      * Checks for new updates and returns the amount of unapplied updates.
      * Only requests from the server at a set interval (retry timer).
-     * @param boolean $force Ignore the retry timer.
-     * @return int            Number of unapplied updates.
+     * @param $force Ignore the retry timer.
      */
-    public function check($force = false)
+    public function check(bool $force = false): int
     {
         /*
          * Already know about updates, never retry.
@@ -253,10 +233,9 @@ public function check($force = false)
 
     /**
      * Requests an update list used for checking for new updates.
-     * @param boolean $force Request application and plugins hash list regardless of version.
-     * @return array
+     * @param $force Request application and plugins hash list regardless of version.
      */
-    public function requestUpdateList($force = false)
+    public function requestUpdateList(bool $force = false): array
     {
         $installed = PluginVersion::all();
         $versions = $installed->lists('version', 'code');
@@ -349,19 +328,16 @@ public function requestUpdateList($force = false)
 
     /**
      * Requests details about a project based on its identifier.
-     * @param string $projectId
-     * @return array
      */
-    public function requestProjectDetails($projectId)
+    public function requestProjectDetails(string $projectId): array
     {
         return $this->requestServerData('project/detail', ['id' => $projectId]);
     }
 
     /**
      * Roll back all modules and plugins.
-     * @return self
      */
-    public function uninstall()
+    public function uninstall(): static
     {
         /*
          * Rollback plugins
@@ -411,10 +387,9 @@ public function uninstall()
      *                  to the code = less confidence.
      *  - `changes`: If $detailed is true, this will include the list of files modified, created and deleted.
      *
-     * @param bool $detailed If true, the list of files modified, added and deleted will be included in the result.
-     * @return array
+     * @param $detailed If true, the list of files modified, added and deleted will be included in the result.
      */
-    public function getBuildNumberManually($detailed = false)
+    public function getBuildNumberManually(bool $detailed = false): array
     {
         $source = new SourceManifest();
         $manifest = new FileManifest(null, null, true);
@@ -426,10 +401,9 @@ public function getBuildNumberManually($detailed = false)
     /**
      * Sets the build number in the database.
      *
-     * @param bool $detailed If true, the list of files modified, added and deleted will be included in the result.
-     * @return void
+     * @param $detailed If true, the list of files modified, added and deleted will be included in the result.
      */
-    public function setBuildNumberManually($detailed = false)
+    public function setBuildNumberManually(bool $detailed = false): array
     {
         $build = $this->getBuildNumberManually($detailed);
 
@@ -446,19 +420,16 @@ public function setBuildNumberManually($detailed = false)
 
     /**
      * Returns the currently installed system hash.
-     * @return string
      */
-    public function getHash()
+    public function getHash(): string
     {
         return Parameter::get('system::core.hash', md5('NULL'));
     }
 
     /**
      * Run migrations on a single module
-     * @param string $module Module name
-     * @return self
      */
-    public function migrateModule($module)
+    public function migrateModule(string $module): static
     {
         if (isset($this->notesOutput)) {
             $this->migrator->setOutput($this->notesOutput);
@@ -475,14 +446,12 @@ public function migrateModule($module)
 
     /**
      * Run seeds on a module
-     * @param string $module Module name
-     * @return self
      */
-    public function seedModule($module)
+    public function seedModule(string $module): static
     {
         $className = '\\' . $module . '\Database\Seeds\DatabaseSeeder';
         if (!class_exists($className)) {
-            return;
+            return $this;
         }
 
         $this->out('', true);
@@ -503,19 +472,17 @@ public function seedModule($module)
 
     /**
      * Downloads the core from the update server.
-     * @param string $hash Expected file hash.
-     * @return void
+     * @param $hash Expected file hash.
      */
-    public function downloadCore($hash)
+    public function downloadCore(string $hash): void
     {
         $this->requestServerFile('core/get', 'core', $hash, ['type' => 'update']);
     }
 
     /**
      * Extracts the core after it has been downloaded.
-     * @return void
      */
-    public function extractCore()
+    public function extractCore(): void
     {
         $filePath = $this->getFilePath('core');
 
@@ -528,12 +495,8 @@ public function extractCore()
 
     /**
      * Sets the build number and hash
-     * @param string $hash
-     * @param string $build
-     * @param bool $modified
-     * @return void
      */
-    public function setBuild($build, $hash = null, $modified = false)
+    public function setBuild(string $build, ?string $hash = null, bool $modified = false): void
     {
         $params = [
             'system::core.build' => $build,
@@ -553,37 +516,31 @@ public function setBuild($build, $hash = null, $modified = false)
 
     /**
      * Looks up a plugin from the update server.
-     * @param string $name Plugin name.
-     * @return array Details about the plugin.
      */
-    public function requestPluginDetails($name)
+    public function requestPluginDetails(string $name): array
     {
         return $this->requestServerData('plugin/detail', ['name' => $name]);
     }
 
     /**
      * Looks up content for a plugin from the update server.
-     * @param string $name Plugin name.
-     * @return array Content for the plugin.
      */
-    public function requestPluginContent($name)
+    public function requestPluginContent(string $name): array
     {
         return $this->requestServerData('plugin/content', ['name' => $name]);
     }
 
     /**
      * Runs update on a single plugin
-     * @param string $name Plugin name.
-     * @return self
      */
-    public function updatePlugin($name)
+    public function updatePlugin(string $name): static
     {
         /*
          * Update the plugin database and version
          */
         if (!($plugin = $this->pluginManager->findByIdentifier($name))) {
             $this->write(Error::class, sprintf('Unable to find plugin %s', $name));
-            return;
+            return $this;
         }
 
         $this->out(sprintf('<info>Migrating %s (%s) plugin...</info>', Lang::get($plugin->pluginDetails()['name']), $name));
@@ -599,11 +556,9 @@ public function updatePlugin($name)
     /**
      * Rollback an existing plugin
      *
-     * @param string $name Plugin name.
-     * @param string $stopOnVersion If this parameter is specified, the process stops once the provided version number is reached
-     * @return self
+     * @param $stopOnVersion If this parameter is specified, the process stops once the provided version number is reached
      */
-    public function rollbackPlugin(string $name, string $stopOnVersion = null)
+    public function rollbackPlugin(string $name, string $stopOnVersion = null): static
     {
         /*
          * Remove the plugin database and version
@@ -640,24 +595,22 @@ public function rollbackPlugin(string $name, string $stopOnVersion = null)
 
     /**
      * Downloads a plugin from the update server.
-     * @param string $name Plugin name.
-     * @param string $hash Expected file hash.
-     * @param boolean $installation Indicates whether this is a plugin installation request.
-     * @return self
+     * @param $installation Indicates whether this is a plugin installation request.
      */
-    public function downloadPlugin($name, $hash, $installation = false)
+    public function downloadPlugin(string $name, string $hash, bool $installation = false): static
     {
         $fileCode = $name . $hash;
         $this->requestServerFile('plugin/get', $fileCode, $hash, [
             'name'         => $name,
             'installation' => $installation ? 1 : 0
         ]);
+        return $this;
     }
 
     /**
      * Extracts a plugin after it has been downloaded.
      */
-    public function extractPlugin($name, $hash)
+    public function extractPlugin(string $name, string $hash): void
     {
         $fileCode = $name . $hash;
         $filePath = $this->getFilePath($fileCode);
@@ -675,31 +628,26 @@ public function extractPlugin($name, $hash)
 
     /**
      * Looks up a theme from the update server.
-     * @param string $name Theme name.
-     * @return array Details about the theme.
      */
-    public function requestThemeDetails($name)
+    public function requestThemeDetails(string $name): array
     {
         return $this->requestServerData('theme/detail', ['name' => $name]);
     }
 
     /**
      * Downloads a theme from the update server.
-     * @param string $name Theme name.
-     * @param string $hash Expected file hash.
-     * @return self
      */
-    public function downloadTheme($name, $hash)
+    public function downloadTheme(string $name, string $hash): static
     {
         $fileCode = $name . $hash;
-
         $this->requestServerFile('theme/get', $fileCode, $hash, ['name' => $name]);
+        return $this;
     }
 
     /**
      * Extracts a theme after it has been downloaded.
      */
-    public function extractTheme($name, $hash)
+    public function extractTheme(string $name, string $hash): void
     {
         $fileCode = $name . $hash;
         $filePath = $this->getFilePath($fileCode);
@@ -719,7 +667,7 @@ public function extractTheme($name, $hash)
     // Products
     //
 
-    public function requestProductDetails($codes, $type = null)
+    public function requestProductDetails($codes, $type = null): array
     {
         if ($type != 'plugin' && $type != 'theme') {
             $type = 'plugin';
@@ -771,7 +719,7 @@ public function requestProductDetails($codes, $type = null)
     /**
      * Returns popular themes found on the marketplace.
      */
-    public function requestPopularProducts($type = null)
+    public function requestPopularProducts(string $type = null): array
     {
         if ($type != 'plugin' && $type != 'theme') {
             $type = 'plugin';
@@ -797,7 +745,7 @@ public function requestPopularProducts($type = null)
         return $data;
     }
 
-    protected function loadProductDetailCache()
+    protected function loadProductDetailCache(): void
     {
         $defaultCache = ['theme' => [], 'plugin' => []];
         $cacheKey = 'system-updates-product-details';
@@ -809,7 +757,7 @@ protected function loadProductDetailCache()
         }
     }
 
-    protected function saveProductDetailCache()
+    protected function saveProductDetailCache(): void
     {
         if ($this->productCache === null) {
             $this->loadProductDetailCache();
@@ -820,7 +768,7 @@ protected function saveProductDetailCache()
         Cache::put($cacheKey, base64_encode(serialize($this->productCache)), $expiresAt);
     }
 
-    protected function cacheProductDetail($type, $code, $data)
+    protected function cacheProductDetail(string $type, string $code, array|int $data): void
     {
         if ($this->productCache === null) {
             $this->loadProductDetailCache();
@@ -836,7 +784,7 @@ protected function cacheProductDetail($type, $code, $data)
     /**
      * Returns the latest changelog information.
      */
-    public function requestChangelog()
+    public function requestChangelog(): array
     {
         $build = Parameter::get('system::core.build');
 
@@ -876,12 +824,9 @@ public function requestChangelog()
 
     /**
      * Writes output to the console using a Laravel CLI View component.
-     *
-     * @param \Illuminate\Console\View\Components\Component $component
-     * @param array $arguments
-     * @return static
+     * @param $component Class extending \Illuminate\Console\View\Components\Component to be used to render the message
      */
-    protected function write($component, ...$arguments)
+    protected function write(string $component, ...$arguments): static
     {
         if ($this->notesOutput !== null) {
             with(new $component($this->notesOutput))->render(...$arguments);
@@ -892,12 +837,8 @@ protected function write($component, ...$arguments)
 
     /**
      * Writes output to the console.
-     *
-     * @param string $message
-     * @param bool $newline
-     * @return static
      */
-    protected function out($message, $newline = false)
+    protected function out(string $message, bool $newline = false): static
     {
         if ($this->notesOutput !== null) {
             $this->notesOutput->write($message, $newline);
@@ -908,10 +849,8 @@ protected function out($message, $newline = false)
 
     /**
      * Sets an output stream for writing notes.
-     * @param Illuminate\Console\Command $output
-     * @return self
      */
-    public function setNotesOutput($output)
+    public function setNotesOutput(OutputStyle $output): static
     {
         $this->notesOutput = $output;
 
@@ -924,11 +863,8 @@ public function setNotesOutput($output)
 
     /**
      * Contacts the update server for a response.
-     * @param string $uri Gateway API URI
-     * @param array $postData Extra post data
-     * @return array
      */
-    public function requestServerData($uri, $postData = [])
+    public function requestServerData(string $uri, array $postData = []): array
     {
         $result = Http::post($this->createServerUrl($uri), function ($http) use ($postData) {
             $this->applyHttpAttributes($http, $postData);
@@ -963,18 +899,21 @@ public function requestServerData($uri, $postData = [])
             throw new ApplicationException(Lang::get('system::lang.server.response_invalid'));
         }
 
+        if (!is_array($resultData)) {
+            throw new ApplicationException(Lang::get('system::lang.server.response_invalid'));
+        }
+
         return $resultData;
     }
 
     /**
      * Downloads a file from the update server.
-     * @param string $uri Gateway API URI
-     * @param string $fileCode A unique code for saving the file.
-     * @param string $expectedHash The expected file hash of the file.
-     * @param array $postData Extra post data
-     * @return void
+     * @param $uri Gateway API URI
+     * @param $fileCode A unique code for saving the file.
+     * @param $expectedHash The expected file hash of the file.
+     * @param $postData Extra post data
      */
-    public function requestServerFile($uri, $fileCode, $expectedHash, $postData = [])
+    public function requestServerFile(string $uri, string $fileCode, string $expectedHash, array $postData = []): void
     {
         $filePath = $this->getFilePath($fileCode);
 
@@ -995,10 +934,8 @@ public function requestServerFile($uri, $fileCode, $expectedHash, $postData = []
 
     /**
      * Calculates a file path for a file code
-     * @param string $fileCode A unique file code
-     * @return string           Full path on the disk
      */
-    protected function getFilePath($fileCode)
+    protected function getFilePath(string $fileCode): string
     {
         $name = md5($fileCode) . '.arc';
         return $this->tempDirectory . '/' . $name;
@@ -1006,10 +943,8 @@ protected function getFilePath($fileCode)
 
     /**
      * Set the API security for all transmissions.
-     * @param string $key API Key
-     * @param string $secret API Secret
      */
-    public function setSecurity($key, $secret)
+    public function setSecurity(string $key, string $secret): void
     {
         $this->key = $key;
         $this->secret = $secret;
@@ -1017,10 +952,8 @@ public function setSecurity($key, $secret)
 
     /**
      * Create a complete gateway server URL from supplied URI
-     * @param string $uri URI
-     * @return string      URL
      */
-    protected function createServerUrl($uri)
+    protected function createServerUrl(string $uri): string
     {
         $gateway = Config::get('cms.updateServer', 'https://api.wintercms.com/marketplace');
         if (substr($gateway, -1) != '/') {
@@ -1032,11 +965,8 @@ protected function createServerUrl($uri)
 
     /**
      * Modifies the Network HTTP object with common attributes.
-     * @param Http $http Network object
-     * @param array $postData Post data
-     * @return void
      */
-    protected function applyHttpAttributes($http, $postData)
+    protected function applyHttpAttributes(NetworkHttp $http, array $postData): void
     {
         $postData['protocol_version'] = '1.1';
         $postData['client'] = 'october';
@@ -1071,9 +1001,8 @@ protected function applyHttpAttributes($http, $postData)
 
     /**
      * Create a nonce based on millisecond time
-     * @return int
      */
-    protected function createNonce()
+    protected function createNonce(): int
     {
         $mt = explode(' ', microtime());
         return $mt[1] . substr($mt[0], 2, 6);
@@ -1081,29 +1010,21 @@ protected function createNonce()
 
     /**
      * Create a unique signature for transmission.
-     * @return string
      */
-    protected function createSignature($data, $secret)
+    protected function createSignature(array $data, string $secret): string
     {
         return base64_encode(hash_hmac('sha512', http_build_query($data, '', '&'), base64_decode($secret), true));
     }
 
-    /**
-     * @return string
-     */
-    public function getMigrationTableName()
+    public function getMigrationTableName(): string
     {
         return Config::get('database.migrations', 'migrations');
     }
 
     /**
      * Adds a message from a specific migration or seeder.
-     *
-     * @param string|object $class
-     * @param string|array $message
-     * @return void
      */
-    protected function addMessage($class, $message)
+    protected function addMessage(string|object $class, string|array $message): void
     {
         if (empty($message)) {
             return;
@@ -1125,10 +1046,8 @@ protected function addMessage($class, $message)
 
     /**
      * Prints collated messages from the migrations and seeders
-     *
-     * @return void
      */
-    protected function printMessages()
+    protected function printMessages(): void
     {
         if (!count($this->messages)) {
             return;
diff --git a/modules/system/controllers/Updates.php b/modules/system/controllers/Updates.php
index f27e1e4f5d..bd79ce0265 100644
--- a/modules/system/controllers/Updates.php
+++ b/modules/system/controllers/Updates.php
@@ -1,30 +1,35 @@
-<?php namespace System\Controllers;
+<?php
+
+namespace System\Controllers;
 
-use ApplicationException;
-use Backend;
 use Backend\Classes\Controller;
-use BackendMenu;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendMenu;
+use Backend\Widgets\Form;
 use Cms\Classes\ThemeManager;
 use Exception;
-use File;
-use Flash;
-use Html;
-use Lang;
-use Markdown;
-use Redirect;
-use Response;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Response as HttpResponse;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Response;
 use System\Classes\PluginManager;
 use System\Classes\SettingsManager;
 use System\Classes\UpdateManager;
 use System\Models\Parameter;
 use System\Models\PluginVersion;
+use Winter\Storm\Database\Model;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Facades\Flash;
+use Winter\Storm\Support\Facades\Html;
+use Winter\Storm\Support\Facades\Markdown;
 
 /**
  * Updates controller
  *
  * @package winter\wn-system-module
  * @author Alexey Bobkov, Samuel Georges
- *
  */
 class Updates extends Controller
 {
@@ -71,7 +76,7 @@ public function __construct()
     /**
      * Index controller
      */
-    public function index()
+    public function index(): void
     {
         $this->vars['coreBuild'] = Parameter::get('system::core.build');
         $this->vars['coreBuildModified'] = Parameter::get('system::core.modified', false);
@@ -80,23 +85,23 @@ public function index()
         $this->vars['projectOwner'] = Parameter::get('system::project.owner');
         $this->vars['pluginsActiveCount'] = PluginVersion::applyEnabled()->count();
         $this->vars['pluginsCount'] = PluginVersion::count();
-        return $this->asExtension('ListController')->index();
+        $this->asExtension('ListController')->index();
     }
 
     /**
      * Plugin manage controller
      */
-    public function manage()
+    public function manage(): void
     {
         $this->pageTitle = 'system::lang.plugins.manage';
         PluginManager::instance()->clearFlagCache();
-        return $this->asExtension('ListController')->index();
+        $this->asExtension('ListController')->index();
     }
 
     /**
      * Install new plugins / themes
      */
-    public function install($tab = null)
+    public function install($tab = null): ?HttpResponse
     {
         if (get('search')) {
             return Response::make($this->onSearchProducts());
@@ -116,9 +121,11 @@ public function install($tab = null)
         catch (Exception $ex) {
             $this->handleError($ex);
         }
+
+        return null;
     }
 
-    public function details($urlCode = null, $tab = null)
+    public function details($urlCode = null, $tab = null): void
     {
         try {
             $this->pageTitle = 'system::lang.updates.details_title';
@@ -178,15 +185,15 @@ public function details($urlCode = null, $tab = null)
         }
     }
 
-    protected function getPluginMarkdownFile($path, $filenames)
+    protected function getPluginMarkdownFile(string $path, array $filenames): ?string
     {
         $contents = null;
         foreach ($filenames as $file) {
-            if (!File::exists($path . '/'.$file)) {
+            if (!File::exists($path . '/' . $file)) {
                 continue;
             }
 
-            $contents = File::get($path . '/'.$file);
+            $contents = File::get($path . '/' . $file);
 
             /*
              * Parse markdown, clean HTML, remove first H1 tag
@@ -199,7 +206,7 @@ protected function getPluginMarkdownFile($path, $filenames)
         return $contents;
     }
 
-    protected function getWarnings()
+    protected function getWarnings(): array
     {
         $warnings = [];
         $missingDependencies = PluginManager::instance()->findMissingDependencies();
@@ -242,9 +249,8 @@ protected function getWarnings()
      * - positive - Default CSS class
      *
      * @see Backend\Behaviors\ListController
-     * @return string
      */
-    public function listInjectRowClass($record, $definition = null)
+    public function listInjectRowClass($record, $definition = null): string
     {
         if ($record->disabledByConfig) {
             return 'hidden';
@@ -255,7 +261,7 @@ public function listInjectRowClass($record, $definition = null)
         }
 
         if ($definition != 'manage') {
-            return;
+            return '';
         }
 
         if ($record->disabledBySystem) {
@@ -272,7 +278,7 @@ public function listInjectRowClass($record, $definition = null)
     /**
      * Runs a specific update step.
      */
-    public function onExecuteStep()
+    public function onExecuteStep(): ?RedirectResponse
     {
         /*
          * Address timeout limits
@@ -321,6 +327,8 @@ public function onExecuteStep()
                 Flash::success(Lang::get('system::lang.install.install_success'));
                 return Redirect::refresh();
         }
+
+        return null;
     }
 
     //
@@ -330,7 +338,7 @@ public function onExecuteStep()
     /**
      * Spawns the update checker popup.
      */
-    public function onLoadUpdates()
+    public function onLoadUpdates(): string
     {
         return $this->makePartial('update_form');
     }
@@ -338,7 +346,7 @@ public function onLoadUpdates()
     /**
      * Contacts the update server for a list of necessary updates.
      */
-    public function onCheckForUpdates()
+    public function onCheckForUpdates(): array
     {
         try {
             $manager = UpdateManager::instance();
@@ -362,10 +370,8 @@ public function onCheckForUpdates()
 
     /**
      * Loops the update list and checks for actionable updates.
-     * @param array  $result
-     * @return array
      */
-    protected function processImportantUpdates($result)
+    protected function processImportantUpdates(array $result): array
     {
         $hasImportantUpdates = false;
 
@@ -416,10 +422,8 @@ protected function processImportantUpdates($result)
 
     /**
      * Reverses the update lists for the core and all plugins.
-     * @param array  $result
-     * @return array
      */
-    protected function processUpdateLists($result)
+    protected function processUpdateLists(array $result): array
     {
         if ($core = array_get($result, 'core')) {
             $result['core']['updates'] = array_reverse(array_get($core, 'updates', []), true);
@@ -435,10 +439,9 @@ protected function processUpdateLists($result)
     /**
      * Contacts the update server for a list of necessary updates.
      *
-     * @param bool $force Whether or not to force the redownload of existing tools
-     * @return string The rendered "execute" partial
+     * @param $force Whether or not to force the redownload of existing tools
      */
-    public function onForceUpdate($force = true)
+    public function onForceUpdate(bool $force = true): string
     {
         try {
             $manager = UpdateManager::instance();
@@ -485,7 +488,7 @@ public function onForceUpdate($force = true)
     /**
      * Converts the update data to an actionable array of steps.
      */
-    public function onApplyUpdates()
+    public function onApplyUpdates(): string
     {
         try {
             /*
@@ -577,7 +580,7 @@ public function onApplyUpdates()
         return $this->makePartial('execute');
     }
 
-    protected function buildUpdateSteps($core, $plugins, $themes, $isInstallationRequest)
+    protected function buildUpdateSteps($core, $plugins, $themes, $isInstallationRequest): array
     {
         if (!is_array($core)) {
             $core = [null, null];
@@ -669,7 +672,7 @@ protected function buildUpdateSteps($core, $plugins, $themes, $isInstallationReq
     /**
      * Displays the form for entering a Project ID
      */
-    public function onLoadProjectForm()
+    public function onLoadProjectForm(): string
     {
         return $this->makePartial('project_form');
     }
@@ -677,7 +680,7 @@ public function onLoadProjectForm()
     /**
      * Validate the project ID and execute the project installation
      */
-    public function onAttachProject()
+    public function onAttachProject(): string
     {
         try {
             if (!$projectId = trim(post('project_id'))) {
@@ -701,7 +704,7 @@ public function onAttachProject()
         }
     }
 
-    public function onDetachProject()
+    public function onDetachProject(): RedirectResponse
     {
         Parameter::set([
             'system::project.id'    => null,
@@ -719,8 +722,10 @@ public function onDetachProject()
 
     /**
      * Displays changelog information
+     *
+     * @throws ApplicationException if the changelog could not be fetched from the server
      */
-    public function onLoadChangelog()
+    public function onLoadChangelog(): string
     {
         try {
             $fetchedContent = UpdateManager::instance()->requestChangelog();
@@ -746,8 +751,10 @@ public function onLoadChangelog()
 
     /**
      * Validate the plugin code and execute the plugin installation
+     *
+     * @throws ApplicationException If validation fails or the plugin cannot be installed
      */
-    public function onInstallPlugin()
+    public function onInstallPlugin(): string
     {
         try {
             if (!$code = trim(post('code'))) {
@@ -791,9 +798,8 @@ public function onInstallPlugin()
 
     /**
      * Rollback and remove a single plugin from the system.
-     * @return void
      */
-    public function onRemovePlugin()
+    public function onRemovePlugin(): RedirectResponse
     {
         if ($pluginCode = post('code')) {
             PluginManager::instance()->deletePlugin($pluginCode);
@@ -805,9 +811,8 @@ public function onRemovePlugin()
 
     /**
      * Perform a bulk action on the provided plugins
-     * @return void
      */
-    public function onBulkAction()
+    public function onBulkAction(): RedirectResponse
     {
         if (($bulkAction = post('action')) &&
             ($checkedIds = post('checked')) &&
@@ -912,9 +917,8 @@ public function onInstallTheme()
 
     /**
      * Deletes a single theme from the system.
-     * @return void
      */
-    public function onRemoveTheme()
+    public function onRemoveTheme(): RedirectResponse
     {
         if ($themeCode = post('code')) {
             ThemeManager::instance()->deleteTheme($themeCode);
@@ -929,7 +933,7 @@ public function onRemoveTheme()
     // Product install
     //
 
-    public function onSearchProducts()
+    public function onSearchProducts(): array
     {
         $searchType = get('search', 'plugins');
         $serverUri = $searchType == 'plugins' ? 'plugin/search' : 'theme/search';
@@ -938,7 +942,7 @@ public function onSearchProducts()
         return $manager->requestServerData($serverUri, ['query' => get('query')]);
     }
 
-    public function onGetPopularPlugins()
+    public function onGetPopularPlugins(): array
     {
         $installed = $this->getInstalledPlugins();
         $popular = UpdateManager::instance()->requestPopularProducts('plugin');
@@ -947,7 +951,7 @@ public function onGetPopularPlugins()
         return ['result' => $popular];
     }
 
-    public function onGetPopularThemes()
+    public function onGetPopularThemes(): array
     {
         $installed = $this->getInstalledThemes();
         $popular = UpdateManager::instance()->requestPopularProducts('theme');
@@ -956,14 +960,14 @@ public function onGetPopularThemes()
         return ['result' => $popular];
     }
 
-    protected function getInstalledPlugins()
+    protected function getInstalledPlugins(): array
     {
         $installed = PluginVersion::lists('code');
         $manager = UpdateManager::instance();
         return $manager->requestProductDetails($installed, 'plugin');
     }
 
-    protected function getInstalledThemes()
+    protected function getInstalledThemes(): array
     {
         $history = Parameter::get('system::theme.history', []);
         $manager = UpdateManager::instance();
@@ -983,7 +987,7 @@ protected function getInstalledThemes()
     /*
      * Remove installed products from the collection
      */
-    protected function filterPopularProducts($popular, $installed)
+    protected function filterPopularProducts($popular, $installed): array
     {
         $installedArray = [];
         foreach ($installed as $product) {
@@ -1007,7 +1011,7 @@ protected function filterPopularProducts($popular, $installed)
     /**
      * Encode HTML safe product code, this is to prevent issues with array_get().
      */
-    protected function encodeCode($code)
+    protected function encodeCode(string $code): string
     {
         return str_replace('.', ':', $code);
     }
@@ -1015,18 +1019,15 @@ protected function encodeCode($code)
     /**
      * Decode HTML safe product code.
      */
-    protected function decodeCode($code)
+    protected function decodeCode(string $code): string
     {
         return str_replace(':', '.', $code);
     }
 
     /**
      * Adds require plugin codes to the collection based on a result.
-     * @param array $plugins
-     * @param array $result
-     * @return array
      */
-    protected function appendRequiredPlugins(array $plugins, array $result)
+    protected function appendRequiredPlugins(array $plugins, array $result): array
     {
         foreach ((array) array_get($result, 'require') as $plugin) {
             if (
diff --git a/modules/system/models/PluginVersion.php b/modules/system/models/PluginVersion.php
index 14f2155dc8..b862ce2ed8 100644
--- a/modules/system/models/PluginVersion.php
+++ b/modules/system/models/PluginVersion.php
@@ -1,8 +1,10 @@
-<?php namespace System\Models;
+<?php
 
-use Lang;
-use Model;
+namespace System\Models;
+
+use Illuminate\Support\Facades\Lang;
 use System\Classes\PluginManager;
+use Winter\Storm\Database\Model;
 
 /**
  * Stores information about current plugin versions.

From 0aaea478ee435b72206230ecbe25a5fac72a3f8b Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Mon, 29 Jul 2024 22:38:13 -0600
Subject: [PATCH 02/13] Fix tests

---
 .../system/tests/bootstrap/PluginManagerTestCase.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/system/tests/bootstrap/PluginManagerTestCase.php b/modules/system/tests/bootstrap/PluginManagerTestCase.php
index f558705200..f1017b9e43 100644
--- a/modules/system/tests/bootstrap/PluginManagerTestCase.php
+++ b/modules/system/tests/bootstrap/PluginManagerTestCase.php
@@ -2,10 +2,13 @@
 
 namespace System\Tests\Bootstrap;
 
+use Illuminate\Console\OutputStyle;
+use ReflectionClass;
+use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Output\BufferedOutput;
+use System\Classes\PluginManager;
 use System\Classes\UpdateManager;
 use System\Classes\VersionManager;
-use System\Classes\PluginManager;
-use ReflectionClass;
 
 use Winter\Storm\Database\Model as ActiveRecord;
 
@@ -51,7 +54,10 @@ public function setUp() : void
         // Forces plugin migrations to be run again on every test
         VersionManager::forgetInstance();
 
-        $this->output = new \Symfony\Component\Console\Output\BufferedOutput();
+        $this->output = new OutputStyle(
+            new ArrayInput([]),
+            new BufferedOutput()
+        );
 
         parent::setUp();
 

From 00e085f00c7e53e0d86900e9bc534cec9e5e3aad Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Mon, 29 Jul 2024 22:39:33 -0600
Subject: [PATCH 03/13] add missing newline

---
 modules/system/tests/bootstrap/PluginManagerTestCase.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/tests/bootstrap/PluginManagerTestCase.php b/modules/system/tests/bootstrap/PluginManagerTestCase.php
index f1017b9e43..5628c661f8 100644
--- a/modules/system/tests/bootstrap/PluginManagerTestCase.php
+++ b/modules/system/tests/bootstrap/PluginManagerTestCase.php
@@ -120,4 +120,4 @@ protected function flushModelEventListeners()
 
         ActiveRecord::flushEventListeners();
     }
-}
\ No newline at end of file
+}

From 79e1a8ef7e2017bd17c6938d3138d58b257f3ca7 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Tue, 30 Jul 2024 00:21:14 -0600
Subject: [PATCH 04/13] Initial implementation of the UI to upload plugins via
 zip folder

---
 modules/system/controllers/Updates.php        | 80 +++++++++++++++++++
 .../controllers/updates/_install_plugins.php  | 47 +++++++----
 .../updates/_popup_upload_plugin.php          | 18 +++++
 .../updates/form.plugin_upload.yaml           |  6 ++
 modules/system/lang/en/lang.php               |  5 ++
 5 files changed, 140 insertions(+), 16 deletions(-)
 create mode 100644 modules/system/controllers/updates/_popup_upload_plugin.php
 create mode 100644 modules/system/controllers/updates/form.plugin_upload.yaml

diff --git a/modules/system/controllers/Updates.php b/modules/system/controllers/Updates.php
index bd79ce0265..fbb0eeba49 100644
--- a/modules/system/controllers/Updates.php
+++ b/modules/system/controllers/Updates.php
@@ -117,6 +117,7 @@ public function install($tab = null): ?HttpResponse
             $this->vars['activeTab'] = $tab ?: 'plugins';
             $this->vars['installedPlugins'] = $this->getInstalledPlugins();
             $this->vars['installedThemes'] = $this->getInstalledThemes();
+            $this->vars['packageUploadWidget'] = $this->getPackageUploadWidget($tab === 'themes' ? 'theme' : 'plugin');
         }
         catch (Exception $ex) {
             $this->handleError($ex);
@@ -749,6 +750,85 @@ public function onLoadChangelog(): string
     // Plugin management
     //
 
+    protected ?Form $packageUploadWidget = null;
+
+    /**
+     * Get the form widget for the import popup.
+     */
+    protected function getPackageUploadWidget(string $type = 'plugin'): Form
+    {
+        $type = post('type', $type);
+
+        if (!in_array($type, ['plugin', 'theme'])) {
+            throw new ApplicationException('Invalid package type');
+        }
+
+        if ($this->packageUploadWidget !== null) {
+            return $this->packageUploadWidget;
+        }
+
+        $config = $this->makeConfig("form.{$type}_upload.yaml");
+        $config->model = new class extends Model {
+            public $attachOne = [
+                'uploaded_package' => [\System\Models\File::class, 'public' => false],
+            ];
+        };
+        $widget = $this->makeWidget(Form::class, $config);
+        $widget->bindToController();
+
+        return $this->packageUploadWidget = $widget;
+    }
+
+    /**
+     * Displays the plugin uploader form
+     */
+    public function onLoadPluginUploader(): string
+    {
+        $this->vars['packageUploadWidget'] = $this->getPackageUploadWidget('plugin');
+        return $this->makePartial('popup_upload_plugin');
+    }
+
+    /**
+     * Installs an uploaded plugin
+     */
+    public function onInstallUploadedPlugin(): string
+    {
+        try {
+            $manager = UpdateManager::instance();
+            $result = $manager->installUploadedPlugin();
+
+            if (!isset($result['code']) || !isset($result['hash'])) {
+                throw new ApplicationException(Lang::get('system::lang.server.response_invalid'));
+            }
+
+            $name = $result['code'];
+            $hash = $result['hash'];
+            $plugins = [$name => $hash];
+            $plugins = $this->appendRequiredPlugins($plugins, $result);
+
+            /*
+             * Update steps
+             */
+            $updateSteps = $this->buildUpdateSteps(null, $plugins, [], true);
+
+            /*
+             * Finish up
+             */
+            $updateSteps[] = [
+                'code'  => 'completeInstall',
+                'label' => Lang::get('system::lang.install.install_completing'),
+            ];
+
+            $this->vars['updateSteps'] = $updateSteps;
+
+            return $this->makePartial('execute');
+        }
+        catch (Exception $ex) {
+            $this->handleError($ex);
+            return $this->makePartial('plugin_uploader');
+        }
+    }
+
     /**
      * Validate the plugin code and execute the plugin installation
      *
diff --git a/modules/system/controllers/updates/_install_plugins.php b/modules/system/controllers/updates/_install_plugins.php
index 461ff78d3f..427f1ff002 100644
--- a/modules/system/controllers/updates/_install_plugins.php
+++ b/modules/system/controllers/updates/_install_plugins.php
@@ -1,23 +1,38 @@
 <div>
 
     <!-- Search -->
-    <form
-        role="form"
-        id="installPluginsForm"
-        data-handler="onInstallPlugin"
-        onsubmit="$.wn.installProcess.searchSubmit(this); return false">
-        <div class="product-search">
-            <input
-                name="code"
-                id="pluginSearchInput"
-                class="product-search-input search-input-lg typeahead"
-                placeholder="<?= e(trans('system::lang.plugins.search')) ?>"
-                data-search-type="plugins"
-                />
-            <i class="icon icon-search"></i>
-            <i class="icon loading" style="display: none"></i>
+    <div class="row">
+        <div class="col-md-9">
+            <form
+                role="form"
+                id="installPluginsForm"
+                data-handler="onInstallPlugin"
+                onsubmit="$.wn.installProcess.searchSubmit(this); return false">
+                <div class="product-search">
+                    <input
+                        name="code"
+                        id="pluginSearchInput"
+                        class="product-search-input search-input-lg typeahead"
+                        placeholder="<?= e(trans('system::lang.plugins.search')) ?>"
+                        data-search-type="plugins"
+                        />
+                    <i class="icon icon-search"></i>
+                    <i class="icon loading" style="display: none"></i>
+                </div>
+            </form>
         </div>
-    </form>
+        <div class="col-md-3">
+            <button
+                type="button"
+                data-control="popup"
+                data-handler="onLoadPluginUploader"
+                tabindex="-1"
+                class="btn btn-success wn-icon-file-arrow-up"
+            >
+                <?= e(trans('system::lang.plugins.upload')) ?>
+            </a>
+        </div>
+    </div>
 
     <div class="row">
 
diff --git a/modules/system/controllers/updates/_popup_upload_plugin.php b/modules/system/controllers/updates/_popup_upload_plugin.php
new file mode 100644
index 0000000000..5092dc4556
--- /dev/null
+++ b/modules/system/controllers/updates/_popup_upload_plugin.php
@@ -0,0 +1,18 @@
+<div id="pluginUploadPopup">
+    <?= Form::ajax('onInstallUploadedPlugin', [
+        'data-popup-load-indicator' => true,
+        'data-request-data' => 'type:plugin',
+    ]) ?>
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+            <h4 class="modal-title"><?= e(trans('system::lang.plugins.upload')) ?></h4>
+        </div>
+        <div class="modal-body">
+            <?= $packageUploadWidget->render() ?>
+        </div>
+        <div class="modal-footer">
+            <button type="submit" class="btn btn-primary"><?= e(trans('system::lang.actions.upload')) ?></button>
+            <button type="button" class="btn btn-default" data-dismiss="modal"><?= e(trans('system::lang.actions.cancel')) ?></button>
+        </div>
+    <?= Form::close() ?>
+</div>
diff --git a/modules/system/controllers/updates/form.plugin_upload.yaml b/modules/system/controllers/updates/form.plugin_upload.yaml
new file mode 100644
index 0000000000..d93b735ec4
--- /dev/null
+++ b/modules/system/controllers/updates/form.plugin_upload.yaml
@@ -0,0 +1,6 @@
+fields:
+    uploaded_package:
+        type: fileupload
+        span: full
+        mode: file
+        fileTypes: zip
diff --git a/modules/system/lang/en/lang.php b/modules/system/lang/en/lang.php
index 8c5eb30013..e0067512e3 100644
--- a/modules/system/lang/en/lang.php
+++ b/modules/system/lang/en/lang.php
@@ -104,9 +104,14 @@
         ],
         'by_author' => 'By :name',
     ],
+    'actions' => [
+        'upload' => 'Upload',
+        'cancel' => 'Cancel',
+    ],
     'plugins' => [
         'manage' => 'Manage plugins',
         'install' => 'Install plugins',
+        'upload' => 'Upload Plugin',
         'install_products' => 'Install products',
         'search' => 'search plugins to install...',
         'installed' => 'Installed plugins',

From ff85f7032e0fe332c784d0fcfa7b10f4923b247b Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Tue, 30 Jul 2024 00:21:32 -0600
Subject: [PATCH 05/13] Centralize updatemanager zip extracting

---
 modules/system/classes/UpdateManager.php | 32 +++++++++++++-----------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/modules/system/classes/UpdateManager.php b/modules/system/classes/UpdateManager.php
index aed24fa2b3..79bed05a7c 100644
--- a/modules/system/classes/UpdateManager.php
+++ b/modules/system/classes/UpdateManager.php
@@ -486,11 +486,7 @@ public function extractCore(): void
     {
         $filePath = $this->getFilePath('core');
 
-        if (!Zip::extract($filePath, $this->baseDirectory)) {
-            throw new ApplicationException(Lang::get('system::lang.zip.extract_failed', ['file' => $filePath]));
-        }
-
-        @unlink($filePath);
+        $this->extractArchive($filePath, $this->baseDirectory);
     }
 
     /**
@@ -615,11 +611,7 @@ public function extractPlugin(string $name, string $hash): void
         $fileCode = $name . $hash;
         $filePath = $this->getFilePath($fileCode);
 
-        if (!Zip::extract($filePath, plugins_path())) {
-            throw new ApplicationException(Lang::get('system::lang.zip.extract_failed', ['file' => $filePath]));
-        }
-
-        @unlink($filePath);
+        $this->extractArchive($filePath, plugins_path());
     }
 
     //
@@ -652,15 +644,11 @@ public function extractTheme(string $name, string $hash): void
         $fileCode = $name . $hash;
         $filePath = $this->getFilePath($fileCode);
 
-        if (!Zip::extract($filePath, themes_path())) {
-            throw new ApplicationException(Lang::get('system::lang.zip.extract_failed', ['file' => $filePath]));
-        }
+        $this->extractArchive($filePath, themes_path());
 
         if ($this->themeManager) {
             $this->themeManager->setInstalled($name);
         }
-
-        @unlink($filePath);
     }
 
     //
@@ -1063,4 +1051,18 @@ protected function printMessages(): void
             $this->out('', true);
         }
     }
+
+    /**
+     * Extract the provided archive
+     *
+     * @throws ApplicationException if the archive failed to extract
+     */
+    public function extractArchive(string $archive, string $destination): void
+    {
+        if (!Zip::extract($archive, $destination)) {
+            throw new ApplicationException(Lang::get('system::lang.zip.extract_failed', ['file' => $archive]));
+        }
+
+        @unlink($archive);
+    }
 }

From 54e2c72d9bcc9eb083dfff37c0f5ee9fa7c83b0d Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Tue, 30 Jul 2024 00:22:30 -0600
Subject: [PATCH 06/13] Add tests & fixtures for initial plugin scanning
 functionality

---
 .../tests/classes/UpdateManagerTest.php       | 121 ++++++++++++++++++
 .../entire-plugins-directory.zip              | Bin 0 -> 7396 bytes
 .../plugin-archives/multiple-authors-NO.zip   | Bin 0 -> 6566 bytes
 .../plugin-archives/multiple-authors.zip      | Bin 0 -> 7527 bytes
 .../multiple-plugins-no-author.zip            | Bin 0 -> 4713 bytes
 .../single-plugin-contents.zip                | Bin 0 -> 1360 bytes
 .../plugin-archives/single-plugin-nested.zip  | Bin 0 -> 1572 bytes
 7 files changed, 121 insertions(+)
 create mode 100644 modules/system/tests/classes/UpdateManagerTest.php
 create mode 100644 modules/system/tests/fixtures/plugin-archives/entire-plugins-directory.zip
 create mode 100644 modules/system/tests/fixtures/plugin-archives/multiple-authors-NO.zip
 create mode 100644 modules/system/tests/fixtures/plugin-archives/multiple-authors.zip
 create mode 100644 modules/system/tests/fixtures/plugin-archives/multiple-plugins-no-author.zip
 create mode 100644 modules/system/tests/fixtures/plugin-archives/single-plugin-contents.zip
 create mode 100644 modules/system/tests/fixtures/plugin-archives/single-plugin-nested.zip

diff --git a/modules/system/tests/classes/UpdateManagerTest.php b/modules/system/tests/classes/UpdateManagerTest.php
new file mode 100644
index 0000000000..e8477f7c53
--- /dev/null
+++ b/modules/system/tests/classes/UpdateManagerTest.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace System\Tests\Classes;
+
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use System\Tests\Bootstrap\TestCase;
+use System\Classes\UpdateManager;
+use Winter\Storm\Support\Facades\File;
+
+class UpdateManagerTest extends TestCase
+{
+    protected UpdateManager $manager;
+
+    public function setUp() : void
+    {
+        parent::setUp();
+
+        $this->manager = UpdateManager::instance();
+    }
+
+    /**
+     * Data provider for testExtractPlugins.
+     */
+    public function pluginExtractionDataProvider(): array
+    {
+        return [
+            'single_plugin_contents' => [
+                'zipFile' => 'single-plugin-contents.zip',
+                'expectedPaths' => [
+                    'Plugin.php',
+                ],
+            ],
+            'single_plugin_nested' => [
+                'zipFile' => 'single-plugin-nested.zip',
+                'expectedPaths' => [
+                    'testa/Plugin.php',
+                ],
+            ],
+            'multiple_plugins_no_author' => [
+                'zipFile' => 'multiple-plugins-no-author.zip',
+                'expectedPaths' => [
+                    'testa/Plugin.php',
+                    'testb/Plugin.php',
+                    'testc/Plugin.php',
+                ],
+            ],
+            'multiple_authors' => [
+                'zipFile' => 'multiple-authors.zip',
+                'expectedPaths' => [
+                    'mix/testa/Plugin.php',
+                    'mix/testb/Plugin.php',
+                    'mix/testc/Plugin.php',
+                    'testvendor/test/Plugin.php',
+                ],
+            ],
+            'entire_plugins_directory' => [
+                'zipFile' => 'entire-plugins-directory.zip',
+                'expectedPaths' => [
+                    'plugins/mix/testa/Plugin.php',
+                    'plugins/mix/testb/Plugin.php',
+                    'plugins/mix/testc/Plugin.php',
+                    'plugins/testvendor/test/Plugin.php',
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider pluginExtractionDataProvider
+     */
+    public function testExtractPlugins($zipFile, $expectedPaths)
+    {
+        $zipPath = base_path('modules/system/tests/fixtures/plugin-archives/' . $zipFile);
+        $tempZipPath = temp_path('packages/'. pathinfo($zipPath, PATHINFO_BASENAME));
+        $tempPath = temp_path('packages/'. pathinfo($zipPath, PATHINFO_FILENAME) . '_contents') . '/';
+
+        File::makeDirectory(temp_path('packages/'), 0755, true, true);
+        File::copy($zipPath, $tempZipPath);
+
+        $this->manager->extractArchive($tempZipPath, $tempPath);
+
+        $pluginPaths = $this->findPluginFiles($tempPath);
+
+        // Normalize paths to make sure comparison is correct regardless of OS
+        $normalizedPluginPaths = array_map('realpath', $pluginPaths);
+        $normalizedExpectedPaths = array_map(function($path) use ($tempPath) {
+            return $tempPath . $path;
+        }, $expectedPaths);
+
+        $this->assertEqualsCanonicalizing($normalizedExpectedPaths, $normalizedPluginPaths);
+
+        // @TODO: Cleanup after self
+    }
+
+    /**
+     * @TODO:
+     * - Move this into a utility class (UpdateManager?)
+     * - Include logic for detecting the plugin author / name from the plugin class namespace
+     * - Maybe include logic for determining what order the plugins should be installed in
+     * - Rename plugins in the fixture files to not conflict with the testing plugins when we
+     * add cases for testing the actual installation of plugins
+     */
+    protected function findPluginFiles($path)
+    {
+        $pluginFiles = [];
+
+        $iterator = new RecursiveIteratorIterator(
+            new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::SKIP_DOTS),
+            RecursiveIteratorIterator::SELF_FIRST
+        );
+
+        foreach ($iterator as $file) {
+            if ($file->isFile() && $file->getFilename() === 'Plugin.php') {
+                $pluginFiles[] = $file->getPathname();
+            }
+        }
+
+        return $pluginFiles;
+    }
+}
diff --git a/modules/system/tests/fixtures/plugin-archives/entire-plugins-directory.zip b/modules/system/tests/fixtures/plugin-archives/entire-plugins-directory.zip
new file mode 100644
index 0000000000000000000000000000000000000000..d2137f3cd1d4254a69d6e5034a37687317ddda77
GIT binary patch
literal 7396
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
Ojts*zU`DeL1n~e811G!y

literal 0
HcmV?d00001

diff --git a/modules/system/tests/fixtures/plugin-archives/multiple-authors-NO.zip b/modules/system/tests/fixtures/plugin-archives/multiple-authors-NO.zip
new file mode 100644
index 0000000000000000000000000000000000000000..991f14d4e86fd0435bb19f81d32455ba94940a6c
GIT binary patch
literal 6566
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

literal 0
HcmV?d00001

diff --git a/modules/system/tests/fixtures/plugin-archives/multiple-authors.zip b/modules/system/tests/fixtures/plugin-archives/multiple-authors.zip
new file mode 100644
index 0000000000000000000000000000000000000000..11fa7943fb6633e6d66a6d2256d5c05e281177e4
GIT binary patch
literal 7527
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

literal 0
HcmV?d00001

diff --git a/modules/system/tests/fixtures/plugin-archives/multiple-plugins-no-author.zip b/modules/system/tests/fixtures/plugin-archives/multiple-plugins-no-author.zip
new file mode 100644
index 0000000000000000000000000000000000000000..a59f338befd058717ec9d1b27897101ca61d207a
GIT binary patch
literal 4713
zcmWIWW@h1H00AS3UlCvilwf0!VJJy0E=kl64dG;9{*byj4TMW8xEUB(zA`c}u!sOv
z1_1SgXb!Ocil#>v@jzZV5DUZgmuKdcq!#JrW>)BB6~hhF3tWM2nCWRpt_A}hmIJ%j
zzgR1J#m?c6bG^bwww^1iJVoc{>)Gm_d3Vg%+mO9B&8X+QbI&=ogbKs2r?$z?b}JUp
zc^D~llp(eF^B$peiw)OyTW~K@{&?u(;Zn_;=R#sUy+Z%~L3QhtV)n*;KzEt~y&?d2
zYd}tEdS;$pK}G>ShsO3F%sOl!;PU=g*G|pGOY$DGCYfD#P}q6Y^2DcYf+xB@tW#L_
z<G%9EwTg2mmwmZ0Gj{*+Y!?IFLX&A5%D=yI(YZY}sFU;fyw+Q<E=#99diCJ)c5eAL
z&HuNPk~TS%FTC)lw>7|?E7I`ly~vuS2}kcTJ>q!d(ersvMBf<~u~L<l+!p8EChGk)
zxo37^r@WVa&ezk%mj!O0J37g5q5EYw|NWIGj+?BgUh;rtlKF?%|9RC;e!XV<{DtJs
zHOHPWVEYP=GwgBB3lE3H;^NejVuDeRFy@bJzaT3xI6+t(-59;}%#zIXy!@h6c&K7Y
zODUPfC0w9LLYN9P3=Ra*O)V};Cg?y!+GN+i^`r@C*mfYsa3IL2#DW3>>C?COG#8U0
zkL&lpUAqM@Rjxk0@n6S|4;LpoWS%M!ad~z>w^V@tNold?EhaOoZ^5-sE3B-!^-BxB
z&scowuxrhfCE{z9E*Vts5fN(cQAk%e;Mrw2b?(7kr(+{u9i8%!vE)X`4LRxG8y-*A
zs5xg4#_{X^%*cDDetAcB{ePSG_3Y+lOZGA14jou_O(G#kuw~aI{lS@CcQr@O*bR(2
z<m{THPjq(eVlo6~*PmUxj<SAazapBpm#gWX48P&!b&Wnemt_Nv)SJ%?bbLK!oz1RQ
z>D?7w9LrSujtPam3(D_YI!kNnj14<C1w{X^JnR#*zV=u7LL;A__r-*pS$A=?J~I__
zx+}6N$*Ll~(C1*6HTw~{h)EL9E5BSeW{$ivafx2SceAdNm&*<Rx1ReO@N40v$NtL{
zx6SQVO?EI});n(=D6d+?Ol%VNxOZUkdthFDd8hW-3-e9$zn$N`Yc)IW2#4j>Bz>yn
zRk$%!&8u)zNz1E=UuLOq1V;9Mq`Zn^6j6EA?}z~~um0@X?fCeMq3)R?4g02uDJ!ER
zmw2jWYAar;S8r4*RNddV?(H%LcjdB`?45siCq{%<Z$2gyDwlW8EqzDRnR~5EJu|j8
z3g519xVR!G!oa&HNxg)lCSKKG?xNW{?JC~>zU^-R(KCLk(xn%1AC^uq*~MVA$Kg_5
zweQoNhm&XT-gKp1)7$OB>)_VYw`ZF3&3F0tyypR9-2d`4+4}Rxd{th)l)ry9|DLJp
zFJ9a+4a?f3ly=y%cJd(2+6yjEo`9aUlgZB7GV7Zbm>+jO^966#zV<HYeFr3K?*(S<
z@OuWr*QMwGi;a+4_9wr)^B_}fi_>Q*?uB{4YFKvf<{#eBtUVDWYyZcUwYS5wb{t05
zE}B7X)&|x|)ToBx#!xkD!%ZbEYh$a1QH&xgYY%ue%*Z6ijJ=t{#vlPKwLn0C;jbfz
zhP9$uA+2bP7Bt8#L^}mF=R(W^Hc=V2G&;b|LaU;QGZ?kOi)`>4xWUNvDLzxNdz}}>
z>tBGbhIk#GiitB4wJC}0P-`YMBau@yafSoE3I~EH?wyEkI3!`?GZqnRsL2}H&3CXF
z3rpnq496bEsL5+RGbBJjtv-BaAsmW3dA*05MON}cZJ;5Cz-$(nBdM9Z765x1pyUN_
z7vK*8L}=npUeD2uq-OH6WkYi>Dai}9L4+K*9oUSeR`Tj%hqxKk@}M+%or0T1R`Nn^
zBp`=C83)Xf)J$I0oG??VR(c&mH<FskO9Gg{LD>PNE+sbBaF<@m*o-BVyjX#0l7T@K
N2xWnhZpIDb0RSoub1VP=

literal 0
HcmV?d00001

diff --git a/modules/system/tests/fixtures/plugin-archives/single-plugin-contents.zip b/modules/system/tests/fixtures/plugin-archives/single-plugin-contents.zip
new file mode 100644
index 0000000000000000000000000000000000000000..aeb07447a3de6c62757d902d76e8986a57a245fe
GIT binary patch
literal 1360
zcmWIWW@Zs#U|`^2Fp~HcQPK3sA|A*q2V!0Z8HV!Aypq%+z1++Sy{zKU5Kac>52=gO
z^a59;l~!;wFtU7QWMBYmH$Cmh)nLHGa$xuR7i&eY*g5=hu2<N|)^lZ*r|A5AJzL!~
z?~WOJ8?x7?8TEX3?m4HHP+|D>)Hd1KZp8vR4<m(+GNcxN-XoN5vEkZo3+_eA9}itT
zT&j8VTu6+kSLokA0VuAVQq11C59mTupzT~hR|e#irf25q6=W3Pb7E}&!K}ju0xs`=
zb?ww_yd>{2Ym(V@2ZfzSEl+&fCU~Oj!#ag!Kkh5vT&p;Da@m&~Gh_E3&vr4;Ei{?7
zq5S(R7oFQvgE~2n&uhK)>auj&qgM|uZ|9b8)BJxsDQS~K`N9i-dRqhRxgrg(-ixeR
znsD?k(<6>I9zCD;MD(3;5i3<$$!&4oZKB>^lY3?tcFKF%=X^bFd|BZ3xucT|7rI||
z^WR^2;<(9*>Lm|YCYgVD{hwFu<kxGq&tFLHTyyOC0=BOVpb+2!`k4V7PhbX=U<Zak
zVsUY5NwGfM`=D4tiy>44{>b(VvH}eNVL^ledg+-Zndy1?MXC6VO35rP;X*YJ*+JY0
z^NNd-2|5aq`q=evJ!t}(v>nw^AVU%h3J9b?-`>+)OolwJ-~V>)7Q9rs`t-(s9Xmc;
zoam5wszk))+5Oy70sbeY#h$mA%&fiz*FLSVvgXz=E%-iT@u|bEHB**|uT{EaP`yV)
zsJTZWUEP3Zm)+F42X~#0jeK=<%0tGI8zDF3q<?RCJXxdWoIx1JulqA2@0t4L9ohB&
zZQ9qfo0l!w#~9$v$Rx*%@D6Hbk^l!0FvT)#X#_FRvKA{OYhgqhs*$KEAKA!dKqHa!
z0Y39^r6Y)W3=9Gce;ro<T?$WC#2JQ~rjQ-?5@8r}3M0-~P+-9THv_U8Et%kMgd{Y4
j1|s4GHJKs1vkuijSfayaEGrwxU2H)39_T@DW)Kemh&h?#

literal 0
HcmV?d00001

diff --git a/modules/system/tests/fixtures/plugin-archives/single-plugin-nested.zip b/modules/system/tests/fixtures/plugin-archives/single-plugin-nested.zip
new file mode 100644
index 0000000000000000000000000000000000000000..58bc4766e44a7ac412201eec3999f0bf308efe8f
GIT binary patch
literal 1572
zcmWIWW@h1H00AS3UlCvilwf0!VJJy0E=kl64dG;9{*byj4TMW8xEUB(zA`c}u!sOv
z1_1SgXb!Ocil#>v@jzZV5DUZgmuKdcq!#JrW>)BB6~hhF3tWM2nCWRpt_A}hmIJ%j
zzgR1J#m?c6bG^bwww^1iJVoc{>)Gm_d3Vg%+mO9B&8X+QbI&=ogbKs2r?$z?b}JUp
zc^D~llp(eF^B$peiw)OyTW~K@{&?u(;Zn_;=R#sUy+Z%~L3QhtV)n*;KzEt~y&?d2
zYd}tEdS;$pK}G>ShsO3F%sOl!;PU=g*G|pGOY$DGCYfD#P}q6Y^2DcYf+xB@tW#L_
z<G%9EwTg2mmwmZ0Gj{*+Y!?IFLX&A5%D=yI(YZY}sFU;fyw+Q<E=#99diCJ)c5eAL
z&HuNPk~TS%FTC)lw>7|?E7I`ly~vuS2}kcTJ>q!d(ersvMBf<~u~L<l+!p8EChGk)
zxo37^r@WVa&ezk%mj!O0J37g5q5EYw|NWIGj+?BgUh;rtlKF?%|9RC;e!XV<{DtJs
zHOHPWVEYP=GwgBB3lE3H;^NejVuDeRFy@bJzaT3xI6+t(-59;}%#zIXy!@h6c&K7Y
zODUPfC0w9LLYN9P3=Ra*O)V};Cg?y!+GN+i^`r@C*mfYsa3IL2#DW3>>C?COG#8U0
zkL&lpUAqM@Rjxk0@n6S|4;LpoWS%M!ad~z>w^V@tNold?EhaOoZ^5-sE3B-!^-BxB
z&scowuxrhfCE{z9E*Vts5fN(cQAk%e;Mrw2b?(7kr(+{u9i8%!vE)X`4LRxG8y-*A
zs5xg4#_{X^%*cDDetAcB{ePSG_3Y+lOZG7acr!A|F=G!OHU<f3SP3xvbp$bC*_RcP
zeKE2w$Sgzvp=Mr)S-`x(u%*!fZWdZrCeC2goQ7=h8@R#9`3|3{*uBn+;`J{;S3|rG
zPsPL;iJFFy9cs;lW+ZZoCeCo6SK&Yq#k~{J4TmIbe8wVT4K-OKyZH__V_}ILm*K2z
QAV;zTVLVX#dS(z003egj4gdfE

literal 0
HcmV?d00001


From 0a86efef7ed03ad58af41dcd95e7c2792fa1c271 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Tue, 30 Jul 2024 00:22:53 -0600
Subject: [PATCH 07/13] Initial work on supporting .zip files from
 plugin:install command.

---
 modules/system/console/PluginInstall.php | 39 ++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/modules/system/console/PluginInstall.php b/modules/system/console/PluginInstall.php
index 113fe40268..ec117450f3 100644
--- a/modules/system/console/PluginInstall.php
+++ b/modules/system/console/PluginInstall.php
@@ -3,6 +3,8 @@
 use Winter\Storm\Console\Command;
 use System\Classes\UpdateManager;
 use System\Classes\PluginManager;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Str;
 
 /**
  * Console command to install a new plugin.
@@ -32,13 +34,44 @@ class PluginInstall extends Command
 
     /**
      * Execute the console command.
-     * @return void
+     *
+     *
+     * Tests:
+     *  plugin.zip - doesn't exist
+     *  plugin.zip - does exist
      */
-    public function handle()
+    public function handle(): int
     {
         $pluginName = $this->argument('plugin');
         $manager = UpdateManager::instance()->setNotesOutput($this->output);
 
+        if (Str::endsWith($pluginName, '.zip')) {
+            $packageZip = base_path($pluginName);
+            $tempPath = temp_path('packages/' . md5($packageZip));
+
+            // @TODO: Testing only
+            File::copy(base_path('plugin-test.zip'), $packageZip);
+
+            // Check if the file exists
+            if (!File::exists($packageZip)) {
+                $this->output->writeln(sprintf('<error>File not found: %s</error>', $pluginName));
+                return 1;
+            }
+
+            // Attempt to extract the plugin
+            $manager->extractArchive($packageZip, $tempPath);
+
+            // Look for the Plugin.php file
+            $pluginFile = $tempPath . '/Plugin.php';
+            if (!File::exists($pluginFile)) {
+                $this->output->writeln(sprintf('<error>File not found: %s</error>', $pluginFile));
+                return 1;
+            }
+
+
+            return 1;
+        }
+
         $pluginDetails = $manager->requestPluginDetails($pluginName);
 
         $code = array_get($pluginDetails, 'code');
@@ -63,5 +96,7 @@ public function handle()
          */
         $this->output->writeln(sprintf('<info>Migrating plugin...</info>', $code));
         $manager->updatePlugin($code);
+
+        return 0;
     }
 }

From 6bbc1c29b7a986bc70d700eba999d72235390e34 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Tue, 30 Jul 2024 00:30:09 -0600
Subject: [PATCH 08/13] formatting

---
 modules/system/tests/classes/UpdateManagerTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/tests/classes/UpdateManagerTest.php b/modules/system/tests/classes/UpdateManagerTest.php
index e8477f7c53..3f1169564c 100644
--- a/modules/system/tests/classes/UpdateManagerTest.php
+++ b/modules/system/tests/classes/UpdateManagerTest.php
@@ -84,7 +84,7 @@ public function testExtractPlugins($zipFile, $expectedPaths)
 
         // Normalize paths to make sure comparison is correct regardless of OS
         $normalizedPluginPaths = array_map('realpath', $pluginPaths);
-        $normalizedExpectedPaths = array_map(function($path) use ($tempPath) {
+        $normalizedExpectedPaths = array_map(function ($path) use ($tempPath) {
             return $tempPath . $path;
         }, $expectedPaths);
 

From 1c0d50d51601343e20776d7802b4a4a091e563f9 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Tue, 30 Jul 2024 19:02:53 -0600
Subject: [PATCH 09/13] Update plugin test fixtures to avoid conflicts when
 installing them

---
 modules/system/classes/PluginManager.php      |  33 ++++++-----
 modules/system/classes/UpdateManager.php      |  32 ++++++++++
 .../tests/classes/UpdateManagerTest.php       |  56 +++++++-----------
 .../entire-plugins-directory.zip              | Bin 7396 -> 7662 bytes
 .../plugin-archives/multiple-authors-NO.zip   | Bin 6566 -> 0 bytes
 .../plugin-archives/multiple-authors.zip      | Bin 7527 -> 7074 bytes
 .../multiple-plugins-no-author.zip            | Bin 4713 -> 5183 bytes
 .../single-plugin-contents.zip                | Bin 1360 -> 1506 bytes
 .../plugin-archives/single-plugin-nested.zip  | Bin 1572 -> 1730 bytes
 9 files changed, 70 insertions(+), 51 deletions(-)
 delete mode 100644 modules/system/tests/fixtures/plugin-archives/multiple-authors-NO.zip

diff --git a/modules/system/classes/PluginManager.php b/modules/system/classes/PluginManager.php
index 5bc1d61fc1..31a8fd0017 100644
--- a/modules/system/classes/PluginManager.php
+++ b/modules/system/classes/PluginManager.php
@@ -1,23 +1,24 @@
-<?php namespace System\Classes;
-
-use Db;
-use App;
-use Str;
-use Log;
-use File;
-use Lang;
-use View;
-use Cache;
-use Config;
-use Schema;
-use SystemException;
+<?php
+
+namespace System\Classes;
+
+use Backend\Classes\NavigationManager;
 use FilesystemIterator;
-use RecursiveIteratorIterator;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\View;
 use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
 use System\Models\PluginVersion;
+use Winter\Storm\Exception\SystemException;
 use Winter\Storm\Foundation\Application;
 use Winter\Storm\Support\ClassLoader;
-use Backend\Classes\NavigationManager;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Str;
 
 /**
  * Plugin manager
@@ -664,7 +665,7 @@ protected function loadDisabled(): void
         if (
             $this->app->hasDatabaseTable('system_plugin_versions')
         ) {
-            $userDisabled = Db::table('system_plugin_versions')->where('is_disabled', 1)->lists('code') ?? [];
+            $userDisabled = DB::table('system_plugin_versions')->where('is_disabled', 1)->lists('code') ?? [];
             foreach ($userDisabled as $code) {
                 $this->flagPlugin($code, static::DISABLED_BY_USER);
             }
diff --git a/modules/system/classes/UpdateManager.php b/modules/system/classes/UpdateManager.php
index 79bed05a7c..55374ac690 100644
--- a/modules/system/classes/UpdateManager.php
+++ b/modules/system/classes/UpdateManager.php
@@ -13,6 +13,8 @@
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Lang;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
 use System\Helpers\Cache as CacheHelper;
 use System\Models\Parameter;
 use System\Models\PluginVersion;
@@ -1065,4 +1067,34 @@ public function extractArchive(string $archive, string $destination): void
 
         @unlink($archive);
     }
+
+    /**
+     * Finds all plugins in a given path by looking for valid Plugin.php files
+     */
+    public function findPluginsInPath(string $path): array
+    {
+        $pluginFiles = [];
+
+        $iterator = new RecursiveIteratorIterator(
+            new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::SKIP_DOTS),
+            RecursiveIteratorIterator::SELF_FIRST
+        );
+
+        foreach ($iterator as $file) {
+            if ($file->isFile() && $file->getFilename() === 'Plugin.php') {
+                // Attempt to extract the plugin's code
+                if (!preg_match('/namespace (.+?);/', file_get_contents($file->getRealPath()), $match)) {
+                    continue;
+                }
+
+                $code = str_replace('\\', '.', $match[1]);
+
+                if (str_contains($code, '.')) {
+                    $pluginFiles[$code] = $file->getPathname();
+                }
+            }
+        }
+
+        return $pluginFiles;
+    }
 }
diff --git a/modules/system/tests/classes/UpdateManagerTest.php b/modules/system/tests/classes/UpdateManagerTest.php
index 3f1169564c..eb3e836844 100644
--- a/modules/system/tests/classes/UpdateManagerTest.php
+++ b/modules/system/tests/classes/UpdateManagerTest.php
@@ -28,39 +28,39 @@ public function pluginExtractionDataProvider(): array
             'single_plugin_contents' => [
                 'zipFile' => 'single-plugin-contents.zip',
                 'expectedPaths' => [
-                    'Plugin.php',
+                    'Extracted.TestA' => 'Plugin.php',
                 ],
             ],
             'single_plugin_nested' => [
                 'zipFile' => 'single-plugin-nested.zip',
                 'expectedPaths' => [
-                    'testa/Plugin.php',
+                    'Extracted.TestA' => 'testa/Plugin.php',
                 ],
             ],
             'multiple_plugins_no_author' => [
                 'zipFile' => 'multiple-plugins-no-author.zip',
                 'expectedPaths' => [
-                    'testa/Plugin.php',
-                    'testb/Plugin.php',
-                    'testc/Plugin.php',
+                    'Extracted.TestA' => 'testa/Plugin.php',
+                    'Extracted.TestB' => 'testb/Plugin.php',
+                    'Extracted.TestC' => 'testc/Plugin.php',
                 ],
             ],
             'multiple_authors' => [
                 'zipFile' => 'multiple-authors.zip',
                 'expectedPaths' => [
-                    'mix/testa/Plugin.php',
-                    'mix/testb/Plugin.php',
-                    'mix/testc/Plugin.php',
-                    'testvendor/test/Plugin.php',
+                    'Expanded.Test' => 'expanded/test/Plugin.php',
+                    'Extracted.TestA' => 'extracted/testa/Plugin.php',
+                    'Extracted.TestB' => 'extracted/testb/Plugin.php',
+                    'Extracted.TestC' => 'extracted/testc/Plugin.php',
                 ],
             ],
             'entire_plugins_directory' => [
                 'zipFile' => 'entire-plugins-directory.zip',
                 'expectedPaths' => [
-                    'plugins/mix/testa/Plugin.php',
-                    'plugins/mix/testb/Plugin.php',
-                    'plugins/mix/testc/Plugin.php',
-                    'plugins/testvendor/test/Plugin.php',
+                    'Expanded.Test' => 'plugins/expanded/test/Plugin.php',
+                    'Extracted.TestA' => 'plugins/extracted/testa/Plugin.php',
+                    'Extracted.TestB' => 'plugins/extracted/testb/Plugin.php',
+                    'Extracted.TestC' => 'plugins/extracted/testc/Plugin.php',
                 ],
             ],
         ];
@@ -71,16 +71,19 @@ public function pluginExtractionDataProvider(): array
      */
     public function testExtractPlugins($zipFile, $expectedPaths)
     {
+        // Reset temp directory
+        File::deleteDirectory(temp_path('packages/'));
+        File::makeDirectory(temp_path('packages/'), 0755, true, true);
+
         $zipPath = base_path('modules/system/tests/fixtures/plugin-archives/' . $zipFile);
         $tempZipPath = temp_path('packages/'. pathinfo($zipPath, PATHINFO_BASENAME));
         $tempPath = temp_path('packages/'. pathinfo($zipPath, PATHINFO_FILENAME) . '_contents') . '/';
 
-        File::makeDirectory(temp_path('packages/'), 0755, true, true);
         File::copy($zipPath, $tempZipPath);
 
         $this->manager->extractArchive($tempZipPath, $tempPath);
 
-        $pluginPaths = $this->findPluginFiles($tempPath);
+        $pluginPaths = $this->manager->findPluginsInPath($tempPath);
 
         // Normalize paths to make sure comparison is correct regardless of OS
         $normalizedPluginPaths = array_map('realpath', $pluginPaths);
@@ -88,7 +91,7 @@ public function testExtractPlugins($zipFile, $expectedPaths)
             return $tempPath . $path;
         }, $expectedPaths);
 
-        $this->assertEqualsCanonicalizing($normalizedExpectedPaths, $normalizedPluginPaths);
+        $this->assertEquals($normalizedExpectedPaths, $normalizedPluginPaths);
 
         // @TODO: Cleanup after self
     }
@@ -96,26 +99,9 @@ public function testExtractPlugins($zipFile, $expectedPaths)
     /**
      * @TODO:
      * - Move this into a utility class (UpdateManager?)
-     * - Include logic for detecting the plugin author / name from the plugin class namespace
+     * - √ - Include logic for detecting the plugin author / name from the plugin class namespace
      * - Maybe include logic for determining what order the plugins should be installed in
-     * - Rename plugins in the fixture files to not conflict with the testing plugins when we
+     * - √ - Rename plugins in the fixture files to not conflict with the testing plugins when we
      * add cases for testing the actual installation of plugins
      */
-    protected function findPluginFiles($path)
-    {
-        $pluginFiles = [];
-
-        $iterator = new RecursiveIteratorIterator(
-            new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::SKIP_DOTS),
-            RecursiveIteratorIterator::SELF_FIRST
-        );
-
-        foreach ($iterator as $file) {
-            if ($file->isFile() && $file->getFilename() === 'Plugin.php') {
-                $pluginFiles[] = $file->getPathname();
-            }
-        }
-
-        return $pluginFiles;
-    }
 }
diff --git a/modules/system/tests/fixtures/plugin-archives/entire-plugins-directory.zip b/modules/system/tests/fixtures/plugin-archives/entire-plugins-directory.zip
index d2137f3cd1d4254a69d6e5034a37687317ddda77..c3d85a20a6715e44f9b6af5cac41489b7a5bdbad 100644
GIT binary patch
literal 7662
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
Cm0lwN

literal 7396
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
Ojts*zU`DeL1n~e811G!y

diff --git a/modules/system/tests/fixtures/plugin-archives/multiple-authors-NO.zip b/modules/system/tests/fixtures/plugin-archives/multiple-authors-NO.zip
deleted file mode 100644
index 991f14d4e86fd0435bb19f81d32455ba94940a6c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6566
zcmWIWW@h1H0D;B3{ziZqP=bX)h9NhzLO(QwlY!Z>VnrGVmsW5yFtU7QWME(s0jdkY
zshb0;n|u@akW45^EiOqU=n{~NIKcj>XnJH359E~tu{4G`<(YXUsYQA~r|D%C<MW>B
zX-BRG10I$GyVt*1D|*Gw;g55@!bY~9E2}(3=jZF$>YjOb%-GwIy*ACL=eu*yIkkie
z!>^~d$<B5w7SMSZDRh(}wfOTMp>&H4*LGWQFH-(^=;Gm0&70>!Vm!S<|Na4m9>UF2
zirE|Y0o`i~3|t8eHwWaDrf25q6=W3Pb8u|`!K}ju0xs`=b?ww_yd>{2Ym(V@2ZfzS
zEl+&fCU~Oj!#ag!Kkh5vT&p;Da@m&~Gh_E3&vr4;Ei{?7q5S(R7oFQvgE~2n&uhK)
z>auj&qgM|uZ|9b8)BJxsDQS~K`N9i-dRqhRxgrg(-ixeRnsD?k(<6>I9zCD;MD(3;
z5i3<$$!&4oZKB>^lY3?tcFKF%=X^bFd|BZ3xucT|7rI||^WR^2;<(9*>Lm|YCYgVD
z{hwFu<kxGq&tFLHTyyOC0=BPsQj;h~cqA4Vr<N2GOcIEs{YSQ6kQErbAS{o|IKA}D
zlFanH{GwERp`4OgT*8Gr=}Y1=y|^fupo0<VfnERBlO~{Jx8rj#$jHQk0s`sSxA!y`
zlOd1m_rG1c1us>uKE3f@$BqvdCpu)FDiLvcc0adNfd5HpvF9x&GpldGwNERothx0|
z3%<`-eCn`k&6FkLYn3h;RPPZHYVJ`;S2y6<WjA&1!Cj|gBVQez@{qCQM#v30>E9b3
zPu8e8XAs8m>;BBhd!~MQM|S;xoA&kW=4DIvG2#v_^lVN_5aG+_$@+scn=iOLdBSdB
zlw!-~$@*Bbxf5ow3(V$SOoqU0{<CY>QPz*_S43sjH!Uzf?tJFUx<((K%d!DS>dj{c
zI=-H=&SuxD^zMo-j%BKS$AqrE3wqzNbe7iC85{O)3WyHBXCQoCdj7xI2&rX%^1C|^
zGR3wyeU{>0m<P<`vU@lG@IKgO&3;5KVxq+J$}g9VnIo@ET%woo->j?T<#NOSt>^v*
z{91VFvHvo~ZF9R-lO47%>zy|bl*cXNCN>Fs+&eJ&Jur{Iyi@z^g?Z78Z|8UKTFs6-
zA)x1RV8W(m9)}x8lROSLoqBm3#YnU~?u?lxhEg6+BB2<>m&cQE<Z&#)L)WT&S99bH
zTzNbRTOP;aV9Y$8wwJ5vo(#X?WxRPj>|IcPCnS&W1m^Mom4|&|*4O?jUufj>^S+pH
zGwUvn)@P<-PIpB%C0SLZ7y3Z+_#~7({vB5yH;3o(7>qo=X+EiWJc+t_9Bv#<@;Kad
z((-uXms#o?fd&45EcG~wkwoQjzas{~di-bCZpX)840X>GY1lVKOj#Knxx`Z~Q(N&$
zy?Uckq3Zs=b#Iq3xGR^fWbgdDJ24`>dh;=vP`SKwZs|Lk&fIHV>Y1^%QTTR+!^IUj
z5eD8pN$MpWHSwwja~I9tX;<;~_icCkkDl>Ul`g%A`>=F^$u0(?Jr0-hs(qjCJe)jx
z_ogfDn%-^~UI(|HzCF{NZ@$aF=RFS?<NlYY$=07g=Bx7ZrTqP?`S(m!fAQij?YV)C
zBv7lqEHy7BzldOYfM~}7LlF)HPz?c@N6;ih1B-iRz%w>rW7~p>fk6t3Nm%M)Ecvu|
z;z>VdL!P$xm0b7PmUM}0bT@Pv2MNl|kTa4r7S^2XvQc?O!2P*8OJ8k~`EYWh{r|Y4
z+UM^4VSXNQS}o!#b*{H}Uq~z0bWv&fI!$8vw~HQ1OTOJa;&_|gbH*nv_JwT>`z=KO
z+ZikFV^#UQ(Kza$`<AY)n;&p*aGG}O!qL=3t(m$C#}gj@6*zJ2iKg_9ovqLAS;-kr
z$^5=|)=`;v6GJZ8nXfi&U7M@;_KNfN)(lhT<tzu6KNFm!5%4OAuc%Z@Q@LMHX6039
zQ}(RQI`91c>?}IqxZJo+U3{7OUH%jQWB)t}zNOq+rmLR+D)L$A(n}}!eCJm1>zz}4
z`b#B1Vbz76n{(c87q-V8(K1*<HZ8v>w>&c?otPFpBEF=TyRsz$<Gvb*)d-jxoS0jX
zlZw(^!V-6zH|n3z2sq(=##dL*!^ba_!&6s})BCLVN&PNH!{j@kx{D4Q2VV;I?pnKZ
zhgWy7=p3QRn;W^3<`fHccL#S*46#rZTh1h^+N>hdBwWm06eJp??bXoLEgBG77+QR_
zh!NPMVPukH#-4atfW15j5MX%g2x39{%B+yyHbzeyw@Dl*CfPwvBG)uN6w?}zOoR2p
z@wpHYU8of|#IL~I#;~OE1csStO?BcdK<zLiTTlbE2jqPahBz8IFXJ;EdsK;{1W6CD
zyg)S_-cTjZXw<GKvcqrVG8(x;BhC_F7{h@iiu)~@akw8+ui-Nu5xc0pQ)EB%;4>ap
z$KkUCdmNx9%XAi0KY)6T_{>B&9Cxx@k6|WR$r81Lha57=z_AD9goE1M!{>bLL4ukr
z3)s+2r&_YykIQIkCQDg%9PX!1vMj)7JhhUgHwUU8Kph=?@k&gxoQz>6S;-Q$PlB8*
z-8s=6P0i9W1ekV_6Ft1ii$7!#DIRxexfqwx)J&F)+&J7%O0q=l10V-}2tMP<PnO&$
zC4L+a18QR%Uz$XOJiPt@G6YZzT#RZUwBe1<R76TgZFVDv#ak?<QkE2DP+aZKhY}26
qSEDvXiSq$!LloHua|zgh+$_aq7b~!^WdJsBWf+WrQ4z-v;sF46rI_IW

diff --git a/modules/system/tests/fixtures/plugin-archives/multiple-authors.zip b/modules/system/tests/fixtures/plugin-archives/multiple-authors.zip
index 11fa7943fb6633e6d66a6d2256d5c05e281177e4..2d577effc13ee70fb03f415f515aba755830bfaa 100644
GIT binary patch
literal 7074
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

literal 7527
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

diff --git a/modules/system/tests/fixtures/plugin-archives/multiple-plugins-no-author.zip b/modules/system/tests/fixtures/plugin-archives/multiple-plugins-no-author.zip
index a59f338befd058717ec9d1b27897101ca61d207a..d9552b4112812f62fa65fc3d3d04fe1eb8aa8663 100644
GIT binary patch
literal 5183
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
bW;}7tiU4m`V3uKE5Cy`cz|@_>1L6Sy5h5?A

literal 4713
zcmWIWW@h1H00AS3UlCvilwf0!VJJy0E=kl64dG;9{*byj4TMW8xEUB(zA`c}u!sOv
z1_1SgXb!Ocil#>v@jzZV5DUZgmuKdcq!#JrW>)BB6~hhF3tWM2nCWRpt_A}hmIJ%j
zzgR1J#m?c6bG^bwww^1iJVoc{>)Gm_d3Vg%+mO9B&8X+QbI&=ogbKs2r?$z?b}JUp
zc^D~llp(eF^B$peiw)OyTW~K@{&?u(;Zn_;=R#sUy+Z%~L3QhtV)n*;KzEt~y&?d2
zYd}tEdS;$pK}G>ShsO3F%sOl!;PU=g*G|pGOY$DGCYfD#P}q6Y^2DcYf+xB@tW#L_
z<G%9EwTg2mmwmZ0Gj{*+Y!?IFLX&A5%D=yI(YZY}sFU;fyw+Q<E=#99diCJ)c5eAL
z&HuNPk~TS%FTC)lw>7|?E7I`ly~vuS2}kcTJ>q!d(ersvMBf<~u~L<l+!p8EChGk)
zxo37^r@WVa&ezk%mj!O0J37g5q5EYw|NWIGj+?BgUh;rtlKF?%|9RC;e!XV<{DtJs
zHOHPWVEYP=GwgBB3lE3H;^NejVuDeRFy@bJzaT3xI6+t(-59;}%#zIXy!@h6c&K7Y
zODUPfC0w9LLYN9P3=Ra*O)V};Cg?y!+GN+i^`r@C*mfYsa3IL2#DW3>>C?COG#8U0
zkL&lpUAqM@Rjxk0@n6S|4;LpoWS%M!ad~z>w^V@tNold?EhaOoZ^5-sE3B-!^-BxB
z&scowuxrhfCE{z9E*Vts5fN(cQAk%e;Mrw2b?(7kr(+{u9i8%!vE)X`4LRxG8y-*A
zs5xg4#_{X^%*cDDetAcB{ePSG_3Y+lOZGA14jou_O(G#kuw~aI{lS@CcQr@O*bR(2
z<m{THPjq(eVlo6~*PmUxj<SAazapBpm#gWX48P&!b&Wnemt_Nv)SJ%?bbLK!oz1RQ
z>D?7w9LrSujtPam3(D_YI!kNnj14<C1w{X^JnR#*zV=u7LL;A__r-*pS$A=?J~I__
zx+}6N$*Ll~(C1*6HTw~{h)EL9E5BSeW{$ivafx2SceAdNm&*<Rx1ReO@N40v$NtL{
zx6SQVO?EI});n(=D6d+?Ol%VNxOZUkdthFDd8hW-3-e9$zn$N`Yc)IW2#4j>Bz>yn
zRk$%!&8u)zNz1E=UuLOq1V;9Mq`Zn^6j6EA?}z~~um0@X?fCeMq3)R?4g02uDJ!ER
zmw2jWYAar;S8r4*RNddV?(H%LcjdB`?45siCq{%<Z$2gyDwlW8EqzDRnR~5EJu|j8
z3g519xVR!G!oa&HNxg)lCSKKG?xNW{?JC~>zU^-R(KCLk(xn%1AC^uq*~MVA$Kg_5
zweQoNhm&XT-gKp1)7$OB>)_VYw`ZF3&3F0tyypR9-2d`4+4}Rxd{th)l)ry9|DLJp
zFJ9a+4a?f3ly=y%cJd(2+6yjEo`9aUlgZB7GV7Zbm>+jO^966#zV<HYeFr3K?*(S<
z@OuWr*QMwGi;a+4_9wr)^B_}fi_>Q*?uB{4YFKvf<{#eBtUVDWYyZcUwYS5wb{t05
zE}B7X)&|x|)ToBx#!xkD!%ZbEYh$a1QH&xgYY%ue%*Z6ijJ=t{#vlPKwLn0C;jbfz
zhP9$uA+2bP7Bt8#L^}mF=R(W^Hc=V2G&;b|LaU;QGZ?kOi)`>4xWUNvDLzxNdz}}>
z>tBGbhIk#GiitB4wJC}0P-`YMBau@yafSoE3I~EH?wyEkI3!`?GZqnRsL2}H&3CXF
z3rpnq496bEsL5+RGbBJjtv-BaAsmW3dA*05MON}cZJ;5Cz-$(nBdM9Z765x1pyUN_
z7vK*8L}=npUeD2uq-OH6WkYi>Dai}9L4+K*9oUSeR`Tj%hqxKk@}M+%or0T1R`Nn^
zBp`=C83)Xf)J$I0oG??VR(c&mH<FskO9Gg{LD>PNE+sbBaF<@m*o-BVyjX#0l7T@K
N2xWnhZpIDb0RSoub1VP=

diff --git a/modules/system/tests/fixtures/plugin-archives/single-plugin-contents.zip b/modules/system/tests/fixtures/plugin-archives/single-plugin-contents.zip
index aeb07447a3de6c62757d902d76e8986a57a245fe..440e98ad3a1f8012ada7887e2ddd451207b1cacb 100644
GIT binary patch
literal 1506
zcmWIWW@Zs#0D(`t{ziZqP=cL7fg!QDIJKl$KQx4wf&E6sinMFhE7N>xR;HC!a5FHn
zd}U-{0Ba5a8^XcBfno?N&>%sCA$sYVC7J1Y`9-O4<3L7wRbd$CeNsp7ArnJ@H#^54
z*?vKGpgAD3Ahv*9hwfBvge}EI$q47(#BM%z=WYiYjO1L9L5T$gdRfJA=Yo8W#ksz{
zr@5F6d0fB$?b<DPsdDw{jsH4!e7HE#A@fv;h|9D4xupX9PfCkDZ!wu!eG9IAT480)
ztzTO3ea7Nbhh1x?ED>L;bjhH4kBCrnk3zb-0naYGsdEqRIvpGN>gbe*j3qZhZpcah
z-tc&`M$I{cFpgjMXGY#L^~*c5>;K!duV*(eTe6Q46jJQ^x1KZsy#VqC!h=P<|KO48
z2#hW+U`Pezl%{9q=@n!YfPJ<S7y%%kVTsq+{<C?93<O%<*LCfbT(V04!2FDd9W5;8
zhYniYPC98gtz4H?@!njEOy#Y`n~vXq*YkXJMK8xP#lB-g+t#Wix4wGiq4RoX&`i#D
zYi`r4%gxUmxq9z;zPKGv@b|p#&Vx)_ofiJvE9PV?Vs*6U<GDxL?Aq_d1gaC9ljb}>
zxh0)#lg7j+A_Y>tO0iK{I@2yBdrz4b@p}9I6yKc5-Kv=q7BkeUetEinUn(`-x~PEZ
zrP+ty|9RC;f1TF$aBlW*8C#|2k@YpJmREs8=kbI&T*rVR0}2B~=pd(~a-b|PFm%c@
z^GZ^S^l~#R(4!tp0GXb4<Z3YBVL7mS{fo7tSL_`AIM*v|Wb3)I%2RZHzMie_nRmyG
zy$#uG(~Nq)JNKMZOQ<mXdTN{OY`0<oorjS^M;TI!KkpGrx7cuPw*~hi<&TFh9xm0q
zc`hWz(<}7vA5gqjG(ED22f7X9z5s7VCJ|=b*%hb+4Bk3|D55hj#86oFMb2`d`~U+>
z8eI{F5}%pzxfzsiVc@OfYJ~B`<ziHKBWD0qcYi@On7CXGb2lhhK)DDx1%YxA3@mB9
v$_R`ZqVp88xuEoi9KWFS2LnqQKQjSios`rV;LXYg(#{5i@<7dNnL#`NH3`j~

literal 1360
zcmWIWW@Zs#U|`^2Fp~HcQPK3sA|A*q2V!0Z8HV!Aypq%+z1++Sy{zKU5Kac>52=gO
z^a59;l~!;wFtU7QWMBYmH$Cmh)nLHGa$xuR7i&eY*g5=hu2<N|)^lZ*r|A5AJzL!~
z?~WOJ8?x7?8TEX3?m4HHP+|D>)Hd1KZp8vR4<m(+GNcxN-XoN5vEkZo3+_eA9}itT
zT&j8VTu6+kSLokA0VuAVQq11C59mTupzT~hR|e#irf25q6=W3Pb7E}&!K}ju0xs`=
zb?ww_yd>{2Ym(V@2ZfzSEl+&fCU~Oj!#ag!Kkh5vT&p;Da@m&~Gh_E3&vr4;Ei{?7
zq5S(R7oFQvgE~2n&uhK)>auj&qgM|uZ|9b8)BJxsDQS~K`N9i-dRqhRxgrg(-ixeR
znsD?k(<6>I9zCD;MD(3;5i3<$$!&4oZKB>^lY3?tcFKF%=X^bFd|BZ3xucT|7rI||
z^WR^2;<(9*>Lm|YCYgVD{hwFu<kxGq&tFLHTyyOC0=BOVpb+2!`k4V7PhbX=U<Zak
zVsUY5NwGfM`=D4tiy>44{>b(VvH}eNVL^ledg+-Zndy1?MXC6VO35rP;X*YJ*+JY0
z^NNd-2|5aq`q=evJ!t}(v>nw^AVU%h3J9b?-`>+)OolwJ-~V>)7Q9rs`t-(s9Xmc;
zoam5wszk))+5Oy70sbeY#h$mA%&fiz*FLSVvgXz=E%-iT@u|bEHB**|uT{EaP`yV)
zsJTZWUEP3Zm)+F42X~#0jeK=<%0tGI8zDF3q<?RCJXxdWoIx1JulqA2@0t4L9ohB&
zZQ9qfo0l!w#~9$v$Rx*%@D6Hbk^l!0FvT)#X#_FRvKA{OYhgqhs*$KEAKA!dKqHa!
z0Y39^r6Y)W3=9Gce;ro<T?$WC#2JQ~rjQ-?5@8r}3M0-~P+-9THv_U8Et%kMgd{Y4
j1|s4GHJKs1vkuijSfayaEGrwxU2H)39_T@DW)Kemh&h?#

diff --git a/modules/system/tests/fixtures/plugin-archives/single-plugin-nested.zip b/modules/system/tests/fixtures/plugin-archives/single-plugin-nested.zip
index 58bc4766e44a7ac412201eec3999f0bf308efe8f..f54325ad1a639e7e9f20150bb424663722559bf3 100644
GIT binary patch
literal 1730
zcmWIWW@Zs#0D(`t{ziZqP=bv?fuSU|xFk_OG=!Id{YJ%#v>Vkc)4Zxyrj=H3GcdAz
zWn^Fg>kR;#!NI_RVn#X89AUT_<(YXUsYQCZnH73j#c%^bhG8+#^t2;ag8>iAf!*t0
ztQEat=kUk5UST6!&y`i4qVx0hY<17PJ7(-{$X=Uf)briB=bTzXh2hsz+hk|E6$|J*
zj1)S`kXrnCk5IbBhHJYmxECpZJaqAJspiddAu*m_p@07bc(Zd<G(ED22f7gCN`(81
zdjG-0z!B&@0l51Ea!S)P^YjWb3c!wE33T{%U}%77w9ts{Kbv>RK%nJ)UDr;@C9Cug
z%+Gk((ZXVW=%B^zq?3lz%5_;4@6ENyRNh*=>G=J3J<nHH^l~gy>^mm3ZLLaj>#J8D
zI<IF2&E#yi<~F^$-2BXutM{Jgi`(%8f6wdgJjk@wY2m-UVotUqR!3_-o_nOtuKi9-
zpgO@hY0mSLThiG!X-s?~QXti<6dRSLGwnjM_mpW7uea|{@y(gst(qxeF+;8Dm#6FZ
zrBc(aiwc-tntk~FpI7bl*J*7J=Vt$wu~m8=Szohic@-llj2=&z!*vW8KA@0*gb|Q~
z62~AuFFcGAi;GiBiV?}>8Y#(z6=;+=x>0)RnI)O&dHF@D@FW9Dhggz~_emYShfF|c
zvUB{A?H6PRng%ivx3dM&?J6!xMmYT@c3TiB1v$5D$L4g9aft;5M5K1#-qT!6hCHs{
z|90&byi~dR^u~W3J3d^T=#Y7;M8xIU{oGOk{wJlyp0}9HtiA=;KCQ5_=GHGQ_&#It
zsl%={Q<jLYRk~zQy+=f-xkn*g-GFD8-PE}Ucb$%ne06lnL&lODAvffte{Xm^S)=Bh
zK^Vuc`!gf&nfm1&+4cWz+Sjw2mo3=`j%;@QTThyR9szkKz?+dtgc*0S08|17ZyiAt
zv4sT0Ojt32oB=__1Pm-`bb*^mQlSBJG{^!_K1NQxpnMDiOBz`iVU8v~SHnyPnSvbm
zAU-Guz`$Ea4JMfBMCS+8kU>trpd0}MOB##OjV3;S;B!AHE5N{8$NT7(5SKAf{eYaB
eQ2n6Cj21k^XOsYMRyL43*@196(3PSrARYirEeYKK

literal 1572
zcmWIWW@h1H00AS3UlCvilwf0!VJJy0E=kl64dG;9{*byj4TMW8xEUB(zA`c}u!sOv
z1_1SgXb!Ocil#>v@jzZV5DUZgmuKdcq!#JrW>)BB6~hhF3tWM2nCWRpt_A}hmIJ%j
zzgR1J#m?c6bG^bwww^1iJVoc{>)Gm_d3Vg%+mO9B&8X+QbI&=ogbKs2r?$z?b}JUp
zc^D~llp(eF^B$peiw)OyTW~K@{&?u(;Zn_;=R#sUy+Z%~L3QhtV)n*;KzEt~y&?d2
zYd}tEdS;$pK}G>ShsO3F%sOl!;PU=g*G|pGOY$DGCYfD#P}q6Y^2DcYf+xB@tW#L_
z<G%9EwTg2mmwmZ0Gj{*+Y!?IFLX&A5%D=yI(YZY}sFU;fyw+Q<E=#99diCJ)c5eAL
z&HuNPk~TS%FTC)lw>7|?E7I`ly~vuS2}kcTJ>q!d(ersvMBf<~u~L<l+!p8EChGk)
zxo37^r@WVa&ezk%mj!O0J37g5q5EYw|NWIGj+?BgUh;rtlKF?%|9RC;e!XV<{DtJs
zHOHPWVEYP=GwgBB3lE3H;^NejVuDeRFy@bJzaT3xI6+t(-59;}%#zIXy!@h6c&K7Y
zODUPfC0w9LLYN9P3=Ra*O)V};Cg?y!+GN+i^`r@C*mfYsa3IL2#DW3>>C?COG#8U0
zkL&lpUAqM@Rjxk0@n6S|4;LpoWS%M!ad~z>w^V@tNold?EhaOoZ^5-sE3B-!^-BxB
z&scowuxrhfCE{z9E*Vts5fN(cQAk%e;Mrw2b?(7kr(+{u9i8%!vE)X`4LRxG8y-*A
zs5xg4#_{X^%*cDDetAcB{ePSG_3Y+lOZG7acr!A|F=G!OHU<f3SP3xvbp$bC*_RcP
zeKE2w$Sgzvp=Mr)S-`x(u%*!fZWdZrCeC2goQ7=h8@R#9`3|3{*uBn+;`J{;S3|rG
zPsPL;iJFFy9cs;lW+ZZoCeCo6SK&Yq#k~{J4TmIbe8wVT4K-OKyZH__V_}ILm*K2z
QAV;zTVLVX#dS(z003egj4gdfE


From 03270d424c2227413153b0c85ad61618ac074e19 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Tue, 30 Jul 2024 19:03:19 -0600
Subject: [PATCH 10/13] Initial working install method for plugin:install
 command

---
 modules/system/console/PluginInstall.php | 74 ++++++++++++++++++++----
 1 file changed, 63 insertions(+), 11 deletions(-)

diff --git a/modules/system/console/PluginInstall.php b/modules/system/console/PluginInstall.php
index ec117450f3..9a6bbfc44f 100644
--- a/modules/system/console/PluginInstall.php
+++ b/modules/system/console/PluginInstall.php
@@ -3,6 +3,7 @@
 use Winter\Storm\Console\Command;
 use System\Classes\UpdateManager;
 use System\Classes\PluginManager;
+use Throwable;
 use Winter\Storm\Support\Facades\File;
 use Winter\Storm\Support\Str;
 
@@ -50,6 +51,7 @@ public function handle(): int
             $tempPath = temp_path('packages/' . md5($packageZip));
 
             // @TODO: Testing only
+            File::deleteDirectory($tempPath);
             File::copy(base_path('plugin-test.zip'), $packageZip);
 
             // Check if the file exists
@@ -61,15 +63,69 @@ public function handle(): int
             // Attempt to extract the plugin
             $manager->extractArchive($packageZip, $tempPath);
 
-            // Look for the Plugin.php file
-            $pluginFile = $tempPath . '/Plugin.php';
-            if (!File::exists($pluginFile)) {
-                $this->output->writeln(sprintf('<error>File not found: %s</error>', $pluginFile));
+            // Look for plugins to install
+            $plugins = $manager->findPluginsInPath($tempPath);
+
+            if (empty($plugins)) {
+                $this->output->writeln(sprintf('<error>No plugins found in: %s</error>', $pluginName));
                 return 1;
             }
 
+            if (!$this->confirm(sprintf('Detected the following plugins in %s: %s. Would you like to install them all?', $pluginName, Str::join(array_keys($plugins))))) {
+                return 0;
+            };
+
+            $pluginManager = PluginManager::instance();
+
+            foreach ($plugins as $code => $pluginClassFile) {
+                // @TODO: Check if plugin is already installed
+                if ($pluginManager->findByIdentifier($code)) {
+                    if (!$this->confirm(sprintf(
+                        'Plugin %s is already installed. Would you like to replace the currently installed version with the one found in %s?',
+                        $code,
+                        $pluginName
+                    ))) {
+                        $this->output->writeln(sprintf('<info>Skipping plugin: %s</info>', $code));
+                        unset($plugins[$code]);
+                        continue;
+                    }
+                }
+
+                $this->output->writeln(sprintf('<info>Installing plugin: %s</info>', $code));
+                $pluginDir = plugins_path(strtolower(str_replace('.', DIRECTORY_SEPARATOR, $code)));
+
+                try {
+                    // Copy the files
+                    File::copyDirectory(pathinfo($pluginClassFile, PATHINFO_DIRNAME), $pluginDir);
+
+                    // Load the plugin
+                    $pluginManager->loadPlugins();
+                    $plugin = $pluginManager->findByIdentifier($code);
+                    $pluginManager->registerPlugin($plugin, $code);
+
+                    $pluginManager->clearFlagCache();
+                    $pluginManager->loadPluginFlags();
+
+                    $pluginsToMigrate[] = $code;
+
+                    // Run any pending migrations for the plugin
+                    // @TODO: May have to add some logic here to just run all pending migrations after completing installing all of the plugins
+                    // to account for dependencies. Something else to consider is how we abort a plugin that fails to migrate.
+                    $manager->updatePlugin($code);
+
+                    $this->output->writeln('');
+                } catch (Throwable $e) {
+                    $this->output->writeln(sprintf('<error>Error installing plugin: %s</error>', $code));
+                    $this->output->writeln(sprintf('<error>%s</error>', $e->getMessage()));
+                    File::deleteDirectory($pluginDir);
+
+                    return 1;
+                }
+            }
+
+            $this->output->success(sprintf('Successfully installed %d plugin(s) from %s', count($plugins), $pluginName));
 
-            return 1;
+            return 0;
         }
 
         $pluginDetails = $manager->requestPluginDetails($pluginName);
@@ -83,17 +139,13 @@ public function handle(): int
         $this->output->writeln(sprintf('<info>Unpacking plugin: %s</info>', $code));
         $manager->extractPlugin($code, $hash);
 
-        /*
-         * Make sure plugin is registered
-         */
+        // Make sure plugin is registered
         $pluginManager = PluginManager::instance();
         $pluginManager->loadPlugins();
         $plugin = $pluginManager->findByIdentifier($code);
         $pluginManager->registerPlugin($plugin, $code);
 
-        /*
-         * Migrate plugin
-         */
+        // Migrate plugin
         $this->output->writeln(sprintf('<info>Migrating plugin...</info>', $code));
         $manager->updatePlugin($code);
 

From bb95ba6a338a99091ec03e0243c575a1edd777be Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Tue, 30 Jul 2024 19:12:15 -0600
Subject: [PATCH 11/13] Hopefully fix windows tests

---
 modules/system/tests/classes/UpdateManagerTest.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/system/tests/classes/UpdateManagerTest.php b/modules/system/tests/classes/UpdateManagerTest.php
index eb3e836844..9132a9e48c 100644
--- a/modules/system/tests/classes/UpdateManagerTest.php
+++ b/modules/system/tests/classes/UpdateManagerTest.php
@@ -2,8 +2,6 @@
 
 namespace System\Tests\Classes;
 
-use RecursiveDirectoryIterator;
-use RecursiveIteratorIterator;
 use System\Tests\Bootstrap\TestCase;
 use System\Classes\UpdateManager;
 use Winter\Storm\Support\Facades\File;
@@ -88,7 +86,7 @@ public function testExtractPlugins($zipFile, $expectedPaths)
         // Normalize paths to make sure comparison is correct regardless of OS
         $normalizedPluginPaths = array_map('realpath', $pluginPaths);
         $normalizedExpectedPaths = array_map(function ($path) use ($tempPath) {
-            return $tempPath . $path;
+            return str_replace(['/', '\\'], DIRECTORY_SEPARATOR, $tempPath . $path);
         }, $expectedPaths);
 
         $this->assertEquals($normalizedExpectedPaths, $normalizedPluginPaths);

From 46c1a8363c348b911a423607bee9144c9af64efa Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Sun, 4 Aug 2024 00:30:35 -0600
Subject: [PATCH 12/13] WIP for retrieving the uploaded file from the plugin
 uploader modal

---
 modules/system/controllers/Updates.php        | 28 +++++++++++++++++++
 .../updates/_popup_upload_plugin.php          |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/modules/system/controllers/Updates.php b/modules/system/controllers/Updates.php
index fbb0eeba49..dd7a68e466 100644
--- a/modules/system/controllers/Updates.php
+++ b/modules/system/controllers/Updates.php
@@ -19,11 +19,13 @@
 use System\Models\Parameter;
 use System\Models\PluginVersion;
 use Winter\Storm\Database\Model;
+use Winter\Storm\Database\Models\DeferredBinding;
 use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Support\Facades\File;
 use Winter\Storm\Support\Facades\Flash;
 use Winter\Storm\Support\Facades\Html;
 use Winter\Storm\Support\Facades\Markdown;
+use Winter\Storm\Support\Str;
 
 /**
  * Updates controller
@@ -794,7 +796,31 @@ public function onLoadPluginUploader(): string
     public function onInstallUploadedPlugin(): string
     {
         try {
+            // Get the deferred binding record for the uploaded file
+            $widget = $this->getPackageUploadWidget();
+            $class = Str::before(get_class($widget->model), chr(0));
+            $deferred = DeferredBinding::query()
+                ->where('master_type', 'LIKE', str_replace('\\', '\\\\', $class) . '%')
+                ->where('master_field', 'uploaded_package')
+                ->where('session_key', $widget->getSessionKey())
+                ->first();
+
+            // Attempt to get the file from the deferred binding
+            if (!$deferred || !$deferred->slave) {
+                throw new ApplicationException(Lang::get('system::lang.server.response_invalid'));
+            }
+            $file = $deferred->slave;
+
+            /**
+             * @TODO:
+             * - Process the uploaded file to identify the plugins to install
+             * - (optional) require confirmation to install each detected plugin
+             * - Install the identified plugins
+             * - Ensure that deferred binding records and uploaded files are removed post processing or on failure
+             */
+
             $manager = UpdateManager::instance();
+
             $result = $manager->installUploadedPlugin();
 
             if (!isset($result['code']) || !isset($result['hash'])) {
@@ -824,6 +850,8 @@ public function onInstallUploadedPlugin(): string
             return $this->makePartial('execute');
         }
         catch (Exception $ex) {
+            // @TODO: Remove this, temporary debugging
+            throw $ex;
             $this->handleError($ex);
             return $this->makePartial('plugin_uploader');
         }
diff --git a/modules/system/controllers/updates/_popup_upload_plugin.php b/modules/system/controllers/updates/_popup_upload_plugin.php
index 5092dc4556..1a8827dc36 100644
--- a/modules/system/controllers/updates/_popup_upload_plugin.php
+++ b/modules/system/controllers/updates/_popup_upload_plugin.php
@@ -1,8 +1,8 @@
 <div id="pluginUploadPopup">
     <?= Form::ajax('onInstallUploadedPlugin', [
         'data-popup-load-indicator' => true,
-        'data-request-data' => 'type:plugin',
     ]) ?>
+        <input type="hidden" name="type" value="plugin">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
             <h4 class="modal-title"><?= e(trans('system::lang.plugins.upload')) ?></h4>

From 16638009792afd0533bb5e46629dbb4adc43ae1b Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Tue, 3 Dec 2024 15:56:40 -0600
Subject: [PATCH 13/13] Add theme upload form config

---
 modules/system/controllers/updates/form.theme_upload.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 modules/system/controllers/updates/form.theme_upload.yaml

diff --git a/modules/system/controllers/updates/form.theme_upload.yaml b/modules/system/controllers/updates/form.theme_upload.yaml
new file mode 100644
index 0000000000..d93b735ec4
--- /dev/null
+++ b/modules/system/controllers/updates/form.theme_upload.yaml
@@ -0,0 +1,6 @@
+fields:
+    uploaded_package:
+        type: fileupload
+        span: full
+        mode: file
+        fileTypes: zip