Merge branch 'dane/self-update' into develop

Author: DaneEveritt

app/Console/Commands/Maintenance/PruneOrphanedBackupsCommand.php

@@ -12,7 +12,7 @@ class PruneOrphanedBackupsCommand extends Command
     /**
      * @var string
      */
-    protected $signature = 'p:maintenance:prune-backups {--since-minutes=30}';
+    protected $signature = 'p:maintenance:prune-backups {--prune-age=}';
 
     /**
      * @var string
@@ -21,9 +21,9 @@ class PruneOrphanedBackupsCommand extends Command
 
     public function handle(BackupRepository $repository)
     {
-        $since = $this->option('since-minutes');
-        if (!is_digit($since)) {
-            throw new InvalidArgumentException('The --since-minutes option must be a valid numeric digit.');
+        $since = $this->option('prune-age') ?? config('backups.prune_age', 360);
+        if (!$since || !is_digit($since)) {
+            throw new InvalidArgumentException('The "--prune-age" argument must be a value greater than 0.');
         }
 
         $query = $repository->getBuilder()

app/Console/Commands/Migration/CleanOrphanedApiKeysCommand.php

@@ -13,12 +13,12 @@ class KeyGenerateCommand extends BaseKeyGenerateCommand
     public function handle()
     {
         if (!empty(config('app.key')) && $this->input->isInteractive()) {
-            $this->output->warning(trans('command/messages.key.warning'));
-            if (!$this->confirm(trans('command/messages.key.confirm'))) {
+            $this->output->warning('It appears you have already configured an application encryption key. Continuing with this process with overwrite that key and cause data corruption for any existing encrypted data. DO NOT CONTINUE UNLESS YOU KNOW WHAT YOU ARE DOING.');
+            if (!$this->confirm('I understand the consequences of performing this command and accept all responsibility for the loss of encrypted data.')) {
                 return;
             }
 
-            if (!$this->confirm(trans('command/messages.key.final_confirm'))) {
+            if (!$this->confirm('Are you sure you wish to continue? Changing the application encryption key WILL CAUSE DATA LOSS.')) {
                 return;
             }
         }

app/Console/Commands/Overrides/KeyGenerateCommand.php

@@ -10,17 +10,17 @@ class SeedCommand extends BaseSeedCommand
     use RequiresDatabaseMigrations;
 
     /**
-     * Block someone from running this seed command if they have not completed the migration
-     * process.
-     *
-     * @return int
+     * Block someone from running this seed command if they have not completed
+     * the migration process.
      */
     public function handle()
     {
         if (!$this->hasCompletedMigrations()) {
-            return $this->showMigrationWarning();
+            $this->showMigrationWarning();
+
+            return;
         }
 
-        return parent::handle();
+        parent::handle();
     }
 }

app/Console/Commands/Overrides/SeedCommand.php

@@ -10,14 +10,17 @@ class UpCommand extends BaseUpCommand
     use RequiresDatabaseMigrations;
 
     /**
-     * @return bool|int
+     * Block someone from running this up command if they have not completed
+     * the migration process.
      */
     public function handle()
     {
         if (!$this->hasCompletedMigrations()) {
-            return $this->showMigrationWarning();
+            $this->showMigrationWarning();
+
+            return;
         }
 
-        return parent::handle();
+        parent::handle();
     }
 }