Merge branch 'fix-spinner'

Author: lkrms

codecov.yml

@@ -0,0 +1,73 @@
+component_management:
+  individual_components:
+    - component_id: cache
+      name: Cache
+      paths:
+        - "src/Toolkit/Cache/**"
+    - component_id: cli
+      name: Cli
+      paths:
+        - "src/Toolkit/Cli/**"
+    - component_id: collections
+      name: Collections
+      paths:
+        - "src/Toolkit/Collection/**"
+    - component_id: console
+      name: Console
+      paths:
+        - "src/Toolkit/Console/**"
+    - component_id: container
+      name: Container
+      paths:
+        - "src/Toolkit/Container/**"
+    - component_id: contracts
+      name: Contracts
+      paths:
+        - "src/Toolkit/Contract/**"
+    - component_id: core
+      name: Core
+      paths:
+        - "src/Toolkit/Core/**"
+    - component_id: curler
+      name: Curler
+      paths:
+        - "src/Toolkit/Curler/**"
+    - component_id: db
+      name: Db
+      paths:
+        - "src/Toolkit/Db/**"
+    - component_id: http
+      name: Http
+      paths:
+        - "src/Toolkit/Http/**"
+    - component_id: iterators
+      name: Iterators
+      paths:
+        - "src/Toolkit/Iterator/**"
+    - component_id: phpdoc
+      name: PHPDoc
+      paths:
+        - "src/Toolkit/PHPDoc/**"
+    - component_id: phpstan
+      name: PHPStan
+      paths:
+        - "src/Toolkit/PHPStan/**"
+    - component_id: polyfills
+      name: Polyfills
+      paths:
+        - "src/Toolkit/Polyfill/**"
+    - component_id: sli
+      name: Sli
+      paths:
+        - "src/Toolkit/Sli/**"
+    - component_id: sync
+      name: Sync
+      paths:
+        - "src/Toolkit/Sync/**"
+    - component_id: utils
+      name: Utils
+      paths:
+        - "src/Toolkit/Utility/**"
+
+comment:
+  layout: "condensed_header, condensed_files, condensed_footer, components"

src/Toolkit/Console/Support/ConsoleWriterState.php

@@ -36,7 +36,7 @@ final class ConsoleWriterState
     public array $Written = [];
     /** @var string[] */
     public array $LastWritten = [];
-    /** @var array{int<0,max>,float} */
-    public array $SpinnerState;
+    /** @var array{int<0,max>,float}|null */
+    public ?array $SpinnerState;
     public LoggerInterface $Logger;
 }

tests/unit/Toolkit/Console/ConsoleWriterTest.php

@@ -0,0 +1,71 @@
+<?php declare(strict_types=1);
+
+namespace Salient\Tests\Console;
+
+use Salient\Console\Support\ConsoleWriterState;
+use Salient\Console\Target\MockTarget;
+use Salient\Console\ConsoleWriter;
+use Salient\Contract\Core\MessageLevel;
+use Salient\Core\Facade\Console;
+use Salient\Tests\TestCase;
+
+/**
+ * @covers \Salient\Console\ConsoleWriter
+ * @covers \Salient\Console\ConsoleFormatter
+ */
+final class ConsoleWriterTest extends TestCase
+{
+    private ConsoleWriter $Writer;
+    private MockTarget $Target;
+
+    protected function setUp(): void
+    {
+        $this->Writer = new ConsoleWriter();
+        $this->Target = new MockTarget();
+        $this->Writer->registerTarget($this->Target);
+
+        Console::load($this->Writer);
+    }
+
+    protected function tearDown(): void
+    {
+        Console::unload();
+    }
+
+    public function testLogProgress(): void
+    {
+        $state = $this->getState();
+        for ($i = 0; $i < 11; $i++) {
+            if (isset($state->SpinnerState)) {
+                $state->SpinnerState = [
+                    $state->SpinnerState[0] + 1,
+                    (float) (hrtime(true) / 1000),
+                ];
+            }
+            Console::logProgress('Complete:', sprintf('%d%%', ($i + 1) * 100 / 11));
+        }
+
+        $this->assertSameConsoleMessages([
+            [MessageLevel::INFO, "⠋ Complete: 9%\r"],
+            [MessageLevel::INFO, "⠙ Complete: 18%\r"],
+            [MessageLevel::INFO, "⠹ Complete: 27%\r"],
+            [MessageLevel::INFO, "⠸ Complete: 36%\r"],
+            [MessageLevel::INFO, "⠼ Complete: 45%\r"],
+            [MessageLevel::INFO, "⠴ Complete: 54%\r"],
+            [MessageLevel::INFO, "⠦ Complete: 63%\r"],
+            [MessageLevel::INFO, "⠧ Complete: 72%\r"],
+            [MessageLevel::INFO, "⠇ Complete: 81%\r"],
+            [MessageLevel::INFO, "⠏ Complete: 90%\r"],
+            [MessageLevel::INFO, "⠋ Complete: 100%\r"],
+        ], $this->Target->getMessages());
+    }
+
+    private function getState(): ConsoleWriterState
+    {
+        return (function () {
+            /** @var ConsoleWriter $this */
+            // @phpstan-ignore property.private
+            return $this->State;
+        })->bindTo($this->Writer, $this->Writer)();
+    }
+}