feat: redine types as items and lists and fix assign.propertyType

Author: shakaran

phpstan.neon.dist

@@ -8,7 +8,5 @@ parameters:
       - src
       - tests
    ignoreErrors:
-      - identifier: 'assign.propertyType'
-        path: src/DataCollector/DoctrineDataCollector.php
       - identifier: 'class.notFound'
         path: src/DependencyInjection/Configuration.php

src/DataCollector/DoctrineDataCollector.php

@@ -46,7 +46,7 @@
  *    }>>,
  *    entityCounts: array<string, array<class-string, int>>
  * }
- * @phpstan-type GroupedQueriesType = array<string, list<array{
+ * @phpstan-type GroupedQueryItemType = array{
  *    executionMS: float,
  *    explainable: bool,
  *    sql: string,
@@ -56,7 +56,8 @@
  *    count: int,
  *    index: int,
  *    executionPercent?: float
- * }>>
+ * }
+ * @phpstan-type GroupedQueriesType = array<string, array<int, GroupedQueryItemType>>
  * @psalm-property DataType $data
  */
 class DoctrineDataCollector extends BaseCollector
@@ -285,10 +286,11 @@ public function getGroupedQueries(): array
             foreach ($queries as $i => $query) {
                 $key = $query['sql'];
                 if (! isset($connectionGroupedQueries[$key])) {
-                    $connectionGroupedQueries[$key]                = $query;
-                    $connectionGroupedQueries[$key]['executionMS'] = 0;
-                    $connectionGroupedQueries[$key]['count']       = 0;
-                    $connectionGroupedQueries[$key]['index']       = $i; // "Explain query" relies on query index in 'queries'.
+                    $connectionGroupedQueries[$key] = array_merge($query, [
+                        'executionMS' => 0,
+                        'count'       => 0,
+                        'index'       => $i, // "Explain query" relies on query index in 'queries'.
+                    ]);
                 }
 
                 $connectionGroupedQueries[$key]['executionMS'] += $query['executionMS'];
@@ -303,7 +305,9 @@ public function getGroupedQueries(): array
 
                 return $a['executionMS'] < $b['executionMS'] ? 1 : -1;
             });
-            $this->groupedQueries[$connection] = $connectionGroupedQueries;
+            $sortedQueries = $connectionGroupedQueries;
+            /** @var array<int, GroupedQueryItemType> $sortedQueries */
+            $this->groupedQueries[$connection] = $sortedQueries;
         }
 
         foreach ($this->groupedQueries as $connection => $queries) {