fix: Add recursive toArray, and add stopwatch events

Author: exaby73

src/Collector/Neo4jDataCollector.php

@@ -29,30 +29,21 @@ public function __construct(
 
     public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
     {
+        $t = $this;
         $profiledSummaries = $this->subscriber->getProfiledSummaries();
-        $successfulStatements = array_map(
-            static function (string $key, mixed $value) {
-                if ('result' !== $key && /* Is always array */ is_array($value)) {
-                    return [
-                        ...$value,
-                        'status' => 'success',
-                    ];
+        $successfulStatements = [];
+        foreach ($profiledSummaries as $summary) {
+            $statement = ['status' => 'success'];
+            foreach ($summary as $key => $value) {
+                if (!is_array($value) && !is_object($value)) {
+                    $statement[$key] = $value;
+                    continue;
                 }
 
-                return array_map(
-                    static function (mixed $obj) {
-                        if (is_object($obj) && method_exists($obj, 'toArray')) {
-                            return $obj->toArray();
-                        }
-
-                        return $obj;
-                    },
-                    $value['result']->toArray()
-                );
-            },
-            array_keys($profiledSummaries),
-            array_values($profiledSummaries)
-        );
+                $statement[$key] = $t->recursiveToArray($value);
+            }
+            $successfulStatements[] = $statement;
+        }
 
         $failedStatements = array_map(
             static fn (array $x) => [
@@ -95,6 +86,7 @@ public function getName(): string
         return 'neo4j';
     }
 
+    /** @api */
     public function getStatements(): array
     {
         return $this->data['statements'];
@@ -116,11 +108,13 @@ public function getFailedStatements(): array
         );
     }
 
+    /** @api */
     public function getFailedStatementsCount(): array
     {
         return $this->data['failed_statements_count'];
     }
 
+    /** @api */
     public function getSuccessfulStatementsCount(): array
     {
         return $this->data['successful_statements_count'];
@@ -135,4 +129,20 @@ public static function getTemplate(): ?string
     {
         return '@Neo4j/web_profiler.html.twig';
     }
+
+    private function recursiveToArray(mixed $obj): mixed
+    {
+        if (is_array($obj)) {
+            return array_map(
+                fn (mixed $x) => $this->recursiveToArray($x),
+                $obj
+            );
+        }
+
+        if (is_object($obj) && method_exists($obj, 'toArray')) {
+            return $obj->toArray();
+        }
+
+        return $obj;
+    }
 }

src/EventHandler.php

@@ -18,14 +18,18 @@
 use Neo4j\Neo4jBundle\Event\FailureEvent;
 use Neo4j\Neo4jBundle\Event\PostRunEvent;
 use Neo4j\Neo4jBundle\Event\PreRunEvent;
+use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 class EventHandler
 {
     private ?EventDispatcherInterface $dispatcher;
 
-    public function __construct(?EventDispatcherInterface $dispatcher, private readonly string $alias)
-    {
+    public function __construct(
+        ?EventDispatcherInterface $dispatcher,
+        private readonly string $alias,
+        private readonly Stopwatch $stopwatch
+    ) {
         $this->dispatcher = $dispatcher;
     }
 
@@ -46,13 +50,17 @@ public function handle(callable $runHandler, Statement $statement, ?string $alia
         $time = new \DateTimeImmutable('now', new \DateTimeZone(date_default_timezone_get()));
         $this->dispatcher->dispatch(new PreRunEvent($alias, $statement, $time), PreRunEvent::EVENT_ID);
 
+        $stopWatchName = sprintf('neo4j.%s.query', $alias ?? $this->alias);
         try {
+            $this->stopwatch->start($stopWatchName);
             $tbr = $runHandler($statement);
+            $this->stopwatch->stop($stopWatchName);
             $this->dispatcher->dispatch(
                 new PostRunEvent($alias ?? $this->alias, $tbr->getSummary(), $time),
                 PostRunEvent::EVENT_ID
             );
         } catch (Neo4jException $e) {
+            $this->stopwatch->stop($stopWatchName);
             /** @noinspection PhpUnhandledExceptionInspection */
             $time = new \DateTimeImmutable('now', new \DateTimeZone(date_default_timezone_get()));
             $event = new FailureEvent($alias ?? $this->alias, $statement, $e, $time);

src/Resources/views/web_profiler.html.twig

@@ -86,7 +86,7 @@
 
                 <div id="neo4j-details-{{ idx }}">
                     <div>
-                        <strong class="font-normal text-small">Parameters</strong>: {{ statement.result.parameters|default([])|yaml_encode }}
+                        <strong class="font-normal text-small">Parameters</strong>: {{ statement.result.statement.parameters|default([])|json_encode }}
                     </div>
                     <div>
                         <strong class="font-normal text-small">Tag</strong>: {{ statement.result.tag|default('N/A')|yaml_encode }}
@@ -99,7 +99,7 @@
                         <strong class="font-normal text-small">Scheme</strong>: {{ statement.result.scheme|default('N/A') }}
                     </div>
                     <div>
-                        <strong class="font-normal text-small">Statistics</strong>: {{ statement|yaml_encode }}
+                        <strong class="font-normal text-small">Statistics</strong>: {{ statement|json_encode }}
                     </div>
 {#                    {% else %}#}
 {#                    <div>#}

tests/App/Controller/TestController.php

@@ -6,6 +6,7 @@
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Profiler\Profiler;
+use Symfony\Component\Stopwatch\Stopwatch;
 
 class TestController extends AbstractController
 {
@@ -14,10 +15,10 @@ public function __construct(
     ) {
     }
 
-    public function __invoke(Profiler $profiler): Response
+    public function __invoke(Profiler $profiler, Stopwatch $stopwatch): Response
     {
         // Successful statement
-        $this->client->run('MATCH (n) RETURN n');
+        $this->client->run('MATCH (n {foo: $bar}) RETURN n', ['bar' => 'baz']);
         try {
             // Failing statement
             $this->client->run('MATCH (n) {x: $x}', ['x' => 1]);