chore: CS and Psalm fixes

neo4j-php · Sep 12, 2024 · 85cca34 · 85cca34
1 parent e24a8b7
commit 85cca34
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 14 deletions.
diff --git a/src/Collector/Neo4jDataCollector.php b/src/Collector/Neo4jDataCollector.php
@@ -32,12 +32,15 @@ public function collect(Request $request, Response $response, ?\Throwable $excep
         $profiledSummaries = $this->subscriber->getProfiledSummaries();
         $successfulStatements = array_map(
             static function (string $key, mixed $value) {
-                if ('result' !== $key) {
-                    return [...$value, 'status' => 'success'];
+                if ('result' !== $key && /* Is always array */ is_array($value)) {
+                    return [
+                        ...$value,
+                        'status' => 'success',
+                    ];
                 }
 
                 return array_map(
-                    static function (string $key, mixed $obj) {
+                    static function (mixed $obj) {
                         if (is_object($obj) && method_exists($obj, 'toArray')) {
                             return $obj->toArray();
                         }

diff --git a/src/Event/PostRunEvent.php b/src/Event/PostRunEvent.php
@@ -12,9 +12,9 @@ class PostRunEvent extends Event
     public const EVENT_ID = 'neo4j.post_run';
 
     public function __construct(
-        private ?string $alias,
-        private ResultSummary $result,
-        private \DateTimeInterface $time
+        private readonly ?string $alias,
+        private readonly ResultSummary $result,
+        private readonly \DateTimeInterface $time
     ) {
     }
 

diff --git a/src/EventListener/Neo4jProfileListener.php b/src/EventListener/Neo4jProfileListener.php
@@ -4,7 +4,6 @@
 
 namespace Neo4j\Neo4jBundle\EventListener;
 
-use DateTimeInterface;
 use Laudis\Neo4j\Databags\ResultSummary;
 use Laudis\Neo4j\Databags\Statement;
 use Laudis\Neo4j\Exception\Neo4jException;
@@ -19,13 +18,21 @@ final class Neo4jProfileListener implements EventSubscriberInterface, ResetInter
      * @var list<array{
      *     result: ResultSummary,
      *     alias: string|null,
-     *     time: DateTimeInterface
+     *     time: string,
+     *     start_time: float|int,
+     *     end_time: float|int
      * }>
      */
     private array $profiledSummaries = [];
 
     /**
-     * @var list<array{exception: Neo4jException, statement: Statement, alias: string|null}>
+     * @var list<array{
+     *     exception: Neo4jException,
+     *     statement: Statement,
+     *     alias: string|null,
+     *     time: string,
+     *     timestamp: int
+     * }>
      */
     private array $profiledFailures = [];
 
@@ -80,7 +87,13 @@ public function getProfiledSummaries(): array
     }
 
     /**
-     * @return list<array{exception: Neo4jException, statement: Statement, alias: string|null}>
+     * @return list<array{
+     *     exception: Neo4jException,
+     *     statement: Statement,
+     *     alias: string|null,
+     *     time: string,
+     *     timestamp: int
+     * }>
      */
     public function getProfiledFailures(): array
     {

diff --git a/src/SymfonyClient.php b/src/SymfonyClient.php
@@ -25,8 +25,8 @@ class SymfonyClient implements ClientInterface
      * @param ClientInterface<SummarizedResult<CypherMap>> $client
      */
     public function __construct(
-        private ClientInterface $client,
-        private EventHandler $handler
+        private readonly ClientInterface $client,
+        private readonly EventHandler $handler
     ) {
     }
 

diff --git a/tests/App/Controller/TestController.php b/tests/App/Controller/TestController.php
@@ -16,13 +16,12 @@ public function __construct(
 
     public function __invoke(Profiler $profiler): Response
     {
-        //        dd($profiler->loadProfile('0a1909'));
         // Successful statement
         $this->client->run('MATCH (n) RETURN n');
         try {
             // Failing statement
             $this->client->run('MATCH (n) {x: $x}', ['x' => 1]);
-        } catch (\Exception $e) {
+        } catch (\Exception) {
             // ignore
         }