Skip to content

Commit

Permalink
\LastDragon_ru\LaraASP\Documentator\Processor\Events\FileProcessed …
Browse files Browse the repository at this point in the history 
…=> `\LastDragon_ru\LaraASP\Documentator\Processor\Events\FileFinished`.
  • Loading branch information
@LastDragon-ru
LastDragon-ru committed Jan 3, 2025
1 parent 2493e9c commit c474475
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 48 deletions.
4 changes: 2 additions & 2 deletions ...or/src/Processor/Events/FileProcessed.php → ...tor/src/Processor/Events/FileFinished.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace LastDragon_ru\LaraASP\Documentator\Processor\Events;

readonly class FileProcessed implements Event {
readonly class FileFinished implements Event {
public function __construct(
public FileProcessedResult $result,
public FileFinishedResult $result,
) {
// empty
}
Expand Down
2 changes: 1 addition & 1 deletion .../Processor/Events/FileProcessedResult.php → ...c/Processor/Events/FileFinishedResult.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace LastDragon_ru\LaraASP\Documentator\Processor\Events;

enum FileProcessedResult {
enum FileFinishedResult {
case Success;
case Skipped;
case Failed;
Expand Down
12 changes: 6 additions & 6 deletions packages/documentator/src/Processor/Executor.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
use LastDragon_ru\LaraASP\Documentator\Processor\Events\DependencyResolved;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\DependencyResolvedResult;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\Event;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\FileProcessed;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\FileProcessedResult;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\FileFinished;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\FileFinishedResult;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\FileStarted;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\TaskFinished;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\TaskFinishedResult;
Expand Down Expand Up @@ -92,14 +92,14 @@ private function file(File $file): void {

// Circular?
if (isset($this->stack[$path])) {
$this->dispatcher->notify(new FileProcessed(FileProcessedResult::Failed));
$this->dispatcher->notify(new FileFinished(FileFinishedResult::Failed));

throw new DependencyCircularDependency($file, array_values($this->stack));
}

// Skipped?
if ($this->isSkipped($file)) {
$this->dispatcher->notify(new FileProcessed(FileProcessedResult::Skipped));
$this->dispatcher->notify(new FileFinished(FileFinishedResult::Skipped));

$this->processed[$path] = true;

Expand All @@ -119,15 +119,15 @@ private function file(File $file): void {

$this->fs->commit();
} catch (Throwable $exception) {
$this->dispatcher->notify(new FileProcessed(FileProcessedResult::Failed));
$this->dispatcher->notify(new FileFinished(FileFinishedResult::Failed));

throw $exception;
} finally {
$this->processed[$path] = true;
}

// Event
$this->dispatcher->notify(new FileProcessed(FileProcessedResult::Success));
$this->dispatcher->notify(new FileFinished(FileFinishedResult::Success));

// Reset
unset($this->stack[$path]);
Expand Down
24 changes: 12 additions & 12 deletions packages/documentator/src/Processor/Listeners/Console/Writer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
use LastDragon_ru\LaraASP\Documentator\Processor\Events\DependencyResolved;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\DependencyResolvedResult;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\Event;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\FileProcessed;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\FileProcessedResult;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\FileFinished;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\FileFinishedResult;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\FileStarted;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\ProcessingFinished;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\ProcessingFinishedResult;
Expand Down Expand Up @@ -56,7 +56,7 @@ public function __invoke(Event $event): void {
$this->processingFinished($event);
} elseif ($event instanceof FileStarted) {
$this->fileStarted($event);
} elseif ($event instanceof FileProcessed) {
} elseif ($event instanceof FileFinished) {
$this->fileFinished($event);
} elseif ($event instanceof TaskStarted) {
$this->taskStarted($event);
Expand Down Expand Up @@ -109,7 +109,7 @@ protected function fileStarted(FileStarted $event): void {
$this->files++;
}

protected function fileFinished(FileProcessed $event): void {
protected function fileFinished(FileFinished $event): void {
// File?
$file = array_pop($this->stack);

Expand Down Expand Up @@ -190,7 +190,7 @@ protected function line(
int $level,
string $message,
?float $time,
ProcessingFinishedResult|FileProcessedResult|TaskFinishedResult|DependencyResolvedResult $result,
ProcessingFinishedResult|FileFinishedResult|TaskFinishedResult|DependencyResolvedResult $result,
): void {
if (!$this->isLevelVisible($level) || !$this->isResultVisible($result)) {
return;
Expand Down Expand Up @@ -220,14 +220,14 @@ protected function length(string $message): int {
}

protected function result(
ProcessingFinishedResult|FileProcessedResult|TaskFinishedResult|DependencyResolvedResult $enum,
ProcessingFinishedResult|FileFinishedResult|TaskFinishedResult|DependencyResolvedResult $enum,
): string {
return match ($enum) {
ProcessingFinishedResult::Success => '<fg=green;options=bold>DONE</>',
ProcessingFinishedResult::Failed => '<fg=red;options=bold>FAIL</>',
FileProcessedResult::Success => '<fg=green>DONE</>',
FileProcessedResult::Failed => '<fg=red>FAIL</>',
FileProcessedResult::Skipped => '<fg=gray>SKIP</>',
FileFinishedResult::Success => '<fg=green>DONE</>',
FileFinishedResult::Failed => '<fg=red>FAIL</>',
FileFinishedResult::Skipped => '<fg=gray>SKIP</>',
TaskFinishedResult::Success => '<fg=green>DONE</>',
TaskFinishedResult::Failed => '<fg=red>FAIL</>',
DependencyResolvedResult::Success => '<fg=green>DONE</>',
Expand All @@ -248,11 +248,11 @@ protected function isLevelVisible(int $level): bool {
}

protected function isResultVisible(
ProcessingFinishedResult|FileProcessedResult|TaskFinishedResult|DependencyResolvedResult $enum,
ProcessingFinishedResult|FileFinishedResult|TaskFinishedResult|DependencyResolvedResult $enum,
): bool {
return match ($enum) {
FileProcessedResult::Skipped => $this->output->isDebug(),
default => true,
FileFinishedResult::Skipped => $this->output->isDebug(),
default => true,
};
}
}
54 changes: 27 additions & 27 deletions packages/documentator/src/Processor/ProcessorTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
use LastDragon_ru\LaraASP\Documentator\Processor\Events\DependencyResolved;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\DependencyResolvedResult;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\Event;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\FileProcessed;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\FileProcessedResult;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\FileFinished;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\FileFinishedResult;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\FileStarted;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\ProcessingFinished;
use LastDragon_ru\LaraASP\Documentator\Processor\Events\ProcessingFinishedResult;
Expand Down Expand Up @@ -97,42 +97,42 @@ static function (Event $event) use (&$events): void {
new FileStarted('↔ b/a/ba.txt'),
new TaskStarted($taskB::class),
new TaskFinished(TaskFinishedResult::Success),
new FileProcessed(FileProcessedResult::Success),
new FileFinished(FileFinishedResult::Success),
new DependencyResolved(FileReference::class, '↔ c.txt', DependencyResolvedResult::Success),
new FileStarted('↔ c.txt'),
new TaskStarted($taskB::class),
new TaskFinished(TaskFinishedResult::Success),
new FileProcessed(FileProcessedResult::Success),
new FileFinished(FileFinishedResult::Success),
new DependencyResolved(FileReference::class, '↔ ../../../README.md', DependencyResolvedResult::Success),
new FileStarted('↔ ../../../README.md'),
new FileProcessed(FileProcessedResult::Skipped),
new FileFinished(FileFinishedResult::Skipped),
new TaskFinished(TaskFinishedResult::Success),
new FileProcessed(FileProcessedResult::Success),
new FileFinished(FileFinishedResult::Success),
new DependencyResolved(FileReference::class, '↔ c.txt', DependencyResolvedResult::Success),
new DependencyResolved(FileReference::class, '↔ c.html', DependencyResolvedResult::Success),
new FileStarted('↔ c.html'),
new FileProcessed(FileProcessedResult::Skipped),
new FileFinished(FileFinishedResult::Skipped),
new DependencyResolved(FileReference::class, '↔ a/excluded.txt', DependencyResolvedResult::Success),
new FileStarted('↔ a/excluded.txt'),
new FileProcessed(FileProcessedResult::Skipped),
new FileFinished(FileFinishedResult::Skipped),
new TaskFinished(TaskFinishedResult::Success),
new FileProcessed(FileProcessedResult::Success),
new FileFinished(FileFinishedResult::Success),
new FileStarted('↔ a/a/aa.txt'),
new TaskStarted($taskB::class),
new TaskFinished(TaskFinishedResult::Success),
new FileProcessed(FileProcessedResult::Success),
new FileFinished(FileFinishedResult::Success),
new FileStarted('↔ a/b/ab.txt'),
new TaskStarted($taskB::class),
new TaskFinished(TaskFinishedResult::Success),
new FileProcessed(FileProcessedResult::Success),
new FileFinished(FileFinishedResult::Success),
new FileStarted('↔ b/b.txt'),
new TaskStarted($taskB::class),
new TaskFinished(TaskFinishedResult::Success),
new FileProcessed(FileProcessedResult::Success),
new FileFinished(FileFinishedResult::Success),
new FileStarted('↔ c.htm'),
new TaskStarted($taskA::class),
new TaskFinished(TaskFinishedResult::Success),
new FileProcessed(FileProcessedResult::Success),
new FileFinished(FileFinishedResult::Success),
new ProcessingFinished(ProcessingFinishedResult::Success),
],
$events,
Expand Down Expand Up @@ -212,7 +212,7 @@ static function (Event $event) use (&$events): void {
new FileStarted('↔ excluded.txt'),
new TaskStarted(ProcessorTest__Task::class),
new TaskFinished(TaskFinishedResult::Success),
new FileProcessed(FileProcessedResult::Success),
new FileFinished(FileFinishedResult::Success),
new ProcessingFinished(ProcessingFinishedResult::Success),
],
$events,
Expand Down Expand Up @@ -278,57 +278,57 @@ static function (Event $event) use (&$events): void {
new TaskFinished(TaskFinishedResult::Success),
new TaskStarted($taskB::class),
new TaskFinished(TaskFinishedResult::Success),
new FileProcessed(FileProcessedResult::Success),
new FileFinished(FileFinishedResult::Success),
new FileStarted('↔ a/a.txt'),
new TaskStarted($taskB::class),
new TaskFinished(TaskFinishedResult::Success),
new FileProcessed(FileProcessedResult::Success),
new FileFinished(FileFinishedResult::Success),
new FileStarted('↔ a/a/aa.txt'),
new TaskStarted($taskB::class),
new TaskFinished(TaskFinishedResult::Success),
new FileProcessed(FileProcessedResult::Success),
new FileFinished(FileFinishedResult::Success),
new FileStarted('↔ a/b/ab.txt'),
new TaskStarted($taskB::class),
new TaskFinished(TaskFinishedResult::Success),
new FileProcessed(FileProcessedResult::Success),
new FileFinished(FileFinishedResult::Success),
new FileStarted('↔ b/a/ba.txt'),
new TaskStarted($taskB::class),
new TaskFinished(TaskFinishedResult::Success),
new FileProcessed(FileProcessedResult::Success),
new FileFinished(FileFinishedResult::Success),
new FileStarted('↔ b/b.html'),
new TaskStarted($taskA::class),
new DependencyResolved(FileReference::class, '↔ ../../../README.md', DependencyResolvedResult::Success),
new FileStarted('↔ ../../../README.md'),
new FileProcessed(FileProcessedResult::Skipped),
new FileFinished(FileFinishedResult::Skipped),
new DependencyResolved(FileReference::class, '↔ a/excluded.txt', DependencyResolvedResult::Success),
new FileStarted('↔ a/excluded.txt'),
new FileProcessed(FileProcessedResult::Skipped),
new FileFinished(FileFinishedResult::Skipped),
new TaskFinished(TaskFinishedResult::Success),
new TaskStarted($taskB::class),
new TaskFinished(TaskFinishedResult::Success),
new FileProcessed(FileProcessedResult::Success),
new FileFinished(FileFinishedResult::Success),
new FileStarted('↔ b/b.txt'),
new TaskStarted($taskB::class),
new TaskFinished(TaskFinishedResult::Success),
new FileProcessed(FileProcessedResult::Success),
new FileFinished(FileFinishedResult::Success),
new FileStarted('↔ b/b/bb.txt'),
new TaskStarted($taskB::class),
new TaskFinished(TaskFinishedResult::Success),
new FileProcessed(FileProcessedResult::Success),
new FileFinished(FileFinishedResult::Success),
new FileStarted('↔ c.htm'),
new TaskStarted($taskB::class),
new TaskFinished(TaskFinishedResult::Success),
new FileProcessed(FileProcessedResult::Success),
new FileFinished(FileFinishedResult::Success),
new FileStarted('↔ c.html'),
new TaskStarted($taskA::class),
new TaskFinished(TaskFinishedResult::Success),
new TaskStarted($taskB::class),
new TaskFinished(TaskFinishedResult::Success),
new FileProcessed(FileProcessedResult::Success),
new FileFinished(FileFinishedResult::Success),
new FileStarted('↔ c.txt'),
new TaskStarted($taskB::class),
new TaskFinished(TaskFinishedResult::Success),
new FileProcessed(FileProcessedResult::Success),
new FileFinished(FileFinishedResult::Success),
new ProcessingFinished(ProcessingFinishedResult::Success),
],
$events,
Expand Down

0 comments on commit c474475

Please sign in to comment.