[9.x] Introducing a fresh new look for Artisan

composer.json

@@ -27,6 +27,7 @@
         "league/flysystem": "^3.0.16",
         "monolog/monolog": "^2.0",
         "nesbot/carbon": "^2.53.1",
+        "nunomaduro/termwind": "^1.13",
         "psr/container": "^1.1.1|^2.0.1",
         "psr/log": "^1.0|^2.0|^3.0",
         "psr/simple-cache": "^1.0|^2.0|^3.0",

src/Illuminate/Auth/Console/ClearResetsCommand.php

@@ -42,6 +42,6 @@ public function handle()
     {
         $this->laravel['auth.password']->broker($this->argument('name'))->getRepository()->deleteExpired();
 
-        $this->info('Expired reset tokens cleared successfully.');
+        $this->components->info('Expired reset tokens cleared successfully.');
     }
 }

src/Illuminate/Cache/Console/CacheTableCommand.php

@@ -73,7 +73,7 @@ public function handle()
 
         $this->files->put($fullPath, $this->files->get(__DIR__.'/stubs/cache.stub'));
 
-        $this->info('Migration created successfully.');
+        $this->components->info('Migration created successfully.');
 
         $this->composer->dumpAutoloads();
     }

src/Illuminate/Cache/Console/ClearCommand.php

@@ -82,14 +82,14 @@ public function handle()
         $this->flushFacades();
 
         if (! $successful) {
-            return $this->error('Failed to clear cache. Make sure you have the appropriate permissions.');
+            return $this->components->error('Failed to clear cache. Make sure you have the appropriate permissions.');
         }
 
         $this->laravel['events']->dispatch(
             'cache:cleared', [$this->argument('store'), $this->tags()]
         );
 
-        $this->info('Application cache cleared successfully.');
+        $this->components->info('Application cache cleared successfully.');
     }
 
     /**

src/Illuminate/Cache/Console/ForgetCommand.php

@@ -65,6 +65,6 @@ public function handle()
             $this->argument('key')
         );
 
-        $this->info('The ['.$this->argument('key').'] key has been removed from the cache.');
+        $this->components->info('The ['.$this->argument('key').'] key has been removed from the cache.');
     }
 }

src/Illuminate/Console/Command.php

@@ -2,6 +2,7 @@
 
 namespace Illuminate\Console;
 
+use Illuminate\Console\View\Components\Factory;
 use Illuminate\Support\Traits\Macroable;
 use Symfony\Component\Console\Command\Command as SymfonyCommand;
 use Symfony\Component\Console\Input\InputInterface;
@@ -117,6 +118,8 @@ public function run(InputInterface $input, OutputInterface $output): int
             OutputStyle::class, ['input' => $input, 'output' => $output]
         );
 
+        $this->components = new Factory($this->output);
+
         return parent::run(
             $this->input = $input, $this->output
         );

src/Illuminate/Console/Concerns/CreatesMatchingTest.php

@@ -28,17 +28,17 @@ protected function addTestOptions()
      * Create the matching test case if requested.
      *
      * @param  string  $path
-     * @return void
+     * @return bool
      */
     protected function handleTestCreation($path)
     {
         if (! $this->option('test') && ! $this->option('pest')) {
-            return;
+            return false;
         }
 
-        $this->call('make:test', [
+        return $this->callSilent('make:test', [
             'name' => Str::of($path)->after($this->laravel['path'])->beforeLast('.php')->append('Test')->replace('\\', '/'),
             '--pest' => $this->option('pest'),
-        ]);
+        ]) == 0;
     }
 }

src/Illuminate/Console/Concerns/InteractsWithIO.php

@@ -15,6 +15,15 @@
 
 trait InteractsWithIO
 {
+    /**
+     * The console components factory.
+     *
+     * @var \Illuminate\Console\View\Components\Factory
+     *
+     * @internal This property is not meant to be used or overwritten outside the framework.
+     */
+    protected $components;
+
     /**
      * The input interface implementation.
      *

src/Illuminate/Console/ConfirmableTrait.php

@@ -13,7 +13,7 @@ trait ConfirmableTrait
      * @param  \Closure|bool|null  $callback
      * @return bool
      */
-    public function confirmToProceed($warning = 'Application In Production!', $callback = null)
+    public function confirmToProceed($warning = 'Application In Production', $callback = null)
     {
         $callback = is_null($callback) ? $this->getDefaultConfirmCallback() : $callback;
 
@@ -24,12 +24,12 @@ public function confirmToProceed($warning = 'Application In Production!', $callb
                 return true;
             }
 
-            $this->alert($warning);
+            $this->components->alert($warning);
 
-            $confirmed = $this->confirm('Do you really wish to run this command?');
+            $confirmed = $this->components->confirm('Do you really wish to run this command?');
 
             if (! $confirmed) {
-                $this->comment('Command Canceled!');
+                $this->components->warn('Command canceled.');
 
                 return false;
             }

src/Illuminate/Console/Contracts/NewLineAware.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Illuminate\Console\Contracts;
+
+interface NewLineAware
+{
+    /**
+     * Whether a newline has already been written.
+     *
+     * @return bool
+     */
+    public function newLineWritten();
+}

src/Illuminate/Console/GeneratorCommand.php

@@ -147,7 +147,7 @@ public function handle()
         // language and that the class name will actually be valid. If it is not valid we
         // can error now and prevent from polluting the filesystem using invalid files.
         if ($this->isReservedName($this->getNameInput())) {
-            $this->error('The name "'.$this->getNameInput().'" is reserved by PHP.');
+            $this->components->error('The name "'.$this->getNameInput().'" is reserved by PHP.');
 
             return false;
         }
@@ -162,7 +162,7 @@ public function handle()
         if ((! $this->hasOption('force') ||
              ! $this->option('force')) &&
              $this->alreadyExists($this->getNameInput())) {
-            $this->error($this->type.' already exists!');
+            $this->components->error($this->type.' already exists.');
 
             return false;
         }
@@ -174,11 +174,15 @@ public function handle()
 
         $this->files->put($path, $this->sortImports($this->buildClass($name)));
 
-        $this->info($this->type.' created successfully.');
+        $info = $this->type;
 
         if (in_array(CreatesMatchingTest::class, class_uses_recursive($this))) {
-            $this->handleTestCreation($path);
+            if ($this->handleTestCreation($path)) {
+                $info .= ' and test';
+            }
         }
+
+        $this->components->info($info.' created successfully.');
     }
 
     /**

src/Illuminate/Console/OutputStyle.php

@@ -2,11 +2,12 @@
 
 namespace Illuminate\Console;
 
+use Illuminate\Console\Contracts\NewLineAware;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
-class OutputStyle extends SymfonyStyle
+class OutputStyle extends SymfonyStyle implements NewLineAware
 {
     /**
      * The output instance.
@@ -15,6 +16,13 @@ class OutputStyle extends SymfonyStyle
      */
     private $output;
 
+    /**
+     * If the last output written wrote a new line.
+     *
+     * @var bool
+     */
+    protected $newLineWritten = false;
+
     /**
      * Create a new Console OutputStyle instance.
      *
@@ -29,6 +37,48 @@ public function __construct(InputInterface $input, OutputInterface $output)
         parent::__construct($input, $output);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function write(string|iterable $messages, bool $newline = false, int $options = 0)
+    {
+        $this->newLineWritten = $newline;
+
+        parent::write($messages, $newline, $options);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function writeln(string|iterable $messages, int $type = self::OUTPUT_NORMAL)
+    {
+        $this->newLineWritten = true;
+
+        parent::writeln($messages, $type);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function newLine(int $count = 1)
+    {
+        $this->newLineWritten = $count > 0;
+
+        parent::newLine($count);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function newLineWritten()
+    {
+        if ($this->output instanceof static && $this->output->newLineWritten()) {
+            return true;
+        }
+
+        return $this->newLineWritten;
+    }
+
     /**
      * Returns whether verbosity is quiet (-q).
      *

src/Illuminate/Console/QuestionHelper.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace Illuminate\Console;
+
+use Illuminate\Console\View\Components\TwoColumnDetail;
+use Symfony\Component\Console\Formatter\OutputFormatter;
+use Symfony\Component\Console\Helper\SymfonyQuestionHelper;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\ChoiceQuestion;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
+use Symfony\Component\Console\Question\Question;
+
+class QuestionHelper extends SymfonyQuestionHelper
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function writePrompt(OutputInterface $output, Question $question)
+    {
+        $text = OutputFormatter::escapeTrailingBackslash($question->getQuestion());
+
+        $text = $this->ensureEndsWithPunctuation($text);
+
+        $text = "  <fg=default;options=bold>$text</></>";
+
+        $default = $question->getDefault();
+
+        if ($question->isMultiline()) {
+            $text .= sprintf(' (press %s to continue)', 'Windows' == PHP_OS_FAMILY
+                ? '<comment>Ctrl+Z</comment> then <comment>Enter</comment>'
+                : '<comment>Ctrl+D</comment>');
+        }
+
+        switch (true) {
+            case null === $default:
+                $text = sprintf('<info>%s</info>', $text);
+
+                break;
+
+            case $question instanceof ConfirmationQuestion:
+                $text = sprintf('<info>%s (yes/no)</info> [<comment>%s</comment>]', $text, $default ? 'yes' : 'no');
+
+                break;
+
+            case $question instanceof ChoiceQuestion:
+                $choices = $question->getChoices();
+                $text = sprintf('<info>%s</info> [<comment>%s</comment>]', $text, OutputFormatter::escape($choices[$default] ?? $default));
+
+                break;
+        }
+
+        $output->writeln($text);
+
+        if ($question instanceof ChoiceQuestion) {
+            foreach ($question->getChoices() as $key => $value) {
+                with(new TwoColumnDetail($output))->render($value, $key);
+            }
+        }
+
+        $output->write('<options=bold>❯ </>');
+    }
+
+    /**
+     * Ensures the given string ends with punctuation.
+     *
+     * @param  string  $string
+     * @return string
+     */
+    protected function ensureEndsWithPunctuation($string)
+    {
+        if (! str($string)->endsWith(['?', ':', '!', '.'])) {
+            return "$string:";
+        }
+
+        return $string;
+    }
+}

src/Illuminate/Console/Scheduling/Schedule.php

@@ -22,11 +22,17 @@ class Schedule
     use Macroable;
 
     const SUNDAY = 0;
+
     const MONDAY = 1;
+
     const TUESDAY = 2;
+
     const WEDNESDAY = 3;
+
     const THURSDAY = 4;
+
     const FRIDAY = 5;
+
     const SATURDAY = 6;
 
     /**

src/Illuminate/Console/Scheduling/ScheduleClearCacheCommand.php

@@ -32,7 +32,7 @@ public function handle(Schedule $schedule)
 
         foreach ($schedule->events($this->laravel) as $event) {
             if ($event->mutex->exists($event)) {
-                $this->line('<info>Deleting mutex for:</info> '.$event->command);
+                $this->components->info(sprintf('Deleting mutex for [%s]', $event->command));
 
                 $event->mutex->forget($event);
 
@@ -41,7 +41,7 @@ public function handle(Schedule $schedule)
         }
 
         if (! $mutexCleared) {
-            $this->info('No mutex files were found.');
+            $this->components->info('No mutex files were found.');
         }
     }
 }

src/Illuminate/Console/Scheduling/ScheduleListCommand.php

@@ -61,7 +61,7 @@ public function handle(Schedule $schedule)
         $events = collect($schedule->events());
 
         if ($events->isEmpty()) {
-            $this->comment('No scheduled tasks have been defined.');
+            $this->components->info('No scheduled tasks have been defined.');
 
             return;
         }