Merge branch 'wintercms:develop' into fix/artisan-migrate-force

Author: IsaiahPaget

modules/backend/widgets/lists/partials/_list_head_row.php

@@ -1,5 +1,5 @@
 <tr>
-    <?php if ($showCheckboxes): ?>
+    <?php if ($showCheckboxes && count($records)): ?>
         <th class="list-checkbox">
             <div class="checkbox custom-checkbox nolabel">
                 <input type="checkbox" id="<?= $this->getId('checkboxAll') ?>" />

modules/system/console/WinterEnv.php

@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use App;
 use Winter\Storm\Parse\EnvFile;
@@ -16,11 +18,21 @@
  */
 class WinterEnv extends Command
 {
+    use \Illuminate\Console\ConfirmableTrait;
+
     /**
      * The console command name.
      */
     protected $name = 'winter:env';
 
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'winter:env
+                            {--force : Force the operation to run when in production}';
+
     /**
      * The console command description.
      */
@@ -55,8 +67,12 @@ public function __construct()
     public function handle(): int
     {
         if (
-            file_exists($this->laravel->environmentFilePath())
-            && !$this->confirmToProceed()
+            !$this->confirmToProceed(
+                'The .env file already exists. Proceeding may overwrite some values!',
+                function () {
+                    return file_exists($this->laravel->environmentFilePath()) && $this->getLaravel()->environment() === 'production';
+                }
+            )
         ) {
             return 1;
         }
@@ -69,34 +85,6 @@ public function handle(): int
         return 0;
     }
 
-    /**
-     * Confirm before proceeding with the action.
-     *
-     * This method only asks for confirmation in production.
-     *
-     * @param  string  $warning
-     * @param  \Closure|bool|null  $callback
-     * @return bool
-     */
-    public function confirmToProceed($warning = 'Application In Production!', $callback = null)
-    {
-        if ($this->hasOption('force') && $this->option('force')) {
-            return true;
-        }
-
-        $this->alert('The .env file already exists. Proceeding may overwrite some values!');
-
-        $confirmed = $this->confirm('Do you really wish to run this command?');
-
-        if (!$confirmed) {
-            $this->comment('Command Canceled!');
-
-            return false;
-        }
-
-        return true;
-    }
-
     /**
      * Get the full path of a config file
      * @param string $config

modules/system/console/asset/AssetCreate.php

@@ -14,8 +14,9 @@
 
 abstract class AssetCreate extends Command
 {
-    protected const TYPE_THEME = 'theme';
+    protected const TYPE_MODULE = 'module';
     protected const TYPE_PLUGIN = 'plugin';
+    protected const TYPE_THEME = 'theme';
 
     /**
      * @var string The console command description.
@@ -114,6 +115,17 @@ protected function getPackagePathType(string $package): array
             return [null, null];
         }
 
+        if (str_starts_with($package, 'module-')) {
+            if (
+                ($modulePath = base_path('modules') . '/' . str_after($package, 'module-'))
+                && File::exists($modulePath)
+            ) {
+                return [$modulePath, static::TYPE_MODULE];
+            }
+
+            return [null, null];
+        }
+
         if ($plugin = PluginManager::instance()->findByIdentifier($package)) {
             return [$plugin->getPluginPath(), static::TYPE_PLUGIN];
         }