style: styleci

Author: adhocore

src/Helper/OutputHelper.php

@@ -19,6 +19,7 @@
 use Ahc\Cli\Input\Parameter;
 use Ahc\Cli\Output\Writer;
 use Throwable;
+
 use function array_map;
 use function array_shift;
 use function asort;
@@ -44,6 +45,7 @@
 use function trim;
 use function uasort;
 use function var_export;
+
 use const STR_PAD_LEFT;
 
 /**

src/Helper/Shell.php

@@ -13,7 +13,6 @@
 
 use Ahc\Cli\Exception\RuntimeException;
 
-use function defined;
 use function fclose;
 use function function_exists;
 use function fwrite;
@@ -25,10 +24,6 @@
 use function proc_terminate;
 use function stream_get_contents;
 use function stream_set_blocking;
-use function strtoupper;
-use function str_starts_with;
-
-use const DIRECTORY_SEPARATOR;
 
 /**
  * A thin proc_open wrapper to execute shell commands.

src/Helper/Terminal.php

@@ -18,7 +18,6 @@
 use function is_array;
 use function preg_match_all;
 
-
 /**
  * A thin to find some information about the current terminal (width, height, ect...).
  *
@@ -44,23 +43,23 @@ public static function isWindows(): bool
     }
 
     /**
-     * Get the width of the terminal
+     * Get the width of the terminal.
      */
     public function width(): ?int
     {
         return $this->getDimension('width');
     }
 
     /**
-     * Get the height of the terminal
+     * Get the height of the terminal.
      */
     public function height(): ?int
     {
         return $this->getDimension('height');
     }
 
     /**
-     * Get specified terminal dimension
+     * Get specified terminal dimension.
      */
     protected function getDimension(string $key): ?int
     {
@@ -77,7 +76,7 @@ protected function getDimension(string $key): ?int
     }
 
     /**
-     * Get information about the dimensions of the Windows terminal
+     * Get information about the dimensions of the Windows terminal.
      *
      * @codeCoverageIgnore
      *

src/Input/Command.php

@@ -20,6 +20,7 @@
 use Ahc\Cli\Output\ProgressBar;
 use Ahc\Cli\Output\Writer;
 use Closure;
+
 use function array_filter;
 use function array_keys;
 use function end;

src/Output/ProgressBar.php

@@ -17,7 +17,7 @@
 use function count;
 use function iterator_to_array;
 use function min;
-use function round ;
+use function round;
 use function str_repeat;
 use function strlen;
 use function trim;
@@ -30,37 +30,37 @@
 class ProgressBar
 {
     /**
-     * The total number of items involved
+     * The total number of items involved.
      */
     protected int $total = 0;
 
     /**
-     * The current item that the progress bar represents
+     * The current item that the progress bar represents.
      */
     protected int $current = 0;
 
     /**
-     * The current percentage displayed
+     * The current percentage displayed.
      */
     protected string $currentPercentage = '';
 
     /**
-     * The string length of the bar when at 100%
+     * The string length of the bar when at 100%.
      */
     protected int $barStrLen = 0;
 
     /**
-     * Flag indicating whether we are writing the bar for the first time
+     * Flag indicating whether we are writing the bar for the first time.
      */
     protected bool $firstLine = true;
 
     /**
-     * Current status bar label
+     * Current status bar label.
      */
     protected string $label = '';
 
     /**
-     * Options for progress bar
+     * Options for progress bar.
      */
     private array $options = [
         'pointer'    => '>',
@@ -70,7 +70,7 @@ class ProgressBar
     ];
 
     /**
-     * Force a redraw every time
+     * Force a redraw every time.
      */
     protected bool $forceRedraw = false;
 
@@ -86,7 +86,7 @@ class ProgressBar
     protected Terminal $terminal;
 
     /**
-     * If they pass in a total, set the total
+     * If they pass in a total, set the total.
      */
     public function __construct(?int $total = null, ?Writer $writer = null)
     {
@@ -100,7 +100,7 @@ public function __construct(?int $total = null, ?Writer $writer = null)
     }
 
     /**
-     * Set the total property
+     * Set the total property.
      */
     public function total(int $total): self
     {
@@ -110,7 +110,7 @@ public function total(int $total): self
     }
 
     /**
-     * Set progress bar options
+     * Set progress bar options.
      */
     public function option(string|array $key, ?string $value = null): self
     {
@@ -128,10 +128,11 @@ public function option(string|array $key, ?string $value = null): self
     }
 
     /**
-     * Determines the current percentage we are at and re-writes the progress bar
+     * Determines the current percentage we are at and re-writes the progress bar.
      *
-     * @return void
      * @throws UnexpectedValueException
+     *
+     * @return void
      */
     public function current(int $current, string $label = '')
     {
@@ -151,17 +152,17 @@ public function current(int $current, string $label = '')
     }
 
     /**
-     * Increments the current position we are at and re-writes the progress bar
+     * Increments the current position we are at and re-writes the progress bar.
      *
-     * @param integer $increment The number of items to increment by
+     * @param int $increment The number of items to increment by
      */
     public function advance(int $increment = 1, string $label = '')
     {
         $this->current($this->current + $increment, $label);
     }
 
     /**
-     * Force the progress bar to redraw every time regardless of whether it has changed or not
+     * Force the progress bar to redraw every time regardless of whether it has changed or not.
      */
     public function forceRedraw(bool $force = true): self
     {
@@ -170,11 +171,10 @@ public function forceRedraw(bool $force = true): self
         return $this;
     }
 
-
     /**
      * Update a progress bar using an iterable.
      *
-     * @param iterable $items Array or any other iterable object
+     * @param iterable $items    Array or any other iterable object
      * @param callable $callback A handler to run on each item
      */
     public function each($items, callable $callback = null)
@@ -196,9 +196,8 @@ public function each($items, callable $callback = null)
         }
     }
 
-
     /**
-     * Draw the progress bar, if necessary
+     * Draw the progress bar, if necessary.
      */
     protected function drawProgressBar(int $current, string $label)
     {
@@ -212,7 +211,7 @@ protected function drawProgressBar(int $current, string $label)
     }
 
     /**
-     * Build the progress bar str and return it
+     * Build the progress bar str and return it.
      */
     protected function getProgressBar(int $current, string $label): string
     {
@@ -226,8 +225,8 @@ protected function getProgressBar(int $current, string $label): string
         // Move the cursor up and clear it to the end
         $lines = $this->hasLabelLine ? 2 : 1;
         $bar   = $this->cursor->up($lines);
-        $bar  .= $this->cr() . $this->cursor->eraseLine();
-        $bar  .= $this->getProgressBarStr($current, $label);
+        $bar .= $this->cr() . $this->cursor->eraseLine();
+        $bar .= $this->getProgressBarStr($current, $label);
 
         // If this line has a label then set that this progress bar has a label line
         if (strlen($label) > 0) {
@@ -239,7 +238,7 @@ protected function getProgressBar(int $current, string $label): string
 
     /**
      * Get the progress bar string, basically:
-     * =============>             50% label
+     * =============>             50% label.
      */
     protected function getProgressBarStr(int $current, string $label): string
     {
@@ -256,14 +255,14 @@ protected function getProgressBarStr(int $current, string $label): string
             $label = $this->labelFormatted('');
         }
 
-        $bar   = '<' . $this->options['color'] . '>' . $bar . ' ' . $number. '</end>';
+        $bar   = '<' . $this->options['color'] . '>' . $bar . ' ' . $number . '</end>';
         $label = '<' . $this->options['labelColor'] . '>' . $label . '</end>';
 
         return trim($bar . $label);
     }
 
     /**
-     * Get the string for the actual bar based on the current length
+     * Get the string for the actual bar based on the current length.
      */
     protected function getBar(int $length): string
     {
@@ -274,7 +273,7 @@ protected function getBar(int $length): string
     }
 
     /**
-     * Get the length of the bar string based on the width of the terminal window
+     * Get the length of the bar string based on the width of the terminal window.
      */
     protected function getBarStrLen(): int
     {
@@ -287,31 +286,31 @@ protected function getBarStrLen(): int
     }
 
     /**
-     * Format the percentage so it looks pretty
+     * Format the percentage so it looks pretty.
      */
     protected function percentageFormatted(float $percentage): string
     {
         return round($percentage * 100) . '%';
     }
 
     /**
-     * Format the label so it is positioned correctly
+     * Format the label so it is positioned correctly.
      */
     protected function labelFormatted(string $label): string
     {
         return "\n" . $this->cr() . $this->cursor->eraseLine() . $label;
     }
 
     /**
-     * Determine whether the progress bar has changed and we need to redrew
+     * Determine whether the progress bar has changed and we need to redrew.
      */
     protected function shouldRedraw(string $percentage, string $label): bool
     {
-        return ($this->forceRedraw || $percentage != $this->currentPercentage || $label != $this->label);
+        return $this->forceRedraw || $percentage != $this->currentPercentage || $label != $this->label;
     }
 
     protected function cr(): string
     {
-        return Terminal::isWindows() ? "\r" : "";
+        return Terminal::isWindows() ? "\r" : '';
     }
 }

src/Output/Writer.php

@@ -19,6 +19,7 @@
 use function stripos;
 use function strpos;
 use function ucfirst;
+
 use const PHP_EOL;
 use const STDERR;
 use const STDOUT;

tests/Helper/OutputHelperTest.php

@@ -19,8 +19,6 @@
 use Ahc\Cli\Output\Writer;
 use DateTime;
 use PHPUnit\Framework\TestCase;
-use RuntimeException;
-use Throwable;
 
 use function file;
 use function implode;

tests/Input/CommandTest.php

@@ -17,6 +17,7 @@
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 use RuntimeException;
+
 use function debug_backtrace;
 
 class CommandTest extends TestCase

tests/Output/ProgressBarTest.php

@@ -28,7 +28,7 @@ public function test_progress_bar()
             $progress->advance(1, "$i x label");
             if ($i === 2) {
                 $progress->forceRedraw(true);
-                $progress->current(2, "2 x label");
+                $progress->current(2, '2 x label');
                 $progress->forceRedraw(false);
             }
         }