Merge pull request #472 from patchlevel/use-array-as-trace-in-project…

…ion-error use array as trace in projection error
patchlevel · Feb 1, 2024 · b44bcd6 · b44bcd6
2 parents 70e2054 + 7b3f6fc
commit b44bcd6
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1,15 +1,35 @@
 parameters:
 	ignoreErrors:
+		-
+			message: "#^Method Patchlevel\\\\EventSourcing\\\\Console\\\\Command\\\\ProjectionStatusCommand\\:\\:displayError\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: src/Console/Command/ProjectionStatusCommand.php
+
 		-
 			message: "#^Method Patchlevel\\\\EventSourcing\\\\EventBus\\\\Message\\:\\:headers\\(\\) should return array\\{aggregateClass\\?\\: class\\-string\\<Patchlevel\\\\EventSourcing\\\\Aggregate\\\\AggregateRoot\\>, aggregateId\\?\\: string, playhead\\?\\: int\\<1, max\\>, recordedOn\\?\\: DateTimeImmutable, newStreamStart\\?\\: bool, archived\\?\\: bool\\} but returns non\\-empty\\-array\\<string, mixed\\>\\.$#"
 			count: 1
 			path: src/EventBus/Message.php
 
 		-
-			message: "#^Parameter \\#2 \\$errorContext of class Patchlevel\\\\EventSourcing\\\\Projection\\\\Projection\\\\ProjectionError constructor expects array\\<int, array\\{message\\: string, code\\: int\\|string, file\\: string, line\\: int, trace\\: string\\}\\>\\|null, mixed given\\.$#"
+			message: "#^Method Patchlevel\\\\EventSourcing\\\\Projection\\\\Projection\\\\ProjectionError\\:\\:__construct\\(\\) has parameter \\$errorContext with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: src/Projection/Projection/ProjectionError.php
+
+		-
+			message: "#^Parameter \\#2 \\$errorContext of class Patchlevel\\\\EventSourcing\\\\Projection\\\\Projection\\\\ProjectionError constructor expects array\\<int, array\\{message\\: string, code\\: int\\|string, file\\: string, line\\: int, trace\\: array\\<int, array\\{file\\?\\: string, line\\?\\: int, function\\?\\: string, class\\?\\: string, type\\?\\: string, args\\?\\: array\\}\\>\\}\\>\\|null, mixed given\\.$#"
 			count: 1
 			path: src/Projection/Projection/Store/DoctrineStore.php
 
+		-
+			message: "#^Method Patchlevel\\\\EventSourcing\\\\Projection\\\\Projection\\\\Store\\\\ErrorContext\\:\\:fromThrowable\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: src/Projection/Projection/Store/ErrorContext.php
+
+		-
+			message: "#^Method Patchlevel\\\\EventSourcing\\\\Projection\\\\Projection\\\\Store\\\\ErrorContext\\:\\:transformThrowable\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: src/Projection/Projection/Store/ErrorContext.php
+
 		-
 			message: "#^Method Patchlevel\\\\EventSourcing\\\\Projection\\\\Projector\\\\InMemoryProjectorRepository\\:\\:projectors\\(\\) should return array\\<int, object\\> but returns array\\<int\\|string, object\\>\\.$#"
 			count: 1

diff --git a/src/Console/Command/ProjectionStatusCommand.php b/src/Console/Command/ProjectionStatusCommand.php
@@ -16,6 +16,7 @@
 
 use function array_map;
 use function is_array;
+use function sprintf;
 
 /** @psalm-import-type Context from ErrorContext */
 #[AsCommand(
@@ -106,6 +107,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     private function displayError(OutputStyle $io, array $context): void
     {
         $io->error($context['message']);
-        $io->block($context['trace']);
+
+        foreach ($context['trace'] as $trace) {
+            $io->writeln(sprintf('%s: %s', $trace['file'] ?? '#unknown', $trace['line'] ?? '#unknown'));
+        }
     }
 }
diff --git a/src/Projection/Projection/Store/ErrorContext.php b/src/Projection/Projection/Store/ErrorContext.php
@@ -6,7 +6,10 @@
 
 use Throwable;
 
-/** @psalm-type Context = array{message: string, code: int|string, file: string, line: int, trace: string} */
+/**
+ * @psalm-type Trace = array{file?: string, line?: int, function?: string, class?: string, type?: string, args?: array}
+ * @psalm-type Context = array{message: string, code: int|string, file: string, line: int, trace: list<Trace>}
+ */
 final class ErrorContext
 {
     /** @return list<Context> */
@@ -15,22 +18,22 @@ public static function fromThrowable(Throwable $error): array
         $errors = [];
 
         do {
-            $errors[] = self::transform($error);
+            $errors[] = self::transformThrowable($error);
             $error = $error->getPrevious();
         } while ($error);
 
         return $errors;
     }
 
     /** @return Context */
-    private static function transform(Throwable $error): array
+    private static function transformThrowable(Throwable $error): array
     {
         return [
             'message' => $error->getMessage(),
             'code' => $error->getCode(),
             'file' => $error->getFile(),
             'line' => $error->getLine(),
-            'trace' => $error->getTraceAsString(),
+            'trace' => $error->getTrace(),
         ];
     }
 }