Merge pull request #23 from blitz-php/devs

patch: amelioration de la methode "justify" du CLI

Author: dimtrovich

src/Cli/Console/Command.php

@@ -562,31 +562,37 @@ final public function progress(?int $total = null): ProgressBar
      */
     final public function justify(string $first, ?string $second = '', array $options = []): self
     {
+        $second = trim($second);
+        $first  = trim($first);
+
+        $start = $first;
+        $end   = $second;
+
         $options = [
             'first'  => $options['first'] ?? [],
             'second' => ($options['second'] ?? []) + ['bold' => 1],
             'sep'    => (string) ($options['sep'] ?? '.'),
         ];
 
-        $second = trim((string) $second);
-        $first  = trim($first);
+        if (preg_match('/(\\x1b(?:.+)m)/U', $first, $matches)) {
+            $first = str_replace($matches[1], '', $first);
+            $first = preg_replace('/\\x1b\[0m/', '', $first);
+        }
+        if (preg_match('/(\\x1b(?:.+)m)/U', $second, $matches)) {
+            $second = str_replace($matches[1], '', $second);
+            $second = preg_replace('/\\x1b\[0m/', '', $second);
+        }
 
         $firstLength  = strlen($first);
         $secondLength = strlen($second);
 
-        if (preg_match('/^\\x1b(?:.+)m(.+)\\x1b(?:.+)m$/', $first, $matches)) {
-            $firstLength = strlen($matches[1]);
-        }
-        if (preg_match('/^\\x1b(?:.+)m(.+)\\x1b(?:.+)m$/', $second, $matches)) {
-            $secondLength = strlen($matches[1]);
-        }
-
         $dashWidth = ($this->terminal->width() ?: 100) - ($firstLength + $secondLength);
         $dashWidth -= $second === '' ? 1 : 2;
+        $dashWidth = $dashWidth < 0 ? 0 : $dashWidth;
 
-        $first = $this->color->line($first, $options['first']);
+        $first = $this->color->line($start, $options['first']);
         if ($second !== '') {
-            $second = $this->color->line($second, $options['second']);
+            $second = $this->color->line($end, $options['second']);
         }
 
         return $this->write($first . ' ' . str_repeat($options['sep'], $dashWidth) . ' ' . $second)->eol();
@@ -640,6 +646,6 @@ private function initProps()
         $this->reader   = $this->io->reader();
         $this->color    = $this->writer->colorizer();
         $this->cursor   = $this->writer->cursor();
-        $this->terminal = new Terminal();
+        $this->terminal = $this->writer->terminal();
     }
 }

src/Cli/Console/Console.php

@@ -288,13 +288,15 @@ private function addCommand(string $className, ?Logger $logger = null)
 
         $console = $this;
         $action  = function (?array $arguments = [], ?array $options = [], ?bool $suppress = null) use ($instance, $command, $console) {
+            $this->name(); // ne pas retirer. car en cas, d'absence, cs-fixer mettra cette fonction en static. Et php-cli generera une erreur
+
             foreach ($instance->required as $package) {
                 $package = explode(':', $package);
                 $version = $package[1] ?? null;
                 $package = $package[0];
 
                 /** @var Interactor $io */
-                $io = $this->io();
+                $io = $console->io();
 
                 if (! InstalledVersions::isInstalled($package)) {
                     $io->info('Cette commande nécessite le package "' . $package . '" mais vous ne l\'avez pas', true);