Move CMS console commands into the CMS module

Moved the following:
- \System\Console\ThemeInstall -> \Cms\Console\ThemeInstall
- \System\Console\ThemeRemove -> \Cms\Console\ThemeRemove
- \System\Console\ThemeList -> \Cms\Console\ThemeList
- \System\Console\ThemeUse -> \Cms\Console\ThemeUse
- \System\Console\ThemeSync -> \Cms\Console\ThemeSync

Author: LukeTowers

artisan

@@ -9,7 +9,7 @@
 | Composer provides a convenient, automatically generated class loader
 | for our application. We just need to utilize it! We'll require it
 | into the script here so that we do not have to worry about the
-| loading of any our classes "manually". Feels great to relax.
+| loading of any of our classes manually. It's great to relax.
 |
 */
 
@@ -40,7 +40,7 @@ $status = $kernel->handle(
 | Shutdown The Application
 |--------------------------------------------------------------------------
 |
-| Once Artisan has finished running. We will fire off the shutdown events
+| Once Artisan has finished running, we will fire off the shutdown events
 | so that any final work may be done by the application before we shut
 | down the process. This is the last thing to happen to the request.
 |

modules/cms/ServiceProvider.php

@@ -32,6 +32,7 @@ public function register()
     {
         parent::register('cms');
 
+        $this->registerConsole();
         $this->registerAssetBundles();
         $this->registerComponents();
         $this->registerThemeLogging();
@@ -67,6 +68,18 @@ public function boot()
         }
     }
 
+    /**
+     * Register command line specifics
+     */
+    protected function registerConsole()
+    {
+        $this->registerConsoleCommand('theme.install', \Cms\Console\ThemeInstall::class);
+        $this->registerConsoleCommand('theme.remove', \Cms\Console\ThemeRemove::class);
+        $this->registerConsoleCommand('theme.list', \Cms\Console\ThemeList::class);
+        $this->registerConsoleCommand('theme.use', \Cms\Console\ThemeUse::class);
+        $this->registerConsoleCommand('theme.sync', \Cms\Console\ThemeSync::class);
+    }
+
     /**
      * Register asset bundles
      */

modules/system/console/ThemeInstall.php modules/cms/console/ThemeInstall.php

@@ -1,4 +1,4 @@
-<?php namespace System\Console;
+<?php namespace Cms\Console;
 
 use File;
 use Cms\Classes\Theme;
@@ -13,7 +13,7 @@
  *
  * This adds a new theme by requesting it from the Winter marketplace.
  *
- * @package winter\wn-system-module
+ * @package winter\wn-cms-module
  * @author Alexey Bobkov, Samuel Georges
  */
 class ThemeInstall extends Command
@@ -36,6 +36,10 @@ class ThemeInstall extends Command
      */
     public function handle()
     {
+        echo 'wtf';
+        \Winter\Storm\Network\Http::post('https://google.com/');
+
+
         $themeName = $this->argument('name');
         $argDirName = $this->argument('dirName');
 
@@ -59,10 +63,14 @@ public function handle()
 
             $themeDetails = $updateManager->requestThemeDetails($themeName);
 
+            dd('after requestThemeDetails');
+
             if ($themeManager->isInstalled($themeDetails['code'])) {
                 return $this->error(sprintf('The theme %s is already installed.', $themeDetails['code']));
             }
 
+            dd($themeName);
+
             if (Theme::exists($themeDetails['code'])) {
                 return $this->error(sprintf('A theme named %s already exists.', $themeDetails['code']));
             }
@@ -81,6 +89,8 @@ public function handle()
                 return;
             }
 
+            dd($themeName);
+
             $this->info('Downloading theme...');
             $updateManager->downloadTheme($themeDetails['code'], $themeDetails['hash']);
 
@@ -104,12 +114,14 @@ public function handle()
 
                 $dirName = $argDirName;
             }
+            dd($themeName);
 
             $this->info(sprintf('The theme %s has been installed. (now %s)', $themeDetails['code'], $dirName));
-        }
-        catch (Exception $ex) {
+        } catch (\Throwable $ex) {
             $this->error($ex->getMessage());
         }
+
+        dd($themeName);
     }
 
     /**

modules/system/console/ThemeList.php modules/cms/console/ThemeList.php

@@ -1,4 +1,4 @@
-<?php namespace System\Console;
+<?php namespace Cms\Console;
 
 use Illuminate\Console\Command;
 use Symfony\Component\Console\Input\InputOption;
@@ -11,7 +11,7 @@
  *
  * This lists all the available themes in the system. It also shows the active theme.
  *
- * @package winter\wn-system-module
+ * @package winter\wn-cms-module
  * @author Alexey Bobkov, Samuel Georges
  */
 class ThemeList extends Command

modules/system/console/ThemeRemove.php modules/cms/console/ThemeRemove.php

@@ -1,4 +1,4 @@
-<?php namespace System\Console;
+<?php namespace Cms\Console;
 
 use Cms\Classes\Theme;
 use Cms\Classes\ThemeManager;
@@ -12,7 +12,7 @@
  *
  * This completely deletes an existing theme, including all files and directories.
  *
- * @package winter\wn-system-module
+ * @package winter\wn-cms-module
  * @author Alexey Bobkov, Samuel Georges
  */
 class ThemeRemove extends Command

modules/system/console/ThemeSync.php modules/cms/console/ThemeSync.php

@@ -1,4 +1,4 @@
-<?php namespace System\Console;
+<?php namespace Cms\Console;
 
 use App;
 use Event;
@@ -19,7 +19,7 @@
  * - --target defaults to "filesystem", the source will whichever of filesystem vs database is not the target
  * - --force bypasses the confirmation request
  *
- * @package winter\wn-system-module
+ * @package winter\wn-cms-module
  * @author Luke Towers
  */
 class ThemeSync extends Command

modules/system/console/ThemeUse.php modules/cms/console/ThemeUse.php

@@ -1,4 +1,4 @@
-<?php namespace System\Console;
+<?php namespace Cms\Console;
 
 use Cms\Classes\Theme;
 use Illuminate\Console\Command;
@@ -10,7 +10,7 @@
  *
  * This switches the active theme to another one, saved to the database.
  *
- * @package winter\wn-system-module
+ * @package winter\wn-cms-module
  * @author Alexey Bobkov, Samuel Georges
  */
 class ThemeUse extends Command

modules/system/ServiceProvider.php

@@ -271,12 +271,6 @@ protected function registerConsole()
         $this->registerConsoleCommand('plugin.refresh', 'System\Console\PluginRefresh');
         $this->registerConsoleCommand('plugin.rollback', 'System\Console\PluginRollback');
         $this->registerConsoleCommand('plugin.list', 'System\Console\PluginList');
-
-        $this->registerConsoleCommand('theme.install', 'System\Console\ThemeInstall');
-        $this->registerConsoleCommand('theme.remove', 'System\Console\ThemeRemove');
-        $this->registerConsoleCommand('theme.list', 'System\Console\ThemeList');
-        $this->registerConsoleCommand('theme.use', 'System\Console\ThemeUse');
-        $this->registerConsoleCommand('theme.sync', 'System\Console\ThemeSync');
     }
 
     /*

modules/system/classes/UpdateManager.php

@@ -890,10 +890,16 @@ public function setNotesOutput($output)
      */
     public function requestServerData($uri, $postData = [])
     {
-        $result = Http::post($this->createServerUrl($uri), function ($http) use ($postData) {
+        // dd(Http::class, (new \ReflectionClass(Http::class))->getFileName());
+
+        // dd($this->createServerUrl($uri));
+
+        $result = \Winter\Storm\Network\Http::post($this->createServerUrl($uri), function ($http) use ($postData) {
             $this->applyHttpAttributes($http, $postData);
         });
 
+        dd($result, 'after Http::post');
+
         if ($result->code == 404) {
             throw new ApplicationException(Lang::get('system::lang.server.response_not_found'));
         }